From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 453A042919 for ; Tue, 11 Apr 2023 09:41:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40C1940DFD; Tue, 11 Apr 2023 09:41:00 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 57C8B40A8B for ; Tue, 11 Apr 2023 09:40:58 +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 33B6QaXO004973; Tue, 11 Apr 2023 00:40:57 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=Ouz+fNmmfZv5QowfwmzMaDUdJfCcuiadhHmpbOV3dV8=; b=A6hlSPbQ8QvLABDeLLPPanLN+r3FdE9yUPuZsyH3X7Rpk/2FgMBeJkyrbwQ4DbWG1Nl1 p5/SHdXcXAbv/66GsZuiSR3ZWSwjdclETH2kAHf257fBp7JTik1rZk3nMyLSbad5pfbr iL9hVOHWPrWUODe6Q+5QLa5h8/AQz8uVCOQf0VjWJJ0UkIi6+TWK9RqMf8qgtiBu07p4 N56MY1I0tA9ArW3FH1FBDIggLJ0YHvYeEFMN6zRAbfBJpu71Gd3DyfxuGGVjFf8t8p58 8mJRBE5KXx4KC0NQLRB6WuFORxH0ZXXIV67/q/uQt4sMUMf8akUzkdJ4tSu+vriL9iGx 4w== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3purfs8tsu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 11 Apr 2023 00:40:57 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Tue, 11 Apr 2023 00:40:55 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Tue, 11 Apr 2023 00:40:55 -0700 Received: from localhost.localdomain (unknown [10.28.34.38]) by maili.marvell.com (Postfix) with ESMTP id D3A603F7041; Tue, 11 Apr 2023 00:40:53 -0700 (PDT) From: Gowrishankar Muthukrishnan To: CC: , Xueming Li , "Gowrishankar Muthukrishnan" Subject: [PATCH 22.11] crypto/cnxk: fix order of ECFPM parameters Date: Tue, 11 Apr 2023 13:10:50 +0530 Message-ID: <20230411074050.789415-1-gmuthukrishn@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: zEYUmcSBl5pzwb8mbXbn6Og4zRjTfWtv X-Proofpoint-GUID: zEYUmcSBl5pzwb8mbXbn6Og4zRjTfWtv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-11_04,2023-04-06_03,2023-02-09_01 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org [ upstream commit 76618fc4bef616f16b6c92f15681ea080eabb486 ] Fix the order of ECFPM parameters according to target board. Fixes: 8e39b133235 ("crypto/cnxk: support fixed point multiplication") Cc: stable@dpdk.org Signed-off-by: Gowrishankar Muthukrishnan --- drivers/crypto/cnxk/cnxk_ae.h | 48 ++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/drivers/crypto/cnxk/cnxk_ae.h b/drivers/crypto/cnxk/cnxk_ae.h index adf719da73..f1183376d0 100644 --- a/drivers/crypto/cnxk/cnxk_ae.h +++ b/drivers/crypto/cnxk/cnxk_ae.h @@ -678,7 +678,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) + struct cpt_inst_s *inst, int cpt_ver) { uint16_t scalar_align, p_align; uint16_t dlen, prime_len; @@ -697,26 +697,33 @@ cnxk_ae_ecfpm_prep(struct rte_crypto_ecpm_op_param *ecpm, scalar_align = RTE_ALIGN_CEIL(ecpm->scalar.length, 8); /* - * Set dlen = sum(ROUNDUP8(input point(x and y coordinates), prime, - * scalar length), + * Set dlen = sum(prime, scalar length, table address and + * optionally ROUNDUP8(input point(x and y coordinates)). * Please note point length is equivalent to prime of the curve */ - 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; + if (cpt_ver == ROC_CPT_REVISION_ID_96XX_C0) { + 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); + } /* Setup opcodes */ w4.s.opcode_major = ROC_AE_MAJOR_OP_ECC; @@ -947,7 +954,8 @@ 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->ec_ctx.curveid, inst, + sess->lf->roc_cpt->cpt_revision); if (unlikely(ret)) goto req_fail; break; -- 2.25.1