Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 60982,
    "url": "http://patchwork.dpdk.org/api/patches/60982/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20191011163233.31017-9-hemant.agrawal@nxp.com/",
    "project": {
        "id": 1,
        "url": "http://patchwork.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20191011163233.31017-9-hemant.agrawal@nxp.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20191011163233.31017-9-hemant.agrawal@nxp.com",
    "date": "2019-10-11T16:32:31",
    "name": "[08/10] crypto/dpaa_sec: add support for snow3G and ZUC",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "3dcd113b3eab15a416e809d9623df0bbbc4466d8",
    "submitter": {
        "id": 477,
        "url": "http://patchwork.dpdk.org/api/people/477/?format=api",
        "name": "Hemant Agrawal",
        "email": "hemant.agrawal@nxp.com"
    },
    "delegate": {
        "id": 6690,
        "url": "http://patchwork.dpdk.org/api/users/6690/?format=api",
        "username": "akhil",
        "first_name": "akhil",
        "last_name": "goyal",
        "email": "gakhil@marvell.com"
    },
    "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20191011163233.31017-9-hemant.agrawal@nxp.com/mbox/",
    "series": [
        {
            "id": 6807,
            "url": "http://patchwork.dpdk.org/api/series/6807/?format=api",
            "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=6807",
            "date": "2019-10-11T16:32:23",
            "name": "NXP DPAAx crypto fixes",
            "version": 1,
            "mbox": "http://patchwork.dpdk.org/series/6807/mbox/"
        }
    ],
    "comments": "http://patchwork.dpdk.org/api/patches/60982/comments/",
    "check": "fail",
    "checks": "http://patchwork.dpdk.org/api/patches/60982/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 970001EB78;\n\tFri, 11 Oct 2019 18:35:35 +0200 (CEST)",
            "from inva021.nxp.com (inva021.nxp.com [92.121.34.21])\n\tby dpdk.org (Postfix) with ESMTP id 5CFC51EB4F\n\tfor <dev@dpdk.org>; Fri, 11 Oct 2019 18:35:19 +0200 (CEST)",
            "from inva021.nxp.com (localhost [127.0.0.1])\n\tby inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id F1F122000EC;\n\tFri, 11 Oct 2019 18:35:18 +0200 (CEST)",
            "from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com\n\t[165.114.16.14])\n\tby inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id A86F820004E;\n\tFri, 11 Oct 2019 18:35:16 +0200 (CEST)",
            "from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net\n\t[10.232.133.63])\n\tby invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 9EA18402AE;\n\tSat, 12 Oct 2019 00:35:13 +0800 (SGT)"
        ],
        "From": "Hemant Agrawal <hemant.agrawal@nxp.com>",
        "To": "dev@dpdk.org",
        "Cc": "akhil.goyal@nxp.com,\n\tHemant Agrawal <hemant.agrawal@nxp.com>",
        "Date": "Fri, 11 Oct 2019 22:02:31 +0530",
        "Message-Id": "<20191011163233.31017-9-hemant.agrawal@nxp.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20191011163233.31017-1-hemant.agrawal@nxp.com>",
        "References": "<20191011163233.31017-1-hemant.agrawal@nxp.com>",
        "X-Virus-Scanned": "ClamAV using ClamSMTP",
        "Subject": "[dpdk-dev] [PATCH 08/10] crypto/dpaa_sec: add support for snow3G\n\tand ZUC",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "This patch add support for ZUC and SNOW 3G in non-PDCP offload mode.\n\nSigned-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\n doc/guides/cryptodevs/dpaa_sec.rst          |   4 +\n doc/guides/cryptodevs/features/dpaa_sec.ini |   4 +\n drivers/crypto/dpaa_sec/dpaa_sec.c          | 378 ++++++++++++++++----\n drivers/crypto/dpaa_sec/dpaa_sec.h          |  91 ++++-\n 4 files changed, 407 insertions(+), 70 deletions(-)",
    "diff": "diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst\nindex 0a2600634..7e9fcf625 100644\n--- a/doc/guides/cryptodevs/dpaa_sec.rst\n+++ b/doc/guides/cryptodevs/dpaa_sec.rst\n@@ -58,6 +58,8 @@ Cipher algorithms:\n * ``RTE_CRYPTO_CIPHER_AES128_CTR``\n * ``RTE_CRYPTO_CIPHER_AES192_CTR``\n * ``RTE_CRYPTO_CIPHER_AES256_CTR``\n+* ``RTE_CRYPTO_CIPHER_SNOW3G_UEA2``\n+* ``RTE_CRYPTO_CIPHER_ZUC_EEA3``\n \n Hash algorithms:\n \n@@ -66,7 +68,9 @@ Hash algorithms:\n * ``RTE_CRYPTO_AUTH_SHA256_HMAC``\n * ``RTE_CRYPTO_AUTH_SHA384_HMAC``\n * ``RTE_CRYPTO_AUTH_SHA512_HMAC``\n+* ``RTE_CRYPTO_AUTH_SNOW3G_UIA2``\n * ``RTE_CRYPTO_AUTH_MD5_HMAC``\n+* ``RTE_CRYPTO_AUTH_ZUC_EIA3``\n \n AEAD algorithms:\n \ndiff --git a/doc/guides/cryptodevs/features/dpaa_sec.ini b/doc/guides/cryptodevs/features/dpaa_sec.ini\nindex 954a70808..243f3e1d6 100644\n--- a/doc/guides/cryptodevs/features/dpaa_sec.ini\n+++ b/doc/guides/cryptodevs/features/dpaa_sec.ini\n@@ -25,6 +25,8 @@ AES CTR (128) = Y\n AES CTR (192) = Y\n AES CTR (256) = Y\n 3DES CBC      = Y\n+SNOW3G UEA2   = Y\n+ZUC EEA3      = Y\n \n ;\n ; Supported authentication algorithms of the 'dpaa_sec' crypto driver.\n@@ -36,6 +38,8 @@ SHA224 HMAC  = Y\n SHA256 HMAC  = Y\n SHA384 HMAC  = Y\n SHA512 HMAC  = Y\n+SNOW3G UIA2  = Y\n+ZUC EIA3     = Y\n \n ;\n ; Supported AEAD algorithms of the 'dpaa_sec' crypto driver.\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex 019a7119f..970cdf0cc 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -630,39 +630,171 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n \t} else if (is_proto_pdcp(ses)) {\n \t\tshared_desc_len = dpaa_sec_prep_pdcp_cdb(ses);\n \t} else if (is_cipher_only(ses)) {\n-\t\tcaam_cipher_alg(ses, &alginfo_c);\n-\t\tif (alginfo_c.algtype == (unsigned int)DPAA_SEC_ALG_UNSUPPORT) {\n-\t\t\tDPAA_SEC_ERR(\"not supported cipher alg\");\n-\t\t\treturn -ENOTSUP;\n-\t\t}\n-\n \t\talginfo_c.key = (size_t)ses->cipher_key.data;\n \t\talginfo_c.keylen = ses->cipher_key.length;\n \t\talginfo_c.key_enc_flags = 0;\n \t\talginfo_c.key_type = RTA_DATA_IMM;\n-\n-\t\tshared_desc_len = cnstr_shdsc_blkcipher(\n-\t\t\t\t\t\tcdb->sh_desc, true,\n-\t\t\t\t\t\tswap, SHR_NEVER, &alginfo_c,\n-\t\t\t\t\t\tNULL,\n-\t\t\t\t\t\tses->iv.length,\n-\t\t\t\t\t\tses->dir);\n-\t} else if (is_auth_only(ses)) {\n-\t\tcaam_auth_alg(ses, &alginfo_a);\n-\t\tif (alginfo_a.algtype == (unsigned int)DPAA_SEC_ALG_UNSUPPORT) {\n-\t\t\tDPAA_SEC_ERR(\"not supported auth alg\");\n+\t\tswitch (ses->cipher_alg) {\n+\t\tcase RTE_CRYPTO_CIPHER_NULL:\n+\t\t\talginfo_c.algtype = 0;\n+\t\t\tshared_desc_len = cnstr_shdsc_blkcipher(\n+\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\tswap, SHR_NEVER, &alginfo_c,\n+\t\t\t\t\tNULL,\n+\t\t\t\t\tses->iv.length,\n+\t\t\t\t\tses->dir);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n+\t\t\talginfo_c.algtype = OP_ALG_ALGSEL_AES;\n+\t\t\talginfo_c.algmode = OP_ALG_AAI_CBC;\n+\t\t\tshared_desc_len = cnstr_shdsc_blkcipher(\n+\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\tswap, SHR_NEVER, &alginfo_c,\n+\t\t\t\t\tNULL,\n+\t\t\t\t\tses->iv.length,\n+\t\t\t\t\tses->dir);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_CIPHER_3DES_CBC:\n+\t\t\talginfo_c.algtype = OP_ALG_ALGSEL_3DES;\n+\t\t\talginfo_c.algmode = OP_ALG_AAI_CBC;\n+\t\t\tshared_desc_len = cnstr_shdsc_blkcipher(\n+\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\tswap, SHR_NEVER, &alginfo_c,\n+\t\t\t\t\tNULL,\n+\t\t\t\t\tses->iv.length,\n+\t\t\t\t\tses->dir);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n+\t\t\talginfo_c.algtype = OP_ALG_ALGSEL_AES;\n+\t\t\talginfo_c.algmode = OP_ALG_AAI_CTR;\n+\t\t\tshared_desc_len = cnstr_shdsc_blkcipher(\n+\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\tswap, SHR_NEVER, &alginfo_c,\n+\t\t\t\t\tNULL,\n+\t\t\t\t\tses->iv.length,\n+\t\t\t\t\tses->dir);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_CIPHER_3DES_CTR:\n+\t\t\talginfo_c.algtype = OP_ALG_ALGSEL_3DES;\n+\t\t\talginfo_c.algmode = OP_ALG_AAI_CTR;\n+\t\t\tshared_desc_len = cnstr_shdsc_blkcipher(\n+\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\tswap, SHR_NEVER, &alginfo_c,\n+\t\t\t\t\tNULL,\n+\t\t\t\t\tses->iv.length,\n+\t\t\t\t\tses->dir);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_CIPHER_SNOW3G_UEA2:\n+\t\t\talginfo_c.algtype = OP_ALG_ALGSEL_SNOW_F8;\n+\t\t\tshared_desc_len = cnstr_shdsc_snow_f8(\n+\t\t\t\t\tcdb->sh_desc, true, swap,\n+\t\t\t\t\t&alginfo_c,\n+\t\t\t\t\tses->dir);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_CIPHER_ZUC_EEA3:\n+\t\t\talginfo_c.algtype = OP_ALG_ALGSEL_ZUCE;\n+\t\t\tshared_desc_len = cnstr_shdsc_zuce(\n+\t\t\t\t\tcdb->sh_desc, true, swap,\n+\t\t\t\t\t&alginfo_c,\n+\t\t\t\t\tses->dir);\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tDPAA_SEC_ERR(\"unsupported cipher alg %d\",\n+\t\t\t\t     ses->cipher_alg);\n \t\t\treturn -ENOTSUP;\n \t\t}\n-\n+\t} else if (is_auth_only(ses)) {\n \t\talginfo_a.key = (size_t)ses->auth_key.data;\n \t\talginfo_a.keylen = ses->auth_key.length;\n \t\talginfo_a.key_enc_flags = 0;\n \t\talginfo_a.key_type = RTA_DATA_IMM;\n-\n-\t\tshared_desc_len = cnstr_shdsc_hmac(cdb->sh_desc, true,\n-\t\t\t\t\t\t   swap, SHR_NEVER, &alginfo_a,\n-\t\t\t\t\t\t   !ses->dir,\n-\t\t\t\t\t\t   ses->digest_length);\n+\t\tswitch (ses->auth_alg) {\n+\t\tcase RTE_CRYPTO_AUTH_NULL:\n+\t\t\talginfo_a.algtype = 0;\n+\t\t\tses->digest_length = 0;\n+\t\t\tshared_desc_len = cnstr_shdsc_hmac(\n+\t\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\t\tswap, SHR_NEVER, &alginfo_a,\n+\t\t\t\t\t\t!ses->dir,\n+\t\t\t\t\t\tses->digest_length);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_MD5_HMAC:\n+\t\t\talginfo_a.algtype = OP_ALG_ALGSEL_MD5;\n+\t\t\talginfo_a.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tshared_desc_len = cnstr_shdsc_hmac(\n+\t\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\t\tswap, SHR_NEVER, &alginfo_a,\n+\t\t\t\t\t\t!ses->dir,\n+\t\t\t\t\t\tses->digest_length);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n+\t\t\talginfo_a.algtype = OP_ALG_ALGSEL_SHA1;\n+\t\t\talginfo_a.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tshared_desc_len = cnstr_shdsc_hmac(\n+\t\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\t\tswap, SHR_NEVER, &alginfo_a,\n+\t\t\t\t\t\t!ses->dir,\n+\t\t\t\t\t\tses->digest_length);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_SHA224_HMAC:\n+\t\t\talginfo_a.algtype = OP_ALG_ALGSEL_SHA224;\n+\t\t\talginfo_a.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tshared_desc_len = cnstr_shdsc_hmac(\n+\t\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\t\tswap, SHR_NEVER, &alginfo_a,\n+\t\t\t\t\t\t!ses->dir,\n+\t\t\t\t\t\tses->digest_length);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n+\t\t\talginfo_a.algtype = OP_ALG_ALGSEL_SHA256;\n+\t\t\talginfo_a.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tshared_desc_len = cnstr_shdsc_hmac(\n+\t\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\t\tswap, SHR_NEVER, &alginfo_a,\n+\t\t\t\t\t\t!ses->dir,\n+\t\t\t\t\t\tses->digest_length);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_SHA384_HMAC:\n+\t\t\talginfo_a.algtype = OP_ALG_ALGSEL_SHA384;\n+\t\t\talginfo_a.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tshared_desc_len = cnstr_shdsc_hmac(\n+\t\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\t\tswap, SHR_NEVER, &alginfo_a,\n+\t\t\t\t\t\t!ses->dir,\n+\t\t\t\t\t\tses->digest_length);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_SHA512_HMAC:\n+\t\t\talginfo_a.algtype = OP_ALG_ALGSEL_SHA512;\n+\t\t\talginfo_a.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tshared_desc_len = cnstr_shdsc_hmac(\n+\t\t\t\t\t\tcdb->sh_desc, true,\n+\t\t\t\t\t\tswap, SHR_NEVER, &alginfo_a,\n+\t\t\t\t\t\t!ses->dir,\n+\t\t\t\t\t\tses->digest_length);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_SNOW3G_UIA2:\n+\t\t\talginfo_a.algtype = OP_ALG_ALGSEL_SNOW_F9;\n+\t\t\talginfo_a.algmode = OP_ALG_AAI_F9;\n+\t\t\tses->auth_alg = RTE_CRYPTO_AUTH_SNOW3G_UIA2;\n+\t\t\tshared_desc_len = cnstr_shdsc_snow_f9(\n+\t\t\t\t\t\tcdb->sh_desc, true, swap,\n+\t\t\t\t\t\t&alginfo_a,\n+\t\t\t\t\t\t!ses->dir,\n+\t\t\t\t\t\tses->digest_length);\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_ZUC_EIA3:\n+\t\t\talginfo_a.algtype = OP_ALG_ALGSEL_ZUCA;\n+\t\t\talginfo_a.algmode = OP_ALG_AAI_F9;\n+\t\t\tses->auth_alg = RTE_CRYPTO_AUTH_ZUC_EIA3;\n+\t\t\tshared_desc_len = cnstr_shdsc_zuca(\n+\t\t\t\t\t\tcdb->sh_desc, true, swap,\n+\t\t\t\t\t\t&alginfo_a,\n+\t\t\t\t\t\t!ses->dir,\n+\t\t\t\t\t\tses->digest_length);\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tDPAA_SEC_ERR(\"unsupported auth alg %u\", ses->auth_alg);\n+\t\t}\n \t} else if (is_aead(ses)) {\n \t\tcaam_aead_alg(ses, &alginfo);\n \t\tif (alginfo.algtype == (unsigned int)DPAA_SEC_ALG_UNSUPPORT) {\n@@ -849,6 +981,21 @@ build_auth_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \tstruct qm_sg_entry *sg, *out_sg, *in_sg;\n \tphys_addr_t start_addr;\n \tuint8_t *old_digest, extra_segs;\n+\tint data_len, data_offset;\n+\n+\tdata_len = sym->auth.data.length;\n+\tdata_offset = sym->auth.data.offset;\n+\n+\tif (ses->auth_alg == RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||\n+\t    ses->auth_alg == RTE_CRYPTO_AUTH_ZUC_EIA3) {\n+\t\tif ((data_len & 7) || (data_offset & 7)) {\n+\t\t\tDPAA_SEC_ERR(\"AUTH: len/offset must be full bytes\");\n+\t\t\treturn NULL;\n+\t\t}\n+\n+\t\tdata_len = data_len >> 3;\n+\t\tdata_offset = data_offset >> 3;\n+\t}\n \n \tif (is_decode(ses))\n \t\textra_segs = 3;\n@@ -879,23 +1026,52 @@ build_auth_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \t/* need to extend the input to a compound frame */\n \tin_sg->extension = 1;\n \tin_sg->final = 1;\n-\tin_sg->length = sym->auth.data.length;\n+\tin_sg->length = data_len;\n \tqm_sg_entry_set64(in_sg, dpaa_mem_vtop(&cf->sg[2]));\n \n \t/* 1st seg */\n \tsg = in_sg + 1;\n-\tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n-\tsg->length = mbuf->data_len - sym->auth.data.offset;\n-\tsg->offset = sym->auth.data.offset;\n \n-\t/* Successive segs */\n-\tmbuf = mbuf->next;\n-\twhile (mbuf) {\n+\tif (ses->iv.length) {\n+\t\tuint8_t *iv_ptr;\n+\n+\t\tiv_ptr = rte_crypto_op_ctod_offset(op, uint8_t *,\n+\t\t\t\t\t\t   ses->iv.offset);\n+\n+\t\tif (ses->auth_alg == RTE_CRYPTO_AUTH_SNOW3G_UIA2) {\n+\t\t\tiv_ptr = conv_to_snow_f9_iv(iv_ptr);\n+\t\t\tsg->length = 12;\n+\t\t} else if (ses->auth_alg == RTE_CRYPTO_AUTH_ZUC_EIA3) {\n+\t\t\tiv_ptr = conv_to_zuc_eia_iv(iv_ptr);\n+\t\t\tsg->length = 8;\n+\t\t} else {\n+\t\t\tsg->length = ses->iv.length;\n+\t\t}\n+\t\tqm_sg_entry_set64(sg, dpaa_mem_vtop(iv_ptr));\n+\t\tin_sg->length += sg->length;\n \t\tcpu_to_hw_sg(sg);\n \t\tsg++;\n-\t\tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n-\t\tsg->length = mbuf->data_len;\n-\t\tmbuf = mbuf->next;\n+\t}\n+\n+\tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n+\tsg->offset = data_offset;\n+\n+\tif (data_len <= (mbuf->data_len - data_offset)) {\n+\t\tsg->length = data_len;\n+\t} else {\n+\t\tsg->length = mbuf->data_len - data_offset;\n+\n+\t\t/* remaining i/p segs */\n+\t\twhile ((data_len = data_len - sg->length) &&\n+\t\t       (mbuf = mbuf->next)) {\n+\t\t\tcpu_to_hw_sg(sg);\n+\t\t\tsg++;\n+\t\t\tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n+\t\t\tif (data_len > mbuf->data_len)\n+\t\t\t\tsg->length = mbuf->data_len;\n+\t\t\telse\n+\t\t\t\tsg->length = data_len;\n+\t\t}\n \t}\n \n \tif (is_decode(ses)) {\n@@ -908,9 +1084,6 @@ build_auth_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \t\tqm_sg_entry_set64(sg, start_addr);\n \t\tsg->length = ses->digest_length;\n \t\tin_sg->length += ses->digest_length;\n-\t} else {\n-\t\t/* Digest calculation case */\n-\t\tsg->length -= ses->digest_length;\n \t}\n \tsg->final = 1;\n \tcpu_to_hw_sg(sg);\n@@ -934,9 +1107,24 @@ build_auth_only(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \tstruct rte_mbuf *mbuf = sym->m_src;\n \tstruct dpaa_sec_job *cf;\n \tstruct dpaa_sec_op_ctx *ctx;\n-\tstruct qm_sg_entry *sg;\n+\tstruct qm_sg_entry *sg, *in_sg;\n \trte_iova_t start_addr;\n \tuint8_t *old_digest;\n+\tint data_len, data_offset;\n+\n+\tdata_len = sym->auth.data.length;\n+\tdata_offset = sym->auth.data.offset;\n+\n+\tif (ses->auth_alg == RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||\n+\t    ses->auth_alg == RTE_CRYPTO_AUTH_ZUC_EIA3) {\n+\t\tif ((data_len & 7) || (data_offset & 7)) {\n+\t\t\tDPAA_SEC_ERR(\"AUTH: len/offset must be full bytes\");\n+\t\t\treturn NULL;\n+\t\t}\n+\n+\t\tdata_len = data_len >> 3;\n+\t\tdata_offset = data_offset >> 3;\n+\t}\n \n \tctx = dpaa_sec_alloc_ctx(ses, 4);\n \tif (!ctx)\n@@ -954,36 +1142,55 @@ build_auth_only(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \tcpu_to_hw_sg(sg);\n \n \t/* input */\n-\tsg = &cf->sg[1];\n-\tif (is_decode(ses)) {\n-\t\t/* need to extend the input to a compound frame */\n-\t\tsg->extension = 1;\n-\t\tqm_sg_entry_set64(sg, dpaa_mem_vtop(&cf->sg[2]));\n-\t\tsg->length = sym->auth.data.length + ses->digest_length;\n-\t\tsg->final = 1;\n+\tin_sg = &cf->sg[1];\n+\t/* need to extend the input to a compound frame */\n+\tin_sg->extension = 1;\n+\tin_sg->final = 1;\n+\tin_sg->length = data_len;\n+\tqm_sg_entry_set64(in_sg, dpaa_mem_vtop(&cf->sg[2]));\n+\tsg = &cf->sg[2];\n+\n+\tif (ses->iv.length) {\n+\t\tuint8_t *iv_ptr;\n+\n+\t\tiv_ptr = rte_crypto_op_ctod_offset(op, uint8_t *,\n+\t\t\t\t\t\t   ses->iv.offset);\n+\n+\t\tif (ses->auth_alg == RTE_CRYPTO_AUTH_SNOW3G_UIA2) {\n+\t\t\tiv_ptr = conv_to_snow_f9_iv(iv_ptr);\n+\t\t\tsg->length = 12;\n+\t\t} else if (ses->auth_alg == RTE_CRYPTO_AUTH_ZUC_EIA3) {\n+\t\t\tiv_ptr = conv_to_zuc_eia_iv(iv_ptr);\n+\t\t\tsg->length = 8;\n+\t\t} else {\n+\t\t\tsg->length = ses->iv.length;\n+\t\t}\n+\t\tqm_sg_entry_set64(sg, dpaa_mem_vtop(iv_ptr));\n+\t\tin_sg->length += sg->length;\n \t\tcpu_to_hw_sg(sg);\n+\t\tsg++;\n+\t}\n \n-\t\tsg = &cf->sg[2];\n+\tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n+\tsg->offset = data_offset;\n+\tsg->length = data_len;\n+\n+\tif (is_decode(ses)) {\n+\t\t/* Digest verification case */\n+\t\tcpu_to_hw_sg(sg);\n \t\t/* hash result or digest, save digest first */\n \t\trte_memcpy(old_digest, sym->auth.digest.data,\n-\t\t\t   ses->digest_length);\n-\t\tqm_sg_entry_set64(sg, start_addr + sym->auth.data.offset);\n-\t\tsg->length = sym->auth.data.length;\n-\t\tcpu_to_hw_sg(sg);\n-\n+\t\t\t\tses->digest_length);\n \t\t/* let's check digest by hw */\n \t\tstart_addr = dpaa_mem_vtop(old_digest);\n \t\tsg++;\n \t\tqm_sg_entry_set64(sg, start_addr);\n \t\tsg->length = ses->digest_length;\n-\t\tsg->final = 1;\n-\t\tcpu_to_hw_sg(sg);\n-\t} else {\n-\t\tqm_sg_entry_set64(sg, start_addr + sym->auth.data.offset);\n-\t\tsg->length = sym->auth.data.length;\n-\t\tsg->final = 1;\n-\t\tcpu_to_hw_sg(sg);\n+\t\tin_sg->length += ses->digest_length;\n \t}\n+\tsg->final = 1;\n+\tcpu_to_hw_sg(sg);\n+\tcpu_to_hw_sg(in_sg);\n \n \treturn cf;\n }\n@@ -999,6 +1206,21 @@ build_cipher_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \tuint8_t req_segs;\n \tuint8_t *IV_ptr = rte_crypto_op_ctod_offset(op, uint8_t *,\n \t\t\tses->iv.offset);\n+\tint data_len, data_offset;\n+\n+\tdata_len = sym->cipher.data.length;\n+\tdata_offset = sym->cipher.data.offset;\n+\n+\tif (ses->cipher_alg == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||\n+\t\tses->cipher_alg == RTE_CRYPTO_CIPHER_ZUC_EEA3) {\n+\t\tif ((data_len & 7) || (data_offset & 7)) {\n+\t\t\tDPAA_SEC_ERR(\"CIPHER: len/offset must be full bytes\");\n+\t\t\treturn NULL;\n+\t\t}\n+\n+\t\tdata_len = data_len >> 3;\n+\t\tdata_offset = data_offset >> 3;\n+\t}\n \n \tif (sym->m_dst) {\n \t\tmbuf = sym->m_dst;\n@@ -1007,7 +1229,6 @@ build_cipher_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \t\tmbuf = sym->m_src;\n \t\treq_segs = mbuf->nb_segs * 2 + 3;\n \t}\n-\n \tif (mbuf->nb_segs > MAX_SG_ENTRIES) {\n \t\tDPAA_SEC_DP_ERR(\"Cipher: Max sec segs supported is %d\",\n \t\t\t\tMAX_SG_ENTRIES);\n@@ -1024,15 +1245,15 @@ build_cipher_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \t/* output */\n \tout_sg = &cf->sg[0];\n \tout_sg->extension = 1;\n-\tout_sg->length = sym->cipher.data.length;\n+\tout_sg->length = data_len;\n \tqm_sg_entry_set64(out_sg, dpaa_mem_vtop(&cf->sg[2]));\n \tcpu_to_hw_sg(out_sg);\n \n \t/* 1st seg */\n \tsg = &cf->sg[2];\n \tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n-\tsg->length = mbuf->data_len - sym->cipher.data.offset;\n-\tsg->offset = sym->cipher.data.offset;\n+\tsg->length = mbuf->data_len - data_offset;\n+\tsg->offset = data_offset;\n \n \t/* Successive segs */\n \tmbuf = mbuf->next;\n@@ -1051,7 +1272,7 @@ build_cipher_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \tin_sg = &cf->sg[1];\n \tin_sg->extension = 1;\n \tin_sg->final = 1;\n-\tin_sg->length = sym->cipher.data.length + ses->iv.length;\n+\tin_sg->length = data_len + ses->iv.length;\n \n \tsg++;\n \tqm_sg_entry_set64(in_sg, dpaa_mem_vtop(sg));\n@@ -1065,8 +1286,8 @@ build_cipher_only_sg(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \t/* 1st seg */\n \tsg++;\n \tqm_sg_entry_set64(sg, rte_pktmbuf_mtophys(mbuf));\n-\tsg->length = mbuf->data_len - sym->cipher.data.offset;\n-\tsg->offset = sym->cipher.data.offset;\n+\tsg->length = mbuf->data_len - data_offset;\n+\tsg->offset = data_offset;\n \n \t/* Successive segs */\n \tmbuf = mbuf->next;\n@@ -1093,6 +1314,21 @@ build_cipher_only(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \trte_iova_t src_start_addr, dst_start_addr;\n \tuint8_t *IV_ptr = rte_crypto_op_ctod_offset(op, uint8_t *,\n \t\t\tses->iv.offset);\n+\tint data_len, data_offset;\n+\n+\tdata_len = sym->cipher.data.length;\n+\tdata_offset = sym->cipher.data.offset;\n+\n+\tif (ses->cipher_alg == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||\n+\t\tses->cipher_alg == RTE_CRYPTO_CIPHER_ZUC_EEA3) {\n+\t\tif ((data_len & 7) || (data_offset & 7)) {\n+\t\t\tDPAA_SEC_ERR(\"CIPHER: len/offset must be full bytes\");\n+\t\t\treturn NULL;\n+\t\t}\n+\n+\t\tdata_len = data_len >> 3;\n+\t\tdata_offset = data_offset >> 3;\n+\t}\n \n \tctx = dpaa_sec_alloc_ctx(ses, 4);\n \tif (!ctx)\n@@ -1110,8 +1346,8 @@ build_cipher_only(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \n \t/* output */\n \tsg = &cf->sg[0];\n-\tqm_sg_entry_set64(sg, dst_start_addr + sym->cipher.data.offset);\n-\tsg->length = sym->cipher.data.length + ses->iv.length;\n+\tqm_sg_entry_set64(sg, dst_start_addr + data_offset);\n+\tsg->length = data_len + ses->iv.length;\n \tcpu_to_hw_sg(sg);\n \n \t/* input */\n@@ -1120,7 +1356,7 @@ build_cipher_only(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \t/* need to extend the input to a compound frame */\n \tsg->extension = 1;\n \tsg->final = 1;\n-\tsg->length = sym->cipher.data.length + ses->iv.length;\n+\tsg->length = data_len + ses->iv.length;\n \tqm_sg_entry_set64(sg, dpaa_mem_vtop(&cf->sg[2]));\n \tcpu_to_hw_sg(sg);\n \n@@ -1130,8 +1366,8 @@ build_cipher_only(struct rte_crypto_op *op, dpaa_sec_session *ses)\n \tcpu_to_hw_sg(sg);\n \n \tsg++;\n-\tqm_sg_entry_set64(sg, src_start_addr + sym->cipher.data.offset);\n-\tsg->length = sym->cipher.data.length;\n+\tqm_sg_entry_set64(sg, src_start_addr + data_offset);\n+\tsg->length = data_len;\n \tsg->final = 1;\n \tcpu_to_hw_sg(sg);\n \n@@ -2066,6 +2302,10 @@ dpaa_sec_auth_init(struct rte_cryptodev *dev __rte_unused,\n \t}\n \tsession->auth_key.length = xform->auth.key.length;\n \tsession->digest_length = xform->auth.digest_length;\n+\tif (session->cipher_alg == RTE_CRYPTO_CIPHER_NULL) {\n+\t\tsession->iv.offset = xform->auth.iv.offset;\n+\t\tsession->iv.length = xform->auth.iv.length;\n+\t}\n \n \tmemcpy(session->auth_key.data, xform->auth.key.data,\n \t       xform->auth.key.length);\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h\nindex 009ab7536..149923aa1 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.h\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.h\n@@ -416,7 +416,96 @@ static const struct rte_cryptodev_capabilities dpaa_sec_capabilities[] = {\n \t\t\t}, }\n \t\t}, }\n \t},\n-\n+\t{\t/* SNOW 3G (UIA2) */\n+\t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\n+\t\t{.sym = {\n+\t\t\t.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,\n+\t\t\t{.auth = {\n+\t\t\t\t.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,\n+\t\t\t\t.block_size = 16,\n+\t\t\t\t.key_size = {\n+\t\t\t\t\t.min = 16,\n+\t\t\t\t\t.max = 16,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t},\n+\t\t\t\t.digest_size = {\n+\t\t\t\t\t.min = 4,\n+\t\t\t\t\t.max = 4,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t},\n+\t\t\t\t.iv_size = {\n+\t\t\t\t\t.min = 16,\n+\t\t\t\t\t.max = 16,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t}\n+\t\t\t}, }\n+\t\t}, }\n+\t},\n+\t{\t/* SNOW 3G (UEA2) */\n+\t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\n+\t\t{.sym = {\n+\t\t\t.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,\n+\t\t\t{.cipher = {\n+\t\t\t\t.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,\n+\t\t\t\t.block_size = 16,\n+\t\t\t\t.key_size = {\n+\t\t\t\t\t.min = 16,\n+\t\t\t\t\t.max = 16,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t},\n+\t\t\t\t.iv_size = {\n+\t\t\t\t\t.min = 16,\n+\t\t\t\t\t.max = 16,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t}\n+\t\t\t}, }\n+\t\t}, }\n+\t},\n+\t{\t/* ZUC (EEA3) */\n+\t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\n+\t\t{.sym = {\n+\t\t\t.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,\n+\t\t\t{.cipher = {\n+\t\t\t\t.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,\n+\t\t\t\t.block_size = 16,\n+\t\t\t\t.key_size = {\n+\t\t\t\t\t.min = 16,\n+\t\t\t\t\t.max = 16,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t},\n+\t\t\t\t.iv_size = {\n+\t\t\t\t\t.min = 16,\n+\t\t\t\t\t.max = 16,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t}\n+\t\t\t}, }\n+\t\t}, }\n+\t},\n+\t{\t/* ZUC (EIA3) */\n+\t\t.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,\n+\t\t{.sym = {\n+\t\t\t.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,\n+\t\t\t{.auth = {\n+\t\t\t\t.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,\n+\t\t\t\t.block_size = 16,\n+\t\t\t\t.key_size = {\n+\t\t\t\t\t.min = 16,\n+\t\t\t\t\t.max = 16,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t},\n+\t\t\t\t.digest_size = {\n+\t\t\t\t\t.min = 4,\n+\t\t\t\t\t.max = 4,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t},\n+\t\t\t\t.iv_size = {\n+\t\t\t\t\t.min = 16,\n+\t\t\t\t\t.max = 16,\n+\t\t\t\t\t.increment = 0\n+\t\t\t\t}\n+\t\t\t}, }\n+\t\t}, }\n+\t},\n \tRTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()\n };\n \n",
    "prefixes": [
        "08/10"
    ]
}