From: "Xueming(Steven) Li" <xuemingl@nvidia.com>
To: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>,
"stable@dpdk.org" <stable@dpdk.org>
Cc: "anoobj@marvell.com" <anoobj@marvell.com>
Subject: RE: [PATCH 22.11] crypto/cnxk: fix order of ECFPM parameters
Date: Tue, 18 Apr 2023 11:22:28 +0000 [thread overview]
Message-ID: <DM4PR12MB5373BED924317658BA0D2632A19D9@DM4PR12MB5373.namprd12.prod.outlook.com> (raw)
In-Reply-To: <DM4PR12MB5373B5B4AB97DC720948EB72A19D9@DM4PR12MB5373.namprd12.prod.outlook.com>
There is a compilation error:
In file included from ../../../auto/mtbcswgwork/xuemingl/workspace/dpdk/drivers/crypto/cnxk/cn9k_cryptodev_ops.c:15:
../../../auto/mtbcswgwork/xuemingl/workspace/dpdk/drivers/crypto/cnxk/cnxk_ae.h:958:13: error: no member named 'lf' in 'struct cnxk_ae_sess'
sess->lf->roc_cpt->cpt_revision);
~~~~ ^
Please provide a new version if we do need it for 22.11 LTS.
> -----Original Message-----
> From: Xueming(Steven) Li <xuemingl@nvidia.com>
> Sent: 4/18/2023 14:23
> To: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>;
> stable@dpdk.org
> Cc: anoobj@marvell.com
> Subject: RE: [PATCH 22.11] crypto/cnxk: fix order of ECFPM parameters
>
> Thanks, patch applied.
>
> > -----Original Message-----
> > From: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
> > Sent: 4/11/2023 15:41
> > To: stable@dpdk.org
> > Cc: anoobj@marvell.com; Xueming(Steven) Li <xuemingl@nvidia.com>;
> > Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
> > Subject: [PATCH 22.11] crypto/cnxk: fix order of ECFPM parameters
> >
> > [ 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 <gmuthukrishn@marvell.com>
> > ---
> > 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
next prev parent reply other threads:[~2023-04-18 11:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-11 7:40 Gowrishankar Muthukrishnan
2023-04-18 6:23 ` Xueming(Steven) Li
2023-04-18 11:22 ` Xueming(Steven) Li [this message]
2023-04-18 12:19 ` Gowrishankar Muthukrishnan
2023-04-18 12:38 ` Xueming(Steven) Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DM4PR12MB5373BED924317658BA0D2632A19D9@DM4PR12MB5373.namprd12.prod.outlook.com \
--to=xuemingl@nvidia.com \
--cc=anoobj@marvell.com \
--cc=gmuthukrishn@marvell.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).