Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/136516/?format=api
{ "id": 136516, "url": "http://patches.dpdk.org/api/patches/136516/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240208085956.1741174-1-ndabilpuram@marvell.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": "<20240208085956.1741174-1-ndabilpuram@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240208085956.1741174-1-ndabilpuram@marvell.com", "date": "2024-02-08T08:59:44", "name": "[01/13] common/cnxk: remove cn9k Inline IPsec FP opcode defines", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "064181de416a23df087a3baba18f23bc7667a2e6", "submitter": { "id": 1202, "url": "http://patches.dpdk.org/api/people/1202/?format=api", "name": "Nithin Dabilpuram", "email": "ndabilpuram@marvell.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20240208085956.1741174-1-ndabilpuram@marvell.com/mbox/", "series": [ { "id": 31048, "url": "http://patches.dpdk.org/api/series/31048/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31048", "date": "2024-02-08T08:59:44", "name": "[01/13] common/cnxk: remove cn9k Inline IPsec FP opcode defines", "version": 1, "mbox": "http://patches.dpdk.org/series/31048/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/136516/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/136516/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 0BA3C43ACC;\n\tThu, 8 Feb 2024 10:00:13 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 87E3F4029C;\n\tThu, 8 Feb 2024 10:00:12 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id C63FC40295\n for <dev@dpdk.org>; Thu, 8 Feb 2024 10:00:10 +0100 (CET)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id\n 4184HF3q003172 for <dev@dpdk.org>; Thu, 8 Feb 2024 01:00:10 -0800", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3w4qsq0pth-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Thu, 08 Feb 2024 01:00:09 -0800 (PST)", "from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48;\n Thu, 8 Feb 2024 01:00:07 -0800", "from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend\n Transport; Thu, 8 Feb 2024 01:00:07 -0800", "from hyd1588t430.caveonetworks.com (unknown [10.29.52.204])\n by maili.marvell.com (Postfix) with ESMTP id C0BC43F70C5;\n Thu, 8 Feb 2024 01:00:01 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=\n from:to:cc:subject:date:message-id:mime-version\n :content-transfer-encoding:content-type; s=pfpt0220; bh=Id3qK+OW\n 18Yf7RgDQvSep8xh+GAXVCBoEKQAANSpOBg=; b=hlLzR4vZiK83V746EYxWU3dE\n hcSYNHWlS3QKSJk/gSJxv9ZRczh+yyeemQn8KkMyqEyw3wbJlenYhMy5+b/5LEzE\n sEAqG4XBcitdPwzh6SSD+yMyOWLvuS5g8ZmxsSz6hqVp7xK7f6t7PH7umf4+A/su\n aAUJHjTzU690GoJMAKStJbSwY0ZoGxAgJjJZM4YzBHYjBqxKxd2ZqsIEGCcDashL\n hiWLILcFlaP+whXkngAQwoMB6YxIC7N/VL0fUpyxgG5YQuGBbc4tR4F3Tf7nP4SB\n aUA1AhsIhdLgrdKT7X/5N2DJltz5/c++2e3pPPvlWvrCkIsHRe6qf0lxktEaeg==", "From": "Nithin Dabilpuram <ndabilpuram@marvell.com>", "To": "Nithin Dabilpuram <ndabilpuram@marvell.com>, Kiran Kumar K\n <kirankumark@marvell.com>, Sunil Kumar Kori <skori@marvell.com>, Satha Rao\n <skoteshwar@marvell.com>", "CC": "<dev@dpdk.org>", "Subject": "[PATCH 01/13] common/cnxk: remove cn9k Inline IPsec FP opcode defines", "Date": "Thu, 8 Feb 2024 14:29:44 +0530", "Message-ID": "<20240208085956.1741174-1-ndabilpuram@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "83dKwziwjzQoGiiy1y-mPlhImeZPdf3z", "X-Proofpoint-GUID": "83dKwziwjzQoGiiy1y-mPlhImeZPdf3z", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26\n definitions=2024-02-08_01,2024-02-07_01,2023-05-22_02", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Since now Inline IPsec in cn9k is using same opcode as LA,\nremove the definitions of fast path opcode.\n\nAlso fix devarg handling for ipsec_out_max_sa to allow 32-bit.\n\nFixes: fe5846bcc076 (\"net/cnxk: add devargs for min-max SPI\")\nSigned-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>\n---\n drivers/common/cnxk/cnxk_security.c | 229 -------------------------\n drivers/common/cnxk/cnxk_security.h | 12 --\n drivers/common/cnxk/roc_ie_on.h | 60 -------\n drivers/common/cnxk/roc_nix_inl.h | 50 +-----\n drivers/common/cnxk/version.map | 4 -\n drivers/net/cnxk/cnxk_ethdev_devargs.c | 2 +-\n 6 files changed, 3 insertions(+), 354 deletions(-)", "diff": "diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c\nindex a8c3ba90cd..40685d0912 100644\n--- a/drivers/common/cnxk/cnxk_security.c\n+++ b/drivers/common/cnxk/cnxk_security.c\n@@ -618,235 +618,6 @@ cnxk_ot_ipsec_outb_sa_valid(struct roc_ot_ipsec_outb_sa *sa)\n \treturn !!sa->w2.s.valid;\n }\n \n-static inline int\n-ipsec_xfrm_verify(struct rte_security_ipsec_xform *ipsec_xfrm,\n-\t\t struct rte_crypto_sym_xform *crypto_xfrm)\n-{\n-\tif (crypto_xfrm->next == NULL)\n-\t\treturn -EINVAL;\n-\n-\tif (ipsec_xfrm->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS) {\n-\t\tif (crypto_xfrm->type != RTE_CRYPTO_SYM_XFORM_AUTH ||\n-\t\t crypto_xfrm->next->type != RTE_CRYPTO_SYM_XFORM_CIPHER)\n-\t\t\treturn -EINVAL;\n-\t} else {\n-\t\tif (crypto_xfrm->type != RTE_CRYPTO_SYM_XFORM_CIPHER ||\n-\t\t crypto_xfrm->next->type != RTE_CRYPTO_SYM_XFORM_AUTH)\n-\t\t\treturn -EINVAL;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-static int\n-onf_ipsec_sa_common_param_fill(struct roc_ie_onf_sa_ctl *ctl, uint8_t *salt,\n-\t\t\t uint8_t *cipher_key, uint8_t *hmac_opad_ipad,\n-\t\t\t struct rte_security_ipsec_xform *ipsec_xfrm,\n-\t\t\t struct rte_crypto_sym_xform *crypto_xfrm)\n-{\n-\tstruct rte_crypto_sym_xform *auth_xfrm, *cipher_xfrm;\n-\tint rc, length, auth_key_len;\n-\tconst uint8_t *key = NULL;\n-\tuint8_t ccm_flag = 0;\n-\n-\t/* Set direction */\n-\tswitch (ipsec_xfrm->direction) {\n-\tcase RTE_SECURITY_IPSEC_SA_DIR_INGRESS:\n-\t\tctl->direction = ROC_IE_SA_DIR_INBOUND;\n-\t\tauth_xfrm = crypto_xfrm;\n-\t\tcipher_xfrm = crypto_xfrm->next;\n-\t\tbreak;\n-\tcase RTE_SECURITY_IPSEC_SA_DIR_EGRESS:\n-\t\tctl->direction = ROC_IE_SA_DIR_OUTBOUND;\n-\t\tcipher_xfrm = crypto_xfrm;\n-\t\tauth_xfrm = crypto_xfrm->next;\n-\t\tbreak;\n-\tdefault:\n-\t\treturn -EINVAL;\n-\t}\n-\n-\t/* Set protocol - ESP vs AH */\n-\tswitch (ipsec_xfrm->proto) {\n-\tcase RTE_SECURITY_IPSEC_SA_PROTO_ESP:\n-\t\tctl->ipsec_proto = ROC_IE_SA_PROTOCOL_ESP;\n-\t\tbreak;\n-\tcase RTE_SECURITY_IPSEC_SA_PROTO_AH:\n-\t\treturn -ENOTSUP;\n-\tdefault:\n-\t\treturn -EINVAL;\n-\t}\n-\n-\t/* Set mode - transport vs tunnel */\n-\tswitch (ipsec_xfrm->mode) {\n-\tcase RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT:\n-\t\tctl->ipsec_mode = ROC_IE_SA_MODE_TRANSPORT;\n-\t\tbreak;\n-\tcase RTE_SECURITY_IPSEC_SA_MODE_TUNNEL:\n-\t\tctl->ipsec_mode = ROC_IE_SA_MODE_TUNNEL;\n-\t\tbreak;\n-\tdefault:\n-\t\treturn -EINVAL;\n-\t}\n-\n-\t/* Set encryption algorithm */\n-\tif (crypto_xfrm->type == RTE_CRYPTO_SYM_XFORM_AEAD) {\n-\t\tlength = crypto_xfrm->aead.key.length;\n-\n-\t\tswitch (crypto_xfrm->aead.algo) {\n-\t\tcase RTE_CRYPTO_AEAD_AES_GCM:\n-\t\t\tctl->enc_type = ROC_IE_ON_SA_ENC_AES_GCM;\n-\t\t\tctl->auth_type = ROC_IE_ON_SA_AUTH_NULL;\n-\t\t\tmemcpy(salt, &ipsec_xfrm->salt, 4);\n-\t\t\tkey = crypto_xfrm->aead.key.data;\n-\t\t\tbreak;\n-\t\tcase RTE_CRYPTO_AEAD_AES_CCM:\n-\t\t\tctl->enc_type = ROC_IE_ON_SA_ENC_AES_CCM;\n-\t\t\tctl->auth_type = ROC_IE_ON_SA_AUTH_NULL;\n-\t\t\tccm_flag = 0x07 & ~ROC_CPT_AES_CCM_CTR_LEN;\n-\t\t\t*salt = ccm_flag;\n-\t\t\tmemcpy(PLT_PTR_ADD(salt, 1), &ipsec_xfrm->salt, 3);\n-\t\t\tkey = crypto_xfrm->aead.key.data;\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\treturn -ENOTSUP;\n-\t\t}\n-\n-\t} else {\n-\t\trc = ipsec_xfrm_verify(ipsec_xfrm, crypto_xfrm);\n-\t\tif (rc)\n-\t\t\treturn rc;\n-\n-\t\tswitch (cipher_xfrm->cipher.algo) {\n-\t\tcase RTE_CRYPTO_CIPHER_AES_CBC:\n-\t\t\tctl->enc_type = ROC_IE_ON_SA_ENC_AES_CBC;\n-\t\t\tbreak;\n-\t\tcase RTE_CRYPTO_CIPHER_AES_CTR:\n-\t\t\tctl->enc_type = ROC_IE_ON_SA_ENC_AES_CTR;\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\treturn -ENOTSUP;\n-\t\t}\n-\n-\t\tswitch (auth_xfrm->auth.algo) {\n-\t\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n-\t\t\tctl->auth_type = ROC_IE_ON_SA_AUTH_SHA1;\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\treturn -ENOTSUP;\n-\t\t}\n-\t\tauth_key_len = auth_xfrm->auth.key.length;\n-\t\tif (auth_key_len < 20 || auth_key_len > 64)\n-\t\t\treturn -ENOTSUP;\n-\n-\t\tkey = cipher_xfrm->cipher.key.data;\n-\t\tlength = cipher_xfrm->cipher.key.length;\n-\n-\t\tipsec_hmac_opad_ipad_gen(auth_xfrm, hmac_opad_ipad);\n-\t}\n-\n-\tswitch (length) {\n-\tcase ROC_CPT_AES128_KEY_LEN:\n-\t\tctl->aes_key_len = ROC_IE_SA_AES_KEY_LEN_128;\n-\t\tbreak;\n-\tcase ROC_CPT_AES192_KEY_LEN:\n-\t\tctl->aes_key_len = ROC_IE_SA_AES_KEY_LEN_192;\n-\t\tbreak;\n-\tcase ROC_CPT_AES256_KEY_LEN:\n-\t\tctl->aes_key_len = ROC_IE_SA_AES_KEY_LEN_256;\n-\t\tbreak;\n-\tdefault:\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tmemcpy(cipher_key, key, length);\n-\n-\tif (ipsec_xfrm->options.esn)\n-\t\tctl->esn_en = 1;\n-\n-\tctl->spi = rte_cpu_to_be_32(ipsec_xfrm->spi);\n-\treturn 0;\n-}\n-\n-int\n-cnxk_onf_ipsec_inb_sa_fill(struct roc_onf_ipsec_inb_sa *sa,\n-\t\t\t struct rte_security_ipsec_xform *ipsec_xfrm,\n-\t\t\t struct rte_crypto_sym_xform *crypto_xfrm)\n-{\n-\tstruct roc_ie_onf_sa_ctl *ctl = &sa->ctl;\n-\tint rc;\n-\n-\trc = onf_ipsec_sa_common_param_fill(ctl, sa->nonce, sa->cipher_key,\n-\t\t\t\t\t sa->hmac_key, ipsec_xfrm,\n-\t\t\t\t\t crypto_xfrm);\n-\tif (rc)\n-\t\treturn rc;\n-\n-\trte_wmb();\n-\n-\t/* Enable SA */\n-\tctl->valid = 1;\n-\treturn 0;\n-}\n-\n-int\n-cnxk_onf_ipsec_outb_sa_fill(struct roc_onf_ipsec_outb_sa *sa,\n-\t\t\t struct rte_security_ipsec_xform *ipsec_xfrm,\n-\t\t\t struct rte_crypto_sym_xform *crypto_xfrm)\n-{\n-\tstruct rte_security_ipsec_tunnel_param *tunnel = &ipsec_xfrm->tunnel;\n-\tstruct roc_ie_onf_sa_ctl *ctl = &sa->ctl;\n-\tint rc;\n-\n-\t/* Fill common params */\n-\trc = onf_ipsec_sa_common_param_fill(ctl, sa->nonce, sa->cipher_key,\n-\t\t\t\t\t sa->hmac_key, ipsec_xfrm,\n-\t\t\t\t\t crypto_xfrm);\n-\tif (rc)\n-\t\treturn rc;\n-\n-\tif (ipsec_xfrm->mode != RTE_SECURITY_IPSEC_SA_MODE_TUNNEL)\n-\t\tgoto skip_tunnel_info;\n-\n-\t/* Tunnel header info */\n-\tswitch (tunnel->type) {\n-\tcase RTE_SECURITY_IPSEC_TUNNEL_IPV4:\n-\t\tmemcpy(&sa->ip_src, &tunnel->ipv4.src_ip,\n-\t\t sizeof(struct in_addr));\n-\t\tmemcpy(&sa->ip_dst, &tunnel->ipv4.dst_ip,\n-\t\t sizeof(struct in_addr));\n-\t\tbreak;\n-\tcase RTE_SECURITY_IPSEC_TUNNEL_IPV6:\n-\t\treturn -ENOTSUP;\n-\tdefault:\n-\t\treturn -EINVAL;\n-\t}\n-\n-\t/* Update udp encap ports */\n-\tif (ipsec_xfrm->options.udp_encap == 1) {\n-\t\tsa->udp_src = 4500;\n-\t\tsa->udp_dst = 4500;\n-\t}\n-\n-skip_tunnel_info:\n-\trte_wmb();\n-\n-\t/* Enable SA */\n-\tctl->valid = 1;\n-\treturn 0;\n-}\n-\n-bool\n-cnxk_onf_ipsec_inb_sa_valid(struct roc_onf_ipsec_inb_sa *sa)\n-{\n-\treturn !!sa->ctl.valid;\n-}\n-\n-bool\n-cnxk_onf_ipsec_outb_sa_valid(struct roc_onf_ipsec_outb_sa *sa)\n-{\n-\treturn !!sa->ctl.valid;\n-}\n-\n uint8_t\n cnxk_ipsec_ivlen_get(enum rte_crypto_cipher_algorithm c_algo,\n \t\t enum rte_crypto_auth_algorithm a_algo,\ndiff --git a/drivers/common/cnxk/cnxk_security.h b/drivers/common/cnxk/cnxk_security.h\nindex 2277ce9144..72628ef3b8 100644\n--- a/drivers/common/cnxk/cnxk_security.h\n+++ b/drivers/common/cnxk/cnxk_security.h\n@@ -48,18 +48,6 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,\n bool __roc_api cnxk_ot_ipsec_inb_sa_valid(struct roc_ot_ipsec_inb_sa *sa);\n bool __roc_api cnxk_ot_ipsec_outb_sa_valid(struct roc_ot_ipsec_outb_sa *sa);\n \n-/* [CN9K, CN10K) */\n-int __roc_api\n-cnxk_onf_ipsec_inb_sa_fill(struct roc_onf_ipsec_inb_sa *sa,\n-\t\t\t struct rte_security_ipsec_xform *ipsec_xfrm,\n-\t\t\t struct rte_crypto_sym_xform *crypto_xfrm);\n-int __roc_api\n-cnxk_onf_ipsec_outb_sa_fill(struct roc_onf_ipsec_outb_sa *sa,\n-\t\t\t struct rte_security_ipsec_xform *ipsec_xfrm,\n-\t\t\t struct rte_crypto_sym_xform *crypto_xfrm);\n-bool __roc_api cnxk_onf_ipsec_inb_sa_valid(struct roc_onf_ipsec_inb_sa *sa);\n-bool __roc_api cnxk_onf_ipsec_outb_sa_valid(struct roc_onf_ipsec_outb_sa *sa);\n-\n /* [CN9K] */\n int __roc_api\n cnxk_on_ipsec_inb_sa_create(struct rte_security_ipsec_xform *ipsec,\ndiff --git a/drivers/common/cnxk/roc_ie_on.h b/drivers/common/cnxk/roc_ie_on.h\nindex 9933ffa148..11c995e9d1 100644\n--- a/drivers/common/cnxk/roc_ie_on.h\n+++ b/drivers/common/cnxk/roc_ie_on.h\n@@ -269,66 +269,6 @@ struct roc_ie_on_inb_sa {\n #define ROC_IE_ON_UCC_L2_HDR_INFO_ERR\t 0xCF\n #define ROC_IE_ON_UCC_L2_HDR_LEN_ERR\t 0xE0\n \n-struct roc_ie_onf_sa_ctl {\n-\tuint32_t spi;\n-\tuint64_t exp_proto_inter_frag : 8;\n-\tuint64_t rsvd_41_40 : 2;\n-\t/* Disable SPI, SEQ data in RPTR for Inbound inline */\n-\tuint64_t spi_seq_dis : 1;\n-\tuint64_t esn_en : 1;\n-\tuint64_t rsvd_44_45 : 2;\n-\tuint64_t encap_type : 2;\n-\tuint64_t enc_type : 3;\n-\tuint64_t rsvd_48 : 1;\n-\tuint64_t auth_type : 4;\n-\tuint64_t valid : 1;\n-\tuint64_t direction : 1;\n-\tuint64_t outer_ip_ver : 1;\n-\tuint64_t inner_ip_ver : 1;\n-\tuint64_t ipsec_mode : 1;\n-\tuint64_t ipsec_proto : 1;\n-\tuint64_t aes_key_len : 2;\n-};\n-\n-struct roc_onf_ipsec_outb_sa {\n-\t/* w0 */\n-\tstruct roc_ie_onf_sa_ctl ctl;\n-\n-\t/* w1 */\n-\tuint8_t nonce[4];\n-\tuint16_t udp_src;\n-\tuint16_t udp_dst;\n-\n-\t/* w2 */\n-\tuint32_t ip_src;\n-\tuint32_t ip_dst;\n-\n-\t/* w3-w6 */\n-\tuint8_t cipher_key[32];\n-\n-\t/* w7-w12 */\n-\tuint8_t hmac_key[48];\n-};\n-\n-struct roc_onf_ipsec_inb_sa {\n-\t/* w0 */\n-\tstruct roc_ie_onf_sa_ctl ctl;\n-\n-\t/* w1 */\n-\tuint8_t nonce[4]; /* Only for AES-GCM */\n-\tuint32_t unused;\n-\n-\t/* w2 */\n-\tuint32_t esn_hi;\n-\tuint32_t esn_low;\n-\n-\t/* w3-w6 */\n-\tuint8_t cipher_key[32];\n-\n-\t/* w7-w12 */\n-\tuint8_t hmac_key[48];\n-};\n-\n #define ROC_ONF_IPSEC_INB_MAX_L2_SZ\t 32UL\n #define ROC_ONF_IPSEC_OUTB_MAX_L2_SZ\t 30UL\n #define ROC_ONF_IPSEC_OUTB_MAX_L2_INFO_SZ (ROC_ONF_IPSEC_OUTB_MAX_L2_SZ + 2)\ndiff --git a/drivers/common/cnxk/roc_nix_inl.h b/drivers/common/cnxk/roc_nix_inl.h\nindex ab1e9c0f98..f5ce26f03f 100644\n--- a/drivers/common/cnxk/roc_nix_inl.h\n+++ b/drivers/common/cnxk/roc_nix_inl.h\n@@ -4,24 +4,6 @@\n #ifndef _ROC_NIX_INL_H_\n #define _ROC_NIX_INL_H_\n \n-/* ONF INB HW area */\n-#define ROC_NIX_INL_ONF_IPSEC_INB_HW_SZ \\\n-\tPLT_ALIGN(sizeof(struct roc_onf_ipsec_inb_sa), ROC_ALIGN)\n-/* ONF INB SW reserved area */\n-#define ROC_NIX_INL_ONF_IPSEC_INB_SW_RSVD 384\n-#define ROC_NIX_INL_ONF_IPSEC_INB_SA_SZ \\\n-\t(ROC_NIX_INL_ONF_IPSEC_INB_HW_SZ + ROC_NIX_INL_ONF_IPSEC_INB_SW_RSVD)\n-#define ROC_NIX_INL_ONF_IPSEC_INB_SA_SZ_LOG2 9\n-\n-/* ONF OUTB HW area */\n-#define ROC_NIX_INL_ONF_IPSEC_OUTB_HW_SZ \\\n-\tPLT_ALIGN(sizeof(struct roc_onf_ipsec_outb_sa), ROC_ALIGN)\n-/* ONF OUTB SW reserved area */\n-#define ROC_NIX_INL_ONF_IPSEC_OUTB_SW_RSVD 128\n-#define ROC_NIX_INL_ONF_IPSEC_OUTB_SA_SZ \\\n-\t(ROC_NIX_INL_ONF_IPSEC_OUTB_HW_SZ + ROC_NIX_INL_ONF_IPSEC_OUTB_SW_RSVD)\n-#define ROC_NIX_INL_ONF_IPSEC_OUTB_SA_SZ_LOG2 8\n-\n /* ON INB HW area */\n #define ROC_NIX_INL_ON_IPSEC_INB_HW_SZ \\\n \tPLT_ALIGN(sizeof(struct roc_ie_on_inb_sa), ROC_ALIGN)\n@@ -31,10 +13,10 @@\n \t(ROC_NIX_INL_ON_IPSEC_INB_HW_SZ + ROC_NIX_INL_ON_IPSEC_INB_SW_RSVD)\n #define ROC_NIX_INL_ON_IPSEC_INB_SA_SZ_LOG2 10\n \n-/* ONF OUTB HW area */\n+/* ON OUTB HW area */\n #define ROC_NIX_INL_ON_IPSEC_OUTB_HW_SZ \\\n \tPLT_ALIGN(sizeof(struct roc_ie_on_outb_sa), ROC_ALIGN)\n-/* ONF OUTB SW reserved area */\n+/* ON OUTB SW reserved area */\n #define ROC_NIX_INL_ON_IPSEC_OUTB_SW_RSVD 256\n #define ROC_NIX_INL_ON_IPSEC_OUTB_SA_SZ \\\n \t(ROC_NIX_INL_ON_IPSEC_OUTB_HW_SZ + ROC_NIX_INL_ON_IPSEC_OUTB_SW_RSVD)\n@@ -86,34 +68,6 @@ roc_nix_inl_on_ipsec_outb_sa_sw_rsvd(void *sa)\n \treturn PLT_PTR_ADD(sa, ROC_NIX_INL_ON_IPSEC_OUTB_HW_SZ);\n }\n \n-static inline struct roc_onf_ipsec_inb_sa *\n-roc_nix_inl_onf_ipsec_inb_sa(uintptr_t base, uint64_t idx)\n-{\n-\tuint64_t off = idx << ROC_NIX_INL_ONF_IPSEC_INB_SA_SZ_LOG2;\n-\n-\treturn PLT_PTR_ADD(base, off);\n-}\n-\n-static inline struct roc_onf_ipsec_outb_sa *\n-roc_nix_inl_onf_ipsec_outb_sa(uintptr_t base, uint64_t idx)\n-{\n-\tuint64_t off = idx << ROC_NIX_INL_ONF_IPSEC_OUTB_SA_SZ_LOG2;\n-\n-\treturn PLT_PTR_ADD(base, off);\n-}\n-\n-static inline void *\n-roc_nix_inl_onf_ipsec_inb_sa_sw_rsvd(void *sa)\n-{\n-\treturn PLT_PTR_ADD(sa, ROC_NIX_INL_ONF_IPSEC_INB_HW_SZ);\n-}\n-\n-static inline void *\n-roc_nix_inl_onf_ipsec_outb_sa_sw_rsvd(void *sa)\n-{\n-\treturn PLT_PTR_ADD(sa, ROC_NIX_INL_ONF_IPSEC_OUTB_HW_SZ);\n-}\n-\n /* Inline device SSO Work callback */\n typedef void (*roc_nix_inl_sso_work_cb_t)(uint64_t *gw, void *args,\n \t\t\t\t\t uint32_t soft_exp_event);\ndiff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map\nindex 7b6afa63a9..2123ebf701 100644\n--- a/drivers/common/cnxk/version.map\n+++ b/drivers/common/cnxk/version.map\n@@ -17,10 +17,6 @@ INTERNAL {\n \tcnxk_logtype_sso;\n \tcnxk_logtype_tim;\n \tcnxk_logtype_tm;\n-\tcnxk_onf_ipsec_inb_sa_fill;\n-\tcnxk_onf_ipsec_outb_sa_fill;\n-\tcnxk_onf_ipsec_inb_sa_valid;\n-\tcnxk_onf_ipsec_outb_sa_valid;\n \tcnxk_ot_ipsec_inb_sa_fill;\n \tcnxk_ot_ipsec_outb_sa_fill;\n \tcnxk_ot_ipsec_inb_sa_valid;\ndiff --git a/drivers/net/cnxk/cnxk_ethdev_devargs.c b/drivers/net/cnxk/cnxk_ethdev_devargs.c\nindex 8e862be933..a0e9300cff 100644\n--- a/drivers/net/cnxk/cnxk_ethdev_devargs.c\n+++ b/drivers/net/cnxk/cnxk_ethdev_devargs.c\n@@ -75,7 +75,7 @@ parse_ipsec_out_max_sa(const char *key, const char *value, void *extra_args)\n \tif (errno)\n \t\tval = 0;\n \n-\t*(uint16_t *)extra_args = val;\n+\t*(uint32_t *)extra_args = val;\n \n \treturn 0;\n }\n", "prefixes": [ "01/13" ] }