From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B9A6AA0526 for ; Tue, 10 Nov 2020 11:59:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A98432AB; Tue, 10 Nov 2020 11:59:31 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 7589E2AB for ; Tue, 10 Nov 2020 11:59:29 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AAAsrQf005773; Tue, 10 Nov 2020 02:59:27 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0220; bh=YOkpQ3M5H1LBYrKvEN2XEOn6Sfjp92so0gYzyDRU1mY=; b=iIxfUktgPxDEiNm/7ZKVS3Quk1AcHSjPgiPTjRzFjeyq5sr4Dn575166UKmzoRDGNcfT Ng1U11ywNvBV1IRsALao0M3tLgWP44zswmxhS4hQ/WZJBI+vHksQGhwsaZfEu5aAcZv6 YMxsvcih3r5g67nL+XUcSg7Q9oMC+B/gXCWqgqpW3wpcTQZp51uN9s0zd68NDKxt0aHJ tvl1RAIPxR4GASwhvxWaR1NcgXYDYPSwRD6kFh8Zm9m40JS6G1hQh18qSsce4JXIKCK1 8Y2UHQ1PKT02hFNHt0GVBy45T9u6lAdHEmGYQoLWwX3rJYFXbfWTcpvrY6z4UVaGcwg7 fw== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 34nstu1qgf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 10 Nov 2020 02:59:27 -0800 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 10 Nov 2020 02:59:26 -0800 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.109) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 10 Nov 2020 02:59:26 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XdenpFpFQQaQnwBzgf+Af2TmBJRZ283FYpWPc3175sOFDQmC6nnSZlK0k6NKfamnixYAqFpgVR5Se7uxJrloJhxnUMW+FI8saetIE8finqrTh1OqkFJOHoufrlwp7S5WMPK87P2/NInhHHaYVzTWzLl9DXZCC4jXpaefjtwvSVxHTfpyNYPrci3yLeK/x5VkdwNxdkscgtUCNkVe0rDHkenNfk2ga2/mGd4qkHb7l0OC7B8LhMRmAR7pyJwLNhYAXqfCSRBY3eMq5M/1NRmmBztnqUNZq9dunoO5/Xk1VtFkTzOQ9SnsaQXlgLJwZBy1DhiOyWjRKSF4A7g+D7Qulw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YOkpQ3M5H1LBYrKvEN2XEOn6Sfjp92so0gYzyDRU1mY=; b=Xz9l0mPCXA8fM8yNG/l/Y1Uajxj1q8D+Fb1s+NJKXxYijd4RzBHjw3LVfbPdWWXItYRvy7H2Qjdj0PPyAl3q1G+oVFG9SLuvAfshmcWi/kOoUslS6d9b57ABJUD9OT8MFJWJBkLZtBbALEAeGKyxDaC8n1Rct34w2gq3PrdQImSs7Bsh46t5isZ9b2zWZcVQUyJO/Gf9zWaqcvQAGiOePK66emsEI/ZgDtXufzmBRTRKXb71ZWGyK3kNA2gCBa3PVDfox4kSdvTG5I/85DGeyUMUw+8vwgfyS166OClniAyiaE+FOAxqPTzRU9PhZTY5RZIABzXwKBZssv6TDm7jAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YOkpQ3M5H1LBYrKvEN2XEOn6Sfjp92so0gYzyDRU1mY=; b=KtHSQR8+Fsx8G0lM7TjrRn3pssladgtO/4ZbtH9Wgem+D7UEIgFewfRmYlusfOGO8xnlKUdgK6UKPkMV5XVJVGK3TcB0nvBgyqxnGY1zfyR5DTN7diGVpnJYP0SWYcDKClEFDhPf3bGbgbCKRwSgjisOY4V0WCtOD3JVkZMPd+w= Received: from DM5PR1801MB1884.namprd18.prod.outlook.com (2603:10b6:4:65::20) by DM5PR18MB1097.namprd18.prod.outlook.com (2603:10b6:3:31::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Tue, 10 Nov 2020 10:59:24 +0000 Received: from DM5PR1801MB1884.namprd18.prod.outlook.com ([fe80::5192:9207:6442:3630]) by DM5PR1801MB1884.namprd18.prod.outlook.com ([fe80::5192:9207:6442:3630%2]) with mapi id 15.20.3541.025; Tue, 10 Nov 2020 10:59:24 +0000 From: Ankur Dwivedi To: "luca.boccassi@gmail.com" CC: Anoob Joseph , dpdk stable Thread-Topic: [EXT] patch 'crypto/octeontx2: fix multi-process' has been queued to stable release 19.11.6 Thread-Index: AQHWtsgPmHSciQKdi0S5rCDuU2PZE6nBMbYQ Date: Tue, 10 Nov 2020 10:59:23 +0000 Message-ID: References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> <20201109184111.3463090-18-luca.boccassi@gmail.com> In-Reply-To: <20201109184111.3463090-18-luca.boccassi@gmail.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=marvell.com; x-originating-ip: [157.48.133.159] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a5b4cae2-6e5b-4820-0904-08d88567af47 x-ms-traffictypediagnostic: DM5PR18MB1097: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:741; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zRIRWXpj5nBhcWjFJV7w8WgmCoLCj3n3JriHglcxKTPhyCVOQUO0MDe0mhBEEs1LufM6heaxSS2PyRCYxverHn9xLLQ5NiF6GSJEXlcwvWDGGnRiNV8Ux1I+uAoSo43zWqMT+1ZABnh6C2LPiHstEqGhXPrn21G5eF7E9YbaW+/MSxRMK0pU0zWfrZVxjOu5QyDYHxgg70Qgl/kdQPlXf4AOeENl34XZPhUGRaKJVnm+hrHlpsREr3fUtF6PHMShyfDwAKoQn3ukwd/yXPPs7gFp1viOkCxsijuDmlo3s5JOqWtL2JLLtuaBG5JfLNfZn9/+aeltX70STkHqFsT0r+60WanpK31JQlj0sVYEQSIWBPH2llPJDZAB2dGyvK5dV9T10vqNFqtVj/+3jCx+yA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR1801MB1884.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39860400002)(346002)(376002)(136003)(66446008)(64756008)(66556008)(66476007)(76116006)(9686003)(55016002)(86362001)(478600001)(186003)(5660300002)(26005)(33656002)(6506007)(4326008)(83380400001)(6916009)(52536014)(54906003)(71200400001)(8676002)(7696005)(2906002)(316002)(8936002)(66946007); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: 0Mu9Gryt8CS/b0Iofh1RCnwGqEPklSagkIemQYgFdpVeesXWvl6QwkArPtXXd2/GGGPayDL+XGBK4BYk2WtD+FLEr3kI9ymK5Y+PffPa7H1KJWUXa+2U9EyfPH6yNwRZTzHsaQ6DXoArtOuOhg8oU67aUzn2eX7c0Sf3Jhd2m3Ka4TSvvEOEpB9bFF8K8rG7c4IEtKY5vVxkVLL6CNlwUdPBeEsqlO+6LLyfl2W0qrxFMVKCpF6GbFtoquktxhI7ECguI0tfsK3O3RWerW5hdiJW4EsCsAxZ/YcxU+UimXT/ePiBRl2ah7tMjliTby5iNc0I5Bk0JcdkqWOS22s/6242kXq3Hdk+tDrLf6h4LwWcx15O8hbLkQn3LGlaMqDeud11MAzWmIfH/Cp3JCjXdFEUSVJJZGtgh+Amd1IS82i3c19Nd8ol5YsU7McuzasYmDqypYfXbOytDwdTG3W6/D5kytD93QeM9YiMExfiF9v+Nj3xpuUZbpczrPfRvmvaXz03EdoVJZOwugJoZ/Gdyh7U8VfigAyvvaeXXEMeVB72npGsNw2jIrM7HqsOrZkfFzYDDzZ7jFh2nky9JcmZw3MgdNRadDzhs/6CRjYvJ3l3aQV8xp94Mglsoe5Ke5HAK4LIMThtCPNAhysH+dhNdX374kuo4hryD+H1xqITaOz4e4lbBU1RW8vlvF5sm/Q/SKDTq8GwM7wg0+Gj656GSHXlexz2iRLZV5ydmcnPQ9UGZnsKAzdFmO28i3zS16yWTBUquIPW1XRHKjEWjCySFGKoyUzu4qdcmqs7+3MsPSKE9vZ7AbcAdvbI1DubkHDBMagWyNafpY65najW51OhYMOuzgTA52uNsAKkXAMWzvhSIS7ME+Xgc/t476g4pGw4PEsowDLvSiyUzKQmoyufQQ== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR1801MB1884.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5b4cae2-6e5b-4820-0904-08d88567af47 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Nov 2020 10:59:23.9870 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4ENbmPJMfcLaM0HYP5xHI2YkEYC9xdtX8IIR6+82+WpnLAtu5CIxes0dFJ16a8NkBrAtPnWa5EW21wPkP0fppw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR18MB1097 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-11-10_04:2020-11-05, 2020-11-10 signatures=0 Subject: Re: [dpdk-stable] [EXT] patch 'crypto/octeontx2: fix multi-process' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi Luca, Please find my reply inline. Thanks Ankur >-----Original Message----- >From: luca.boccassi@gmail.com >Sent: Tuesday, November 10, 2020 12:10 AM >To: Ankur Dwivedi >Cc: Anoob Joseph ; dpdk stable >Subject: [EXT] patch 'crypto/octeontx2: fix multi-process' has been queued= to >stable release 19.11.6 > >External Email > >---------------------------------------------------------------------- >Hi, > >FYI, your patch has been queued to stable release 19.11.6 > >Note it hasn't been pushed to >https://urldefense.proofpoint.com/v2/url?u=3Dhttp- >3A__dpdk.org_browse_dpdk- >2Dstable&d=3DDwIDAg&c=3DnKjWec2b6R0mOyPaz7xtfQ&r=3DILjiNF3GF25y6QdHZUx >Ml6JrStU0MIuCtO5dMzn3Ybk&m=3DWJuhF88JRLbzAE2KFDm7fq_VKrRhCBfJ1zW >9-e8Y9Fs&s=3Dmj0L_xoCfGbVaKeVCZRgKMCSRJvL_VQRL9Ukk60Oyk4&e=3D yet. >It will be pushed if I get no objections before 11/11/20. So please shout = if >anyone has objections. > >Also note that after the patch there's a diff of the upstream commit vs th= e >patch applied to the branch. This will indicate if there was any rebasing >needed to apply to the stable branch. If there were code changes for rebas= ing >(ie: not only metadata diffs), please double check that the rebase was >correctly done. > >Queued patches are on a temporary branch at: >https://urldefense.proofpoint.com/v2/url?u=3Dhttps- >3A__github.com_bluca_dpdk- >2Dstable&d=3DDwIDAg&c=3DnKjWec2b6R0mOyPaz7xtfQ&r=3DILjiNF3GF25y6QdHZUx >Ml6JrStU0MIuCtO5dMzn3Ybk&m=3DWJuhF88JRLbzAE2KFDm7fq_VKrRhCBfJ1zW >9-e8Y9Fs&s=3D7RDdv-ig0gf-Ik31WdzFV8mldqC7ejjFz7eIIlkpPAo&e=3D > >This queued commit can be viewed at: >https://urldefense.proofpoint.com/v2/url?u=3Dhttps- >3A__github.com_bluca_dpdk- >2Dstable_commit_3415ca530b2ea4acdbc15b3c6eb4c4f4177a09dc&d=3DDwIDAg >&c=3DnKjWec2b6R0mOyPaz7xtfQ&r=3DILjiNF3GF25y6QdHZUxMl6JrStU0MIuCtO5d >Mzn3Ybk&m=3DWJuhF88JRLbzAE2KFDm7fq_VKrRhCBfJ1zW9- >e8Y9Fs&s=3DpEl2YmNRFwnSh57DYLWRaNYvL4ZiOMv_zTkzBlAsRo4&e=3D > >Thanks. > >Luca Boccassi > >--- >>From 3415ca530b2ea4acdbc15b3c6eb4c4f4177a09dc Mon Sep 17 00:00:00 >2001 >From: Ankur Dwivedi >Date: Thu, 22 Oct 2020 13:20:00 +0530 >Subject: [PATCH] crypto/octeontx2: fix multi-process > >[ upstream commit 9fd11c1583c9b3249f49755b3216a79698e94700 ] > >During crypto device probe few functions should be called only for the >primary process. This patch fixes this issue. > >Fixes: 818d138bcce9 ("crypto/octeontx2: add init sequence in probe") > >Signed-off-by: Ankur Dwivedi >Reviewed-by: Anoob Joseph >--- > drivers/crypto/octeontx2/otx2_cryptodev.c | 49 +++++++++++-------- > drivers/crypto/octeontx2/otx2_cryptodev.h | 2 + > drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 13 +++-- > 3 files changed, 40 insertions(+), 24 deletions(-) > >diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.c >b/drivers/crypto/octeontx2/otx2_cryptodev.c >index 417eda6de6..2323de1f60 100644 >--- a/drivers/crypto/octeontx2/otx2_cryptodev.c >+++ b/drivers/crypto/octeontx2/otx2_cryptodev.c >@@ -70,31 +70,34 @@ otx2_cpt_pci_probe(struct rte_pci_driver *pci_drv >__rte_unused, > > otx2_dev =3D &vf->otx2_dev; > >- /* Initialize the base otx2_dev object */ >- ret =3D otx2_dev_init(pci_dev, otx2_dev); >- if (ret) { >- CPT_LOG_ERR("Could not initialize otx2_dev"); >- goto pmd_destroy; >- } >+ if (rte_eal_process_type() =3D=3D RTE_PROC_PRIMARY) { >+ /* Initialize the base otx2_dev object */ >+ ret =3D otx2_dev_init(pci_dev, otx2_dev); >+ if (ret) { >+ CPT_LOG_ERR("Could not initialize otx2_dev"); >+ goto pmd_destroy; >+ } > >- /* Get number of queues available on the device */ >- ret =3D otx2_cpt_available_queues_get(dev, &nb_queues); >- if (ret) { >- CPT_LOG_ERR("Could not determine the number of queues >available"); >- goto otx2_dev_fini; >- } >+ /* Get number of queues available on the device */ >+ ret =3D otx2_cpt_available_queues_get(dev, &nb_queues); >+ if (ret) { >+ CPT_LOG_ERR("Could not determine the number of >queues available"); >+ goto otx2_dev_fini; >+ } > >- /* Don't exceed the limits set per VF */ >- nb_queues =3D RTE_MIN(nb_queues, >OTX2_CPT_MAX_QUEUES_PER_VF); >+ /* Don't exceed the limits set per VF */ >+ nb_queues =3D RTE_MIN(nb_queues, >OTX2_CPT_MAX_QUEUES_PER_VF); > >- if (nb_queues =3D=3D 0) { >- CPT_LOG_ERR("No free queues available on the device"); >- goto otx2_dev_fini; >- } >+ if (nb_queues =3D=3D 0) { >+ CPT_LOG_ERR("No free queues available on the >device"); >+ goto otx2_dev_fini; >+ } > >- vf->max_queues =3D nb_queues; >+ vf->max_queues =3D nb_queues; > >- CPT_LOG_INFO("Max queues supported by device: %d", vf- >>max_queues); >+ CPT_LOG_INFO("Max queues supported by device: %d", >+ vf->max_queues); >+ } > > dev->feature_flags =3D RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | > RTE_CRYPTODEV_FF_HW_ACCELERATED | @@ - >105,10 +108,14 @@ otx2_cpt_pci_probe(struct rte_pci_driver *pci_drv >__rte_unused, > RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO | > RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT; > >+ if (rte_eal_process_type() =3D=3D RTE_PROC_SECONDARY) >+ otx2_cpt_set_enqdeq_fns(dev); >+ > return 0; > > otx2_dev_fini: >- otx2_dev_fini(pci_dev, otx2_dev); >+ if (rte_eal_process_type() =3D=3D RTE_PROC_PRIMARY) [Ankur] For 19.11 branch the above if check is not required as the otx2_dev= _fini label is reached only by the primary process. For 20.11 branch the ab= ove if check was required but for 19.11 branch it is not required. So if it= s possible can you remove the if check during merging? >+ otx2_dev_fini(pci_dev, otx2_dev); > pmd_destroy: > rte_cryptodev_pmd_destroy(dev); > exit: >diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.h >b/drivers/crypto/octeontx2/otx2_cryptodev.h >index c0aa661b3b..17c0bee661 100644 >--- a/drivers/crypto/octeontx2/otx2_cryptodev.h >+++ b/drivers/crypto/octeontx2/otx2_cryptodev.h >@@ -40,4 +40,6 @@ extern int otx2_cpt_logtype; > */ > extern uint8_t otx2_cryptodev_driver_id; > >+void otx2_cpt_set_enqdeq_fns(struct rte_cryptodev *dev); >+ > #endif /* _OTX2_CRYPTODEV_H_ */ >diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c >b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c >index af4bbccd7d..292aff1928 100644 >--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c >+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c >@@ -813,6 +813,15 @@ otx2_cpt_dequeue_burst(void *qptr, struct >rte_crypto_op **ops, uint16_t nb_ops) > return nb_completed; > } > >+void >+otx2_cpt_set_enqdeq_fns(struct rte_cryptodev *dev) { >+ dev->enqueue_burst =3D otx2_cpt_enqueue_burst; >+ dev->dequeue_burst =3D otx2_cpt_dequeue_burst; >+ >+ rte_mb(); >+} >+ > /* PMD ops */ > > static int >@@ -862,10 +871,8 @@ otx2_cpt_dev_config(struct rte_cryptodev *dev, > goto queues_detach; > } > >- dev->enqueue_burst =3D otx2_cpt_enqueue_burst; >- dev->dequeue_burst =3D otx2_cpt_dequeue_burst; >+ otx2_cpt_set_enqdeq_fns(dev); > >- rte_mb(); > return 0; > > queues_detach: >-- >2.27.0 > >--- > Diff of the applied patch vs upstream commit (please double-check if non= - >empty: >--- >--- - 2020-11-09 18:40:11.932938032 +0000 >+++ 0018-crypto-octeontx2-fix-multi-process.patch 2020-11-09 >18:40:11.091310660 +0000 >@@ -1 +1 @@ >-From 9fd11c1583c9b3249f49755b3216a79698e94700 Mon Sep 17 00:00:00 >2001 >+From 3415ca530b2ea4acdbc15b3c6eb4c4f4177a09dc Mon Sep 17 00:00:00 >2001 >@@ -5,0 +6,2 @@ >+[ upstream commit 9fd11c1583c9b3249f49755b3216a79698e94700 ] >+ >@@ -10 +11,0 @@ >-Cc: stable@dpdk.org >@@ -15 +16 @@ >- drivers/crypto/octeontx2/otx2_cryptodev.c | 57 +++++++++++-------- >+ drivers/crypto/octeontx2/otx2_cryptodev.c | 49 +++++++++++-------- >@@ -17,2 +18,2 @@ >- drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 13 ++++- >- 3 files changed, 44 insertions(+), 28 deletions(-) >+ drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 13 +++-- >+ 3 files changed, 40 insertions(+), 24 deletions(-) >@@ -21 +22 @@ >-index 02d2fd83bd..1de04f4a66 100644 >+index 417eda6de6..2323de1f60 100644 >@@ -24 +25 @@ >-@@ -70,36 +70,39 @@ otx2_cpt_pci_probe(struct rte_pci_driver *pci_drv >__rte_unused, >+@@ -70,31 +70,34 @@ otx2_cpt_pci_probe(struct rte_pci_driver *pci_drv >+__rte_unused, >@@ -74,0 +76 @@ >++ } >@@ -76,15 +78,5 @@ >-- ret =3D otx2_cpt_hardware_caps_get(dev, vf->hw_caps); >-- if (ret) { >-- CPT_LOG_ERR("Could not determine hardware capabilities"); >-- goto otx2_dev_fini; >-+ ret =3D otx2_cpt_hardware_caps_get(dev, vf->hw_caps); >-+ if (ret) { >-+ CPT_LOG_ERR("Could not determine hardware >capabilities"); >-+ goto otx2_dev_fini; >-+ } >- } >- >- otx2_crypto_capabilities_init(vf->hw_caps); >-@@ -121,10 +124,14 @@ otx2_cpt_pci_probe(struct rte_pci_driver *pci_drv >__rte_unused, >- RTE_CRYPTODEV_FF_SYM_SESSIONLESS | >- RTE_CRYPTODEV_FF_SECURITY; >+ dev->feature_flags =3D RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | >+ RTE_CRYPTODEV_FF_HW_ACCELERATED | @@ - >105,10 +108,14 @@ >+otx2_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, >+ RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO | >+ RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT; >@@ -105 +97 @@ >-index 7b1b648639..febb4ee74d 100644 >+index c0aa661b3b..17c0bee661 100644 >@@ -108 +100 @@ >-@@ -51,4 +51,6 @@ extern int otx2_cpt_logtype; >+@@ -40,4 +40,6 @@ extern int otx2_cpt_logtype; >@@ -116 +108 @@ >-index 790af02dc6..be37d3cac1 100644 >+index af4bbccd7d..292aff1928 100644 >@@ -119 +111 @@ >-@@ -1019,6 +1019,15 @@ otx2_cpt_dequeue_burst(void *qptr, struct >rte_crypto_op **ops, uint16_t nb_ops) >+@@ -813,6 +813,15 @@ otx2_cpt_dequeue_burst(void *qptr, struct >+rte_crypto_op **ops, uint16_t nb_ops) >@@ -135,2 +127,2 @@ >-@@ -1081,10 +1090,8 @@ otx2_cpt_dev_config(struct rte_cryptodev *dev, >- goto intr_unregister; >+@@ -862,10 +871,8 @@ otx2_cpt_dev_config(struct rte_cryptodev *dev, >+ goto queues_detach; >@@ -146 +138 @@ >- intr_unregister: >+ queues_detach: