From patchwork Thu Oct 26 08:15:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gowrishankar Muthukrishnan X-Patchwork-Id: 133380 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id AA2EC43206; Thu, 26 Oct 2023 10:15:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D1D142E03; Thu, 26 Oct 2023 10:15:31 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 53A6642E03 for ; Thu, 26 Oct 2023 10:15:29 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39Q71eTX017512; Thu, 26 Oct 2023 01:15:28 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=4LxoQiGwYRnbKAEyusev/ZYG0jkdt7PPKuf0x2vuh2w=; b=JrYqobVwY3Sa4CfTLRYuuF25jBsM4bVX8QTHZGkK70EnNaI2sr2BdQDIMTLZw2wq8ph4 ODdEtkpMK2w5YoE8n+X0K28vPPycS6oYKR7w9AILBExPaPj/MtgM2r+fJ7ysqasNm7TG XUFoezjwBwWvDdBc8f1gP2sWmSxsGG537rPoMiHQOnqdzUbOO12AIjudESS0HMakymoU OvnQZO3VkVHYfw5HH/FcY7GEctQEEatA0SEKVz7g4WWj4P1+fuIJb4b7EMWcTrflY+Ha HV+0PVtKo9NQedR8J/NrQr8XLWHcoxw8neqsksUbMPf3dlM2hs6u3636OuV8ynsD5JWL AQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3txcsr1b2q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 26 Oct 2023 01:15:28 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Thu, 26 Oct 2023 01:15:26 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Thu, 26 Oct 2023 01:15:26 -0700 Received: from BG-LT91401.marvell.com (BG-LT91401.marvell.com [10.28.168.34]) by maili.marvell.com (Postfix) with ESMTP id C38523F70BF; Thu, 26 Oct 2023 01:15:24 -0700 (PDT) From: Gowrishankar Muthukrishnan To: CC: , Akhil Goyal , Fan Zhang , Gowrishankar Muthukrishnan Subject: [PATCH v1 3/4] crypto/cnxk: change order of ECFPM params Date: Thu, 26 Oct 2023 13:45:11 +0530 Message-ID: X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: dkOZKkoWYKCgknf2Pmn1gNXslFu1ylUX X-Proofpoint-GUID: dkOZKkoWYKCgknf2Pmn1gNXslFu1ylUX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-26_05,2023-10-25_01,2023-05-22_02 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Change order of ECFPM params to match changes in v2.0 microcode. Signed-off-by: Gowrishankar Muthukrishnan --- drivers/crypto/cnxk/cnxk_ae.h | 49 ++++++++++++++--------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/drivers/crypto/cnxk/cnxk_ae.h b/drivers/crypto/cnxk/cnxk_ae.h index 6e61ccb0c5..f05ae4f4a1 100644 --- a/drivers/crypto/cnxk/cnxk_ae.h +++ b/drivers/crypto/cnxk/cnxk_ae.h @@ -923,7 +923,7 @@ static __rte_always_inline int cnxk_ae_ecfpm_prep(struct rte_crypto_ecpm_op_param *ecpm, struct roc_ae_buf_ptr *meta_buf, uint64_t *fpm_iova, struct roc_ae_ec_group *ec_grp, uint8_t curveid, - struct cpt_inst_s *inst, int cpt_ver) + struct cpt_inst_s *inst) { uint16_t scalar_align, p_align; uint16_t dlen, prime_len; @@ -942,34 +942,26 @@ cnxk_ae_ecfpm_prep(struct rte_crypto_ecpm_op_param *ecpm, scalar_align = RTE_ALIGN_CEIL(ecpm->scalar.length, 8); /* - * Set dlen = sum(prime, scalar length, table address and - * optionally ROUNDUP8(input point(x and y coordinates)). + * Set dlen = sum(ROUNDUP8(input point(x and y coordinates), prime, + * scalar length), * Please note point length is equivalent to prime of the curve */ - if (cpt_ver == ROC_CPT_REVISION_ID_96XX_B0 || cpt_ver == ROC_CPT_REVISION_ID_96XX_C0 || - cpt_ver == ROC_CPT_REVISION_ID_98XX) { - dlen = sizeof(fpm_table_iova) + 3 * p_align + scalar_align; - memset(dptr, 0, dlen); - *(uint64_t *)dptr = fpm_table_iova; - dptr += sizeof(fpm_table_iova); - memcpy(dptr, ecpm->scalar.data, ecpm->scalar.length); - dptr += scalar_align; - memcpy(dptr, ec_grp->prime.data, ec_grp->prime.length); - dptr += p_align; - memcpy(dptr, ec_grp->consta.data, ec_grp->consta.length); - dptr += p_align; - memcpy(dptr, ec_grp->constb.data, ec_grp->constb.length); - dptr += p_align; - } else { - dlen = sizeof(fpm_table_iova) + p_align + scalar_align; - memset(dptr, 0, dlen); - memcpy(dptr, ecpm->scalar.data, ecpm->scalar.length); - dptr += scalar_align; - memcpy(dptr, ec_grp->prime.data, ec_grp->prime.length); - dptr += p_align; - *(uint64_t *)dptr = fpm_table_iova; - dptr += sizeof(fpm_table_iova); - } + dlen = sizeof(fpm_table_iova) + 3 * p_align + scalar_align; + + memset(dptr, 0, dlen); + + *(uint64_t *)dptr = fpm_table_iova; + dptr += sizeof(fpm_table_iova); + + /* Copy scalar, prime */ + memcpy(dptr, ecpm->scalar.data, ecpm->scalar.length); + dptr += scalar_align; + memcpy(dptr, ec_grp->prime.data, ec_grp->prime.length); + dptr += p_align; + memcpy(dptr, ec_grp->consta.data, ec_grp->consta.length); + dptr += p_align; + memcpy(dptr, ec_grp->constb.data, ec_grp->constb.length); + dptr += p_align; /* Setup opcodes */ w4.s.opcode_major = ROC_AE_MAJOR_OP_ECC; @@ -1224,8 +1216,7 @@ cnxk_ae_enqueue(struct cnxk_cpt_qp *qp, struct rte_crypto_op *op, ret = cnxk_ae_ecfpm_prep(&asym_op->ecpm, &meta_buf, sess->cnxk_fpm_iova, sess->ec_grp[sess->ec_ctx.curveid], - sess->ec_ctx.curveid, inst, - sess->lf->roc_cpt->cpt_revision); + sess->ec_ctx.curveid, inst); if (unlikely(ret)) goto req_fail; break;