Patch Detail

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

{
    "id": 60984,
    "url": "http://patches.dpdk.org/api/patches/60984/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191011163233.31017-11-hemant.agrawal@nxp.com/",
    "project": {
        "id": 1,
        "url": "http://patches.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-11-hemant.agrawal@nxp.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20191011163233.31017-11-hemant.agrawal@nxp.com",
    "date": "2019-10-11T16:32:33",
    "name": "[10/10] crypto/dpaa_sec: code reorg for better session mgmt",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "8bc530d7b7c7a8ef6a73dee57f64ef992551fa3e",
    "submitter": {
        "id": 477,
        "url": "http://patches.dpdk.org/api/people/477/?format=api",
        "name": "Hemant Agrawal",
        "email": "hemant.agrawal@nxp.com"
    },
    "delegate": {
        "id": 6690,
        "url": "http://patches.dpdk.org/api/users/6690/?format=api",
        "username": "akhil",
        "first_name": "akhil",
        "last_name": "goyal",
        "email": "gakhil@marvell.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191011163233.31017-11-hemant.agrawal@nxp.com/mbox/",
    "series": [
        {
            "id": 6807,
            "url": "http://patches.dpdk.org/api/series/6807/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6807",
            "date": "2019-10-11T16:32:23",
            "name": "NXP DPAAx crypto fixes",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/6807/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/60984/comments/",
    "check": "fail",
    "checks": "http://patches.dpdk.org/api/patches/60984/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 524B81EB88;\n\tFri, 11 Oct 2019 18:35:43 +0200 (CEST)",
            "from inva020.nxp.com (inva020.nxp.com [92.121.34.13])\n\tby dpdk.org (Postfix) with ESMTP id D8D131EB56\n\tfor <dev@dpdk.org>; Fri, 11 Oct 2019 18:35:20 +0200 (CEST)",
            "from inva020.nxp.com (localhost [127.0.0.1])\n\tby inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id B7E211A0587;\n\tFri, 11 Oct 2019 18:35:20 +0200 (CEST)",
            "from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com\n\t[165.114.16.14])\n\tby inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 6FD151A0586;\n\tFri, 11 Oct 2019 18:35:18 +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 D20C7402EC;\n\tSat, 12 Oct 2019 00:35:15 +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:33 +0530",
        "Message-Id": "<20191011163233.31017-11-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 10/10] crypto/dpaa_sec: code reorg for better\n\tsession mgmt",
        "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": "The session related parameters shall be populated during\nthe session create only.\nAt the runtime on first packet, the CDB should just reference\nthe session data instead of re-interpreting data again.\n\nSigned-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\n drivers/crypto/dpaa_sec/dpaa_sec.c | 612 ++++++++++++++++-------------\n drivers/crypto/dpaa_sec/dpaa_sec.h |  18 +-\n 2 files changed, 345 insertions(+), 285 deletions(-)",
    "diff": "diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex 970cdf0cc..b932bf1cb 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -290,102 +290,6 @@ static inline int is_decode(dpaa_sec_session *ses)\n \treturn ses->dir == DIR_DEC;\n }\n \n-static inline void\n-caam_auth_alg(dpaa_sec_session *ses, struct alginfo *alginfo_a)\n-{\n-\tswitch (ses->auth_alg) {\n-\tcase RTE_CRYPTO_AUTH_NULL:\n-\t\talginfo_a->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_HMAC_NULL : 0;\n-\t\tses->digest_length = 0;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_MD5_HMAC:\n-\t\talginfo_a->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_HMAC_MD5_96 : OP_ALG_ALGSEL_MD5;\n-\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n-\t\talginfo_a->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_HMAC_SHA1_96 : OP_ALG_ALGSEL_SHA1;\n-\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_SHA224_HMAC:\n-\t\talginfo_a->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_HMAC_SHA1_160 : OP_ALG_ALGSEL_SHA224;\n-\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n-\t\talginfo_a->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_HMAC_SHA2_256_128 : OP_ALG_ALGSEL_SHA256;\n-\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_SHA384_HMAC:\n-\t\talginfo_a->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_HMAC_SHA2_384_192 : OP_ALG_ALGSEL_SHA384;\n-\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_AUTH_SHA512_HMAC:\n-\t\talginfo_a->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_HMAC_SHA2_512_256 : OP_ALG_ALGSEL_SHA512;\n-\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n-\t\tbreak;\n-\tdefault:\n-\t\tDPAA_SEC_ERR(\"unsupported auth alg %u\", ses->auth_alg);\n-\t}\n-}\n-\n-static inline void\n-caam_cipher_alg(dpaa_sec_session *ses, struct alginfo *alginfo_c)\n-{\n-\tswitch (ses->cipher_alg) {\n-\tcase RTE_CRYPTO_CIPHER_NULL:\n-\t\talginfo_c->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_NULL : 0;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n-\t\talginfo_c->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_AES_CBC : OP_ALG_ALGSEL_AES;\n-\t\talginfo_c->algmode = OP_ALG_AAI_CBC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_CIPHER_3DES_CBC:\n-\t\talginfo_c->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_3DES : OP_ALG_ALGSEL_3DES;\n-\t\talginfo_c->algmode = OP_ALG_AAI_CBC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n-\t\talginfo_c->algtype =\n-\t\t\t(ses->proto_alg == RTE_SECURITY_PROTOCOL_IPSEC) ?\n-\t\t\tOP_PCL_IPSEC_AES_CTR : OP_ALG_ALGSEL_AES;\n-\t\talginfo_c->algmode = OP_ALG_AAI_CTR;\n-\t\tbreak;\n-\tdefault:\n-\t\tDPAA_SEC_ERR(\"unsupported cipher alg %d\", ses->cipher_alg);\n-\t}\n-}\n-\n-static inline void\n-caam_aead_alg(dpaa_sec_session *ses, struct alginfo *alginfo)\n-{\n-\tswitch (ses->aead_alg) {\n-\tcase RTE_CRYPTO_AEAD_AES_GCM:\n-\t\talginfo->algtype = OP_ALG_ALGSEL_AES;\n-\t\talginfo->algmode = OP_ALG_AAI_GCM;\n-\t\tbreak;\n-\tdefault:\n-\t\tDPAA_SEC_ERR(\"unsupported AEAD alg %d\", ses->aead_alg);\n-\t}\n-}\n-\n static int\n dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)\n {\n@@ -400,58 +304,24 @@ dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses)\n \tint swap = true;\n #endif\n \n-\tswitch (ses->cipher_alg) {\n-\tcase RTE_CRYPTO_CIPHER_SNOW3G_UEA2:\n-\t\tcipherdata.algtype = PDCP_CIPHER_TYPE_SNOW;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_CIPHER_ZUC_EEA3:\n-\t\tcipherdata.algtype = PDCP_CIPHER_TYPE_ZUC;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n-\t\tcipherdata.algtype = PDCP_CIPHER_TYPE_AES;\n-\t\tbreak;\n-\tcase RTE_CRYPTO_CIPHER_NULL:\n-\t\tcipherdata.algtype = PDCP_CIPHER_TYPE_NULL;\n-\t\tbreak;\n-\tdefault:\n-\t\tDPAA_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n-\t\t\t      ses->cipher_alg);\n-\t\treturn -1;\n-\t}\n-\n \tcipherdata.key = (size_t)ses->cipher_key.data;\n \tcipherdata.keylen = ses->cipher_key.length;\n \tcipherdata.key_enc_flags = 0;\n \tcipherdata.key_type = RTA_DATA_IMM;\n+\tcipherdata.algtype = ses->cipher_key.alg;\n+\tcipherdata.algmode = ses->cipher_key.algmode;\n \n \tcdb->sh_desc[0] = cipherdata.keylen;\n \tcdb->sh_desc[1] = 0;\n \tcdb->sh_desc[2] = 0;\n \n \tif (ses->auth_alg) {\n-\t\tswitch (ses->auth_alg) {\n-\t\tcase RTE_CRYPTO_AUTH_SNOW3G_UIA2:\n-\t\t\tauthdata.algtype = PDCP_AUTH_TYPE_SNOW;\n-\t\t\tbreak;\n-\t\tcase RTE_CRYPTO_AUTH_ZUC_EIA3:\n-\t\t\tauthdata.algtype = PDCP_AUTH_TYPE_ZUC;\n-\t\t\tbreak;\n-\t\tcase RTE_CRYPTO_AUTH_AES_CMAC:\n-\t\t\tauthdata.algtype = PDCP_AUTH_TYPE_AES;\n-\t\t\tbreak;\n-\t\tcase RTE_CRYPTO_AUTH_NULL:\n-\t\t\tauthdata.algtype = PDCP_AUTH_TYPE_NULL;\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tDPAA_SEC_ERR(\"Crypto: Unsupported auth alg %u\",\n-\t\t\t\t      ses->auth_alg);\n-\t\t\treturn -1;\n-\t\t}\n-\n \t\tauthdata.key = (size_t)ses->auth_key.data;\n \t\tauthdata.keylen = ses->auth_key.length;\n \t\tauthdata.key_enc_flags = 0;\n \t\tauthdata.key_type = RTA_DATA_IMM;\n+\t\tauthdata.algtype = ses->auth_key.alg;\n+\t\tauthdata.algmode = ses->auth_key.algmode;\n \n \t\tp_authdata = &authdata;\n \n@@ -541,27 +411,19 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses)\n \tint swap = true;\n #endif\n \n-\tcaam_cipher_alg(ses, &cipherdata);\n-\tif (cipherdata.algtype == (unsigned int)DPAA_SEC_ALG_UNSUPPORT) {\n-\t\tDPAA_SEC_ERR(\"not supported cipher alg\");\n-\t\treturn -ENOTSUP;\n-\t}\n-\n \tcipherdata.key = (size_t)ses->cipher_key.data;\n \tcipherdata.keylen = ses->cipher_key.length;\n \tcipherdata.key_enc_flags = 0;\n \tcipherdata.key_type = RTA_DATA_IMM;\n-\n-\tcaam_auth_alg(ses, &authdata);\n-\tif (authdata.algtype == (unsigned int)DPAA_SEC_ALG_UNSUPPORT) {\n-\t\tDPAA_SEC_ERR(\"not supported auth alg\");\n-\t\treturn -ENOTSUP;\n-\t}\n+\tcipherdata.algtype = ses->cipher_key.alg;\n+\tcipherdata.algmode = ses->cipher_key.algmode;\n \n \tauthdata.key = (size_t)ses->auth_key.data;\n \tauthdata.keylen = ses->auth_key.length;\n \tauthdata.key_enc_flags = 0;\n \tauthdata.key_type = RTA_DATA_IMM;\n+\tauthdata.algtype = ses->auth_key.alg;\n+\tauthdata.algmode = ses->auth_key.algmode;\n \n \tcdb->sh_desc[0] = cipherdata.keylen;\n \tcdb->sh_desc[1] = authdata.keylen;\n@@ -625,58 +487,26 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n \n \tmemset(cdb, 0, sizeof(struct sec_cdb));\n \n-\tif (is_proto_ipsec(ses)) {\n+\tswitch (ses->ctxt) {\n+\tcase DPAA_SEC_IPSEC:\n \t\tshared_desc_len = dpaa_sec_prep_ipsec_cdb(ses);\n-\t} else if (is_proto_pdcp(ses)) {\n+\t\tbreak;\n+\tcase DPAA_SEC_PDCP:\n \t\tshared_desc_len = dpaa_sec_prep_pdcp_cdb(ses);\n-\t} else if (is_cipher_only(ses)) {\n+\t\tbreak;\n+\tcase DPAA_SEC_CIPHER:\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+\t\talginfo_c.algtype = ses->cipher_key.alg;\n+\t\talginfo_c.algmode = ses->cipher_key.algmode;\n+\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@@ -685,14 +515,12 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\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@@ -703,69 +531,21 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n \t\t\t\t     ses->cipher_alg);\n \t\t\treturn -ENOTSUP;\n \t\t}\n-\t} else if (is_auth_only(ses)) {\n+\t\tbreak;\n+\tcase DPAA_SEC_AUTH:\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+\t\talginfo_a.algtype = ses->auth_key.alg;\n+\t\talginfo_a.algmode = ses->auth_key.algmode;\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@@ -773,9 +553,6 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\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@@ -783,9 +560,6 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\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@@ -795,8 +569,8 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\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\tbreak;\n+\tcase DPAA_SEC_AEAD:\n \t\tif (alginfo.algtype == (unsigned int)DPAA_SEC_ALG_UNSUPPORT) {\n \t\t\tDPAA_SEC_ERR(\"not supported aead alg\");\n \t\t\treturn -ENOTSUP;\n@@ -805,6 +579,8 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n \t\talginfo.keylen = ses->aead_key.length;\n \t\talginfo.key_enc_flags = 0;\n \t\talginfo.key_type = RTA_DATA_IMM;\n+\t\talginfo.algtype = ses->aead_key.alg;\n+\t\talginfo.algmode = ses->aead_key.algmode;\n \n \t\tif (ses->dir == DIR_ENC)\n \t\t\tshared_desc_len = cnstr_shdsc_gcm_encap(\n@@ -818,28 +594,21 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n \t\t\t\t\t&alginfo,\n \t\t\t\t\tses->iv.length,\n \t\t\t\t\tses->digest_length);\n-\t} else {\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\tbreak;\n+\tcase DPAA_SEC_CIPHER_HASH:\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\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\t\treturn -ENOTSUP;\n-\t\t}\n+\t\talginfo_c.algtype = ses->cipher_key.alg;\n+\t\talginfo_c.algmode = ses->cipher_key.algmode;\n \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+\t\talginfo_a.algtype = ses->auth_key.alg;\n+\t\talginfo_a.algmode = ses->auth_key.algmode;\n \n \t\tcdb->sh_desc[0] = alginfo_c.keylen;\n \t\tcdb->sh_desc[1] = alginfo_a.keylen;\n@@ -876,6 +645,11 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)\n \t\t\t\ttrue, swap, SHR_SERIAL, &alginfo_c, &alginfo_a,\n \t\t\t\tses->iv.length,\n \t\t\t\tses->digest_length, ses->dir);\n+\t\tbreak;\n+\tcase DPAA_SEC_HASH_CIPHER:\n+\tdefault:\n+\t\tDPAA_SEC_ERR(\"error: Unsupported session\");\n+\t\treturn -ENOTSUP;\n \t}\n \n \tif (shared_desc_len < 0) {\n@@ -2053,18 +1827,22 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\tif (rte_pktmbuf_is_contiguous(op->sym->m_src) &&\n \t\t\t\t  ((op->sym->m_dst == NULL) ||\n \t\t\t\t   rte_pktmbuf_is_contiguous(op->sym->m_dst))) {\n-\t\t\t\tif (is_proto_ipsec(ses)) {\n-\t\t\t\t\tcf = build_proto(op, ses);\n-\t\t\t\t} else if (is_proto_pdcp(ses)) {\n+\t\t\t\tswitch (ses->ctxt) {\n+\t\t\t\tcase DPAA_SEC_PDCP:\n+\t\t\t\tcase DPAA_SEC_IPSEC:\n \t\t\t\t\tcf = build_proto(op, ses);\n-\t\t\t\t} else if (is_auth_only(ses)) {\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase DPAA_SEC_AUTH:\n \t\t\t\t\tcf = build_auth_only(op, ses);\n-\t\t\t\t} else if (is_cipher_only(ses)) {\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase DPAA_SEC_CIPHER:\n \t\t\t\t\tcf = build_cipher_only(op, ses);\n-\t\t\t\t} else if (is_aead(ses)) {\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase DPAA_SEC_AEAD:\n \t\t\t\t\tcf = build_cipher_auth_gcm(op, ses);\n \t\t\t\t\tauth_hdr_len = ses->auth_only_len;\n-\t\t\t\t} else if (is_auth_cipher(ses)) {\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase DPAA_SEC_CIPHER_HASH:\n \t\t\t\t\tauth_hdr_len =\n \t\t\t\t\t\top->sym->cipher.data.offset\n \t\t\t\t\t\t- op->sym->auth.data.offset;\n@@ -2073,23 +1851,30 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t\t\t- op->sym->cipher.data.length\n \t\t\t\t\t\t- auth_hdr_len;\n \t\t\t\t\tcf = build_cipher_auth(op, ses);\n-\t\t\t\t} else {\n+\t\t\t\t\tbreak;\n+\t\t\t\tdefault:\n \t\t\t\t\tDPAA_SEC_DP_ERR(\"not supported ops\");\n \t\t\t\t\tframes_to_send = loop;\n \t\t\t\t\tnb_ops = loop;\n \t\t\t\t\tgoto send_pkts;\n \t\t\t\t}\n \t\t\t} else {\n-\t\t\t\tif (is_proto_pdcp(ses) || is_proto_ipsec(ses)) {\n+\t\t\t\tswitch (ses->ctxt) {\n+\t\t\t\tcase DPAA_SEC_PDCP:\n+\t\t\t\tcase DPAA_SEC_IPSEC:\n \t\t\t\t\tcf = build_proto_sg(op, ses);\n-\t\t\t\t} else if (is_auth_only(ses)) {\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase DPAA_SEC_AUTH:\n \t\t\t\t\tcf = build_auth_only_sg(op, ses);\n-\t\t\t\t} else if (is_cipher_only(ses)) {\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase DPAA_SEC_CIPHER:\n \t\t\t\t\tcf = build_cipher_only_sg(op, ses);\n-\t\t\t\t} else if (is_aead(ses)) {\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase DPAA_SEC_AEAD:\n \t\t\t\t\tcf = build_cipher_auth_gcm_sg(op, ses);\n \t\t\t\t\tauth_hdr_len = ses->auth_only_len;\n-\t\t\t\t} else if (is_auth_cipher(ses)) {\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase DPAA_SEC_CIPHER_HASH:\n \t\t\t\t\tauth_hdr_len =\n \t\t\t\t\t\top->sym->cipher.data.offset\n \t\t\t\t\t\t- op->sym->auth.data.offset;\n@@ -2098,7 +1883,8 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\t\t\t- op->sym->cipher.data.length\n \t\t\t\t\t\t- auth_hdr_len;\n \t\t\t\t\tcf = build_cipher_auth_sg(op, ses);\n-\t\t\t\t} else {\n+\t\t\t\t\tbreak;\n+\t\t\t\tdefault:\n \t\t\t\t\tDPAA_SEC_DP_ERR(\"not supported ops\");\n \t\t\t\t\tframes_to_send = loop;\n \t\t\t\t\tnb_ops = loop;\n@@ -2282,6 +2068,31 @@ dpaa_sec_cipher_init(struct rte_cryptodev *dev __rte_unused,\n \n \tmemcpy(session->cipher_key.data, xform->cipher.key.data,\n \t       xform->cipher.key.length);\n+\tswitch (xform->cipher.algo) {\n+\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n+\t\tsession->cipher_key.alg = OP_ALG_ALGSEL_AES;\n+\t\tsession->cipher_key.algmode = OP_ALG_AAI_CBC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_CIPHER_3DES_CBC:\n+\t\tsession->cipher_key.alg = OP_ALG_ALGSEL_3DES;\n+\t\tsession->cipher_key.algmode = OP_ALG_AAI_CBC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n+\t\tsession->cipher_key.alg = OP_ALG_ALGSEL_AES;\n+\t\tsession->cipher_key.algmode = OP_ALG_AAI_CTR;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_CIPHER_SNOW3G_UEA2:\n+\t\tsession->cipher_key.alg = OP_ALG_ALGSEL_SNOW_F8;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_CIPHER_ZUC_EEA3:\n+\t\tsession->cipher_key.alg = OP_ALG_ALGSEL_ZUCE;\n+\t\tbreak;\n+\tdefault:\n+\t\tDPAA_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n+\t\t\t      xform->cipher.algo);\n+\t\trte_free(session->cipher_key.data);\n+\t\treturn -1;\n+\t}\n \tsession->dir = (xform->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?\n \t\t\tDIR_ENC : DIR_DEC;\n \n@@ -2309,18 +2120,165 @@ dpaa_sec_auth_init(struct rte_cryptodev *dev __rte_unused,\n \n \tmemcpy(session->auth_key.data, xform->auth.key.data,\n \t       xform->auth.key.length);\n+\n+\tswitch (xform->auth.algo) {\n+\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SHA1;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_MD5_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_MD5;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA224_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SHA224;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SHA256;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA384_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SHA384;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA512_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SHA512;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SNOW3G_UIA2:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SNOW_F9;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_F9;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_ZUC_EIA3:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_ZUCA;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_F9;\n+\t\tbreak;\n+\tdefault:\n+\t\tDPAA_SEC_ERR(\"Crypto: Unsupported Auth specified %u\",\n+\t\t\t      xform->auth.algo);\n+\t\trte_free(session->auth_key.data);\n+\t\treturn -1;\n+\t}\n+\n \tsession->dir = (xform->auth.op == RTE_CRYPTO_AUTH_OP_GENERATE) ?\n \t\t\tDIR_ENC : DIR_DEC;\n \n \treturn 0;\n }\n \n+static int\n+dpaa_sec_chain_init(struct rte_cryptodev *dev __rte_unused,\n+\t\t   struct rte_crypto_sym_xform *xform,\n+\t\t   dpaa_sec_session *session)\n+{\n+\n+\tstruct rte_crypto_cipher_xform *cipher_xform;\n+\tstruct rte_crypto_auth_xform *auth_xform;\n+\n+\tif (session->auth_cipher_text) {\n+\t\tcipher_xform = &xform->cipher;\n+\t\tauth_xform = &xform->next->auth;\n+\t} else {\n+\t\tcipher_xform = &xform->next->cipher;\n+\t\tauth_xform = &xform->auth;\n+\t}\n+\n+\t/* Set IV parameters */\n+\tsession->iv.offset = cipher_xform->iv.offset;\n+\tsession->iv.length = cipher_xform->iv.length;\n+\n+\tsession->cipher_key.data = rte_zmalloc(NULL, cipher_xform->key.length,\n+\t\t\t\t\t       RTE_CACHE_LINE_SIZE);\n+\tif (session->cipher_key.data == NULL && cipher_xform->key.length > 0) {\n+\t\tDPAA_SEC_ERR(\"No Memory for cipher key\");\n+\t\treturn -1;\n+\t}\n+\tsession->cipher_key.length = cipher_xform->key.length;\n+\tsession->auth_key.data = rte_zmalloc(NULL, auth_xform->key.length,\n+\t\t\t\t\t     RTE_CACHE_LINE_SIZE);\n+\tif (session->auth_key.data == NULL && auth_xform->key.length > 0) {\n+\t\tDPAA_SEC_ERR(\"No Memory for auth key\");\n+\t\trte_free(session->cipher_key.data);\n+\t\treturn -ENOMEM;\n+\t}\n+\tsession->auth_key.length = auth_xform->key.length;\n+\tmemcpy(session->cipher_key.data, cipher_xform->key.data,\n+\t       cipher_xform->key.length);\n+\tmemcpy(session->auth_key.data, auth_xform->key.data,\n+\t       auth_xform->key.length);\n+\n+\tsession->digest_length = auth_xform->digest_length;\n+\tsession->auth_alg = auth_xform->algo;\n+\n+\tswitch (auth_xform->algo) {\n+\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SHA1;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_MD5_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_MD5;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA224_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SHA224;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SHA256;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA384_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SHA384;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA512_HMAC:\n+\t\tsession->auth_key.alg = OP_ALG_ALGSEL_SHA512;\n+\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tdefault:\n+\t\tDPAA_SEC_ERR(\"Crypto: Unsupported Auth specified %u\",\n+\t\t\t      auth_xform->algo);\n+\t\tgoto error_out;\n+\t}\n+\n+\tsession->cipher_alg = cipher_xform->algo;\n+\n+\tswitch (cipher_xform->algo) {\n+\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n+\t\tsession->cipher_key.alg = OP_ALG_ALGSEL_AES;\n+\t\tsession->cipher_key.algmode = OP_ALG_AAI_CBC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_CIPHER_3DES_CBC:\n+\t\tsession->cipher_key.alg = OP_ALG_ALGSEL_3DES;\n+\t\tsession->cipher_key.algmode = OP_ALG_AAI_CBC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n+\t\tsession->cipher_key.alg = OP_ALG_ALGSEL_AES;\n+\t\tsession->cipher_key.algmode = OP_ALG_AAI_CTR;\n+\t\tbreak;\n+\tdefault:\n+\t\tDPAA_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n+\t\t\t      cipher_xform->algo);\n+\t\tgoto error_out;\n+\t}\n+\tsession->dir = (cipher_xform->op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?\n+\t\t\t\tDIR_ENC : DIR_DEC;\n+\treturn 0;\n+\n+error_out:\n+\trte_free(session->cipher_key.data);\n+\trte_free(session->auth_key.data);\n+\treturn -1;\n+}\n+\n static int\n dpaa_sec_aead_init(struct rte_cryptodev *dev __rte_unused,\n \t\t   struct rte_crypto_sym_xform *xform,\n \t\t   dpaa_sec_session *session)\n {\n \tsession->aead_alg = xform->aead.algo;\n+\tsession->ctxt = DPAA_SEC_AEAD;\n \tsession->iv.length = xform->aead.iv.length;\n \tsession->iv.offset = xform->aead.iv.offset;\n \tsession->auth_only_len = xform->aead.aad_length;\n@@ -2335,6 +2293,18 @@ dpaa_sec_aead_init(struct rte_cryptodev *dev __rte_unused,\n \n \tmemcpy(session->aead_key.data, xform->aead.key.data,\n \t       xform->aead.key.length);\n+\n+\tswitch (session->aead_alg) {\n+\tcase RTE_CRYPTO_AEAD_AES_GCM:\n+\t\tsession->aead_key.alg = OP_ALG_ALGSEL_AES;\n+\t\tsession->aead_key.algmode = OP_ALG_AAI_GCM;\n+\t\tbreak;\n+\tdefault:\n+\t\tDPAA_SEC_ERR(\"unsupported AEAD alg %d\", session->aead_alg);\n+\t\trte_free(session->aead_key.data);\n+\t\treturn -ENOMEM;\n+\t}\n+\n \tsession->dir = (xform->aead.op == RTE_CRYPTO_AEAD_OP_ENCRYPT) ?\n \t\t\tDIR_ENC : DIR_DEC;\n \n@@ -2422,31 +2392,34 @@ dpaa_sec_set_session_parameters(struct rte_cryptodev *dev,\n \t/* Cipher Only */\n \tif (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER && xform->next == NULL) {\n \t\tsession->auth_alg = RTE_CRYPTO_AUTH_NULL;\n+\t\tsession->ctxt = DPAA_SEC_CIPHER;\n \t\tdpaa_sec_cipher_init(dev, xform, session);\n \n \t/* Authentication Only */\n \t} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n \t\t   xform->next == NULL) {\n \t\tsession->cipher_alg = RTE_CRYPTO_CIPHER_NULL;\n+\t\tsession->ctxt = DPAA_SEC_AUTH;\n \t\tdpaa_sec_auth_init(dev, xform, session);\n \n \t/* Cipher then Authenticate */\n \t} else if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&\n \t\t   xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) {\n \t\tif (xform->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {\n-\t\t\tdpaa_sec_cipher_init(dev, xform, session);\n-\t\t\tdpaa_sec_auth_init(dev, xform->next, session);\n+\t\t\tsession->ctxt = DPAA_SEC_CIPHER_HASH;\n+\t\t\tsession->auth_cipher_text = 1;\n+\t\t\tdpaa_sec_chain_init(dev, xform, session);\n \t\t} else {\n \t\t\tDPAA_SEC_ERR(\"Not supported: Auth then Cipher\");\n \t\t\treturn -EINVAL;\n \t\t}\n-\n \t/* Authenticate then Cipher */\n \t} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n \t\t   xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {\n \t\tif (xform->next->cipher.op == RTE_CRYPTO_CIPHER_OP_DECRYPT) {\n-\t\t\tdpaa_sec_auth_init(dev, xform, session);\n-\t\t\tdpaa_sec_cipher_init(dev, xform->next, session);\n+\t\t\tsession->ctxt = DPAA_SEC_CIPHER_HASH;\n+\t\t\tsession->auth_cipher_text = 0;\n+\t\t\tdpaa_sec_chain_init(dev, xform, session);\n \t\t} else {\n \t\t\tDPAA_SEC_ERR(\"Not supported: Auth then Cipher\");\n \t\t\treturn -EINVAL;\n@@ -2574,6 +2547,7 @@ dpaa_sec_set_ipsec_session(__rte_unused struct rte_cryptodev *dev,\n \t\t\tcipher_xform = &conf->crypto_xform->next->cipher;\n \t}\n \tsession->proto_alg = conf->protocol;\n+\tsession->ctxt = DPAA_SEC_IPSEC;\n \n \tif (cipher_xform && cipher_xform->algo != RTE_CRYPTO_CIPHER_NULL) {\n \t\tsession->cipher_key.data = rte_zmalloc(NULL,\n@@ -2589,9 +2563,20 @@ dpaa_sec_set_ipsec_session(__rte_unused struct rte_cryptodev *dev,\n \t\tsession->cipher_key.length = cipher_xform->key.length;\n \n \t\tswitch (cipher_xform->algo) {\n+\t\tcase RTE_CRYPTO_CIPHER_NULL:\n+\t\t\tsession->cipher_key.alg = OP_PCL_IPSEC_NULL;\n+\t\t\tbreak;\n \t\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n+\t\t\tsession->cipher_key.alg = OP_PCL_IPSEC_AES_CBC;\n+\t\t\tsession->cipher_key.algmode = OP_ALG_AAI_CBC;\n+\t\t\tbreak;\n \t\tcase RTE_CRYPTO_CIPHER_3DES_CBC:\n+\t\t\tsession->cipher_key.alg = OP_PCL_IPSEC_3DES;\n+\t\t\tsession->cipher_key.algmode = OP_ALG_AAI_CBC;\n+\t\t\tbreak;\n \t\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n+\t\t\tsession->cipher_key.alg = OP_PCL_IPSEC_AES_CTR;\n+\t\t\tsession->cipher_key.algmode = OP_ALG_AAI_CTR;\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tDPAA_SEC_ERR(\"Crypto: Unsupported Cipher alg %u\",\n@@ -2620,12 +2605,33 @@ dpaa_sec_set_ipsec_session(__rte_unused struct rte_cryptodev *dev,\n \t\tsession->auth_key.length = auth_xform->key.length;\n \n \t\tswitch (auth_xform->algo) {\n-\t\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n+\t\tcase RTE_CRYPTO_AUTH_NULL:\n+\t\t\tsession->auth_key.alg = OP_PCL_IPSEC_HMAC_NULL;\n+\t\t\tsession->digest_length = 0;\n+\t\t\tbreak;\n \t\tcase RTE_CRYPTO_AUTH_MD5_HMAC:\n+\t\t\tsession->auth_key.alg = OP_PCL_IPSEC_HMAC_MD5_96;\n+\t\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n+\t\t\tsession->auth_key.alg = OP_PCL_IPSEC_HMAC_SHA1_96;\n+\t\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_SHA224_HMAC:\n+\t\t\tsession->auth_key.alg = OP_PCL_IPSEC_HMAC_SHA1_160;\n+\t\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tbreak;\n \t\tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n+\t\t\tsession->auth_key.alg = OP_PCL_IPSEC_HMAC_SHA2_256_128;\n+\t\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tbreak;\n \t\tcase RTE_CRYPTO_AUTH_SHA384_HMAC:\n+\t\t\tsession->auth_key.alg = OP_PCL_IPSEC_HMAC_SHA2_384_192;\n+\t\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n+\t\t\tbreak;\n \t\tcase RTE_CRYPTO_AUTH_SHA512_HMAC:\n-\t\tcase RTE_CRYPTO_AUTH_AES_CMAC:\n+\t\t\tsession->auth_key.alg = OP_PCL_IPSEC_HMAC_SHA2_512_256;\n+\t\t\tsession->auth_key.algmode = OP_ALG_AAI_HMAC;\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tDPAA_SEC_ERR(\"Crypto: Unsupported auth alg %u\",\n@@ -2766,7 +2772,28 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,\n \t}\n \n \tsession->proto_alg = conf->protocol;\n+\tsession->ctxt = DPAA_SEC_PDCP;\n+\n \tif (cipher_xform) {\n+\t\tswitch (cipher_xform->algo) {\n+\t\tcase RTE_CRYPTO_CIPHER_SNOW3G_UEA2:\n+\t\t\tsession->cipher_key.alg = PDCP_CIPHER_TYPE_SNOW;\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_CIPHER_ZUC_EEA3:\n+\t\t\tsession->cipher_key.alg = PDCP_CIPHER_TYPE_ZUC;\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n+\t\t\tsession->cipher_key.alg = PDCP_CIPHER_TYPE_AES;\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_CIPHER_NULL:\n+\t\t\tsession->cipher_key.alg = PDCP_CIPHER_TYPE_NULL;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tDPAA_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n+\t\t\t\t      session->cipher_alg);\n+\t\t\treturn -1;\n+\t\t}\n+\n \t\tsession->cipher_key.data = rte_zmalloc(NULL,\n \t\t\t\t\t       cipher_xform->key.length,\n \t\t\t\t\t       RTE_CACHE_LINE_SIZE);\n@@ -2798,6 +2825,25 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,\n \t}\n \n \tif (auth_xform) {\n+\t\tswitch (auth_xform->algo) {\n+\t\tcase RTE_CRYPTO_AUTH_SNOW3G_UIA2:\n+\t\t\tsession->auth_key.alg = PDCP_AUTH_TYPE_SNOW;\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_ZUC_EIA3:\n+\t\t\tsession->auth_key.alg = PDCP_AUTH_TYPE_ZUC;\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_AES_CMAC:\n+\t\t\tsession->auth_key.alg = PDCP_AUTH_TYPE_AES;\n+\t\t\tbreak;\n+\t\tcase RTE_CRYPTO_AUTH_NULL:\n+\t\t\tsession->auth_key.alg = PDCP_AUTH_TYPE_NULL;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tDPAA_SEC_ERR(\"Crypto: Unsupported auth alg %u\",\n+\t\t\t\t      session->auth_alg);\n+\t\t\trte_free(session->cipher_key.data);\n+\t\t\treturn -1;\n+\t\t}\n \t\tsession->auth_key.data = rte_zmalloc(NULL,\n \t\t\t\t\t\t     auth_xform->key.length,\n \t\t\t\t\t\t     RTE_CACHE_LINE_SIZE);\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h\nindex 149923aa1..a661d5a56 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.h\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.h\n@@ -38,14 +38,19 @@ enum dpaa_sec_op_type {\n \tDPAA_SEC_NONE,  /*!< No Cipher operations*/\n \tDPAA_SEC_CIPHER,/*!< CIPHER operations */\n \tDPAA_SEC_AUTH,  /*!< Authentication Operations */\n-\tDPAA_SEC_AEAD,  /*!< Authenticated Encryption with associated data */\n+\tDPAA_SEC_AEAD,  /*!< AEAD (AES-GCM/CCM) type operations */\n+\tDPAA_SEC_CIPHER_HASH,  /*!< Authenticated Encryption with\n+\t\t\t\t* associated data\n+\t\t\t\t*/\n+\tDPAA_SEC_HASH_CIPHER,  /*!< Encryption with Authenticated\n+\t\t\t\t* associated data\n+\t\t\t\t*/\n \tDPAA_SEC_IPSEC, /*!< IPSEC protocol operations*/\n \tDPAA_SEC_PDCP,  /*!< PDCP protocol operations*/\n \tDPAA_SEC_PKC,   /*!< Public Key Cryptographic Operations */\n \tDPAA_SEC_MAX\n };\n \n-\n #define DPAA_SEC_MAX_DESC_SIZE  64\n /* code or cmd block to caam */\n struct sec_cdb {\n@@ -113,6 +118,7 @@ struct sec_pdcp_ctxt {\n \n typedef struct dpaa_sec_session_entry {\n \tuint8_t dir;         /*!< Operation Direction */\n+\tuint8_t ctxt;\t/*!< Session Context Type */\n \tenum rte_crypto_cipher_algorithm cipher_alg; /*!< Cipher Algorithm*/\n \tenum rte_crypto_auth_algorithm auth_alg; /*!< Authentication Algorithm*/\n \tenum rte_crypto_aead_algorithm aead_alg; /*!< AEAD Algorithm*/\n@@ -121,15 +127,21 @@ typedef struct dpaa_sec_session_entry {\n \t\tstruct {\n \t\t\tuint8_t *data;\t/**< pointer to key data */\n \t\t\tsize_t length;\t/**< key length in bytes */\n+\t\t\tuint32_t alg;\n+\t\t\tuint32_t algmode;\n \t\t} aead_key;\n \t\tstruct {\n \t\t\tstruct {\n \t\t\t\tuint8_t *data;\t/**< pointer to key data */\n \t\t\t\tsize_t length;\t/**< key length in bytes */\n+\t\t\t\tuint32_t alg;\n+\t\t\t\tuint32_t algmode;\n \t\t\t} cipher_key;\n \t\t\tstruct {\n \t\t\t\tuint8_t *data;\t/**< pointer to key data */\n \t\t\t\tsize_t length;\t/**< key length in bytes */\n+\t\t\t\tuint32_t alg;\n+\t\t\t\tuint32_t algmode;\n \t\t\t} auth_key;\n \t\t};\n \t};\n@@ -148,6 +160,8 @@ typedef struct dpaa_sec_session_entry {\n \t\t\t\tstruct ip ip4_hdr;\n \t\t\t\tstruct rte_ipv6_hdr ip6_hdr;\n \t\t\t};\n+\t\t\tuint8_t auth_cipher_text;\n+\t\t\t\t/**< Authenticate/cipher ordering */\n \t\t};\n \t\tstruct sec_pdcp_ctxt pdcp;\n \t};\n",
    "prefixes": [
        "10/10"
    ]
}