patch 'crypto/virtio: fix driver ID' has been queued to stable release 23.11.5

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/28/25. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
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 rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=9c9ce1e0cef63b173df003aa9d5f0d975ed85cf2

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 9c9ce1e0cef63b173df003aa9d5f0d975ed85cf2 Mon Sep 17 00:00:00 2001
From: Rajesh Mudimadugula <rmudimadugul at marvell.com>
Date: Wed, 28 May 2025 10:53:47 +0000
Subject: [PATCH] crypto/virtio: fix driver ID
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 9843181aa5e764fd6876f50e8a795353e9261cb1 ]

This patch corrects driver id for virtio and virtio_user
pmds.

Fixes: 25500d4b8076 ("crypto/virtio: support device init")

Signed-off-by: Rajesh Mudimadugula <rmudimadugul at marvell.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
 drivers/crypto/virtio/virtio_cryptodev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/virtio/virtio_cryptodev.c b/drivers/crypto/virtio/virtio_cryptodev.c
index d99b53b2ef..c208e76c7a 100644
--- a/drivers/crypto/virtio/virtio_cryptodev.c
+++ b/drivers/crypto/virtio/virtio_cryptodev.c
@@ -731,7 +731,6 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev,
 	if (cryptodev == NULL)
 		return -ENODEV;
 
-	cryptodev->driver_id = cryptodev_virtio_driver_id;
 	cryptodev->dev_ops = &virtio_crypto_dev_ops;
 
 	cryptodev->enqueue_burst = virtio_crypto_pkt_tx_burst;
@@ -755,6 +754,7 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev,
 
 	if (virtio_crypto_init_device(cryptodev,
 			VIRTIO_CRYPTO_PMD_GUEST_FEATURES) < 0)
+	cryptodev->driver_id = cryptodev_virtio_driver_id;
 		return -1;
 
 	rte_cryptodev_pmd_probing_finish(cryptodev);
@@ -1392,7 +1392,7 @@ virtio_crypto_dev_info_get(struct rte_cryptodev *dev,
 	PMD_INIT_FUNC_TRACE();
 
 	if (info != NULL) {
-		info->driver_id = cryptodev_virtio_driver_id;
+		info->driver_id = dev->driver_id;
 		info->feature_flags = dev->feature_flags;
 		info->max_nb_queue_pairs = hw->max_dataqueues;
 		/* No limit of number of sessions */
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-26 19:59:20.370336119 +0800
+++ 0069-crypto-virtio-fix-driver-ID.patch	2025-06-26 19:59:17.474418040 +0800
@@ -1 +1 @@
-From 9843181aa5e764fd6876f50e8a795353e9261cb1 Mon Sep 17 00:00:00 2001
+From 9c9ce1e0cef63b173df003aa9d5f0d975ed85cf2 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 9843181aa5e764fd6876f50e8a795353e9261cb1 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -15,3 +17,2 @@
- drivers/crypto/virtio/virtio_cryptodev.c      | 4 ++--
- drivers/crypto/virtio/virtio_user_cryptodev.c | 5 +++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
+ drivers/crypto/virtio/virtio_cryptodev.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -20 +21 @@
-index 299898e585..d661ce8025 100644
+index d99b53b2ef..c208e76c7a 100644
@@ -23,3 +24,3 @@
-@@ -550,7 +550,6 @@ crypto_virtio_dev_init(struct rte_cryptodev *cryptodev, uint64_t features,
- {
- 	struct virtio_crypto_hw *hw;
+@@ -731,7 +731,6 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev,
+ 	if (cryptodev == NULL)
+ 		return -ENODEV;
@@ -31,3 +32 @@
-@@ -599,6 +598,7 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev,
- 	if (cryptodev == NULL)
- 		return -ENODEV;
+@@ -755,6 +754,7 @@ crypto_virtio_create(const char *name, struct rte_pci_device *pci_dev,
@@ -34,0 +34,2 @@
+ 	if (virtio_crypto_init_device(cryptodev,
+ 			VIRTIO_CRYPTO_PMD_GUEST_FEATURES) < 0)
@@ -36,2 +36,0 @@
- 	if (crypto_virtio_dev_init(cryptodev, VIRTIO_CRYPTO_PMD_GUEST_FEATURES,
- 			pci_dev) < 0)
@@ -39 +38,3 @@
-@@ -1694,7 +1694,7 @@ virtio_crypto_dev_info_get(struct rte_cryptodev *dev,
+ 
+ 	rte_cryptodev_pmd_probing_finish(cryptodev);
+@@ -1392,7 +1392,7 @@ virtio_crypto_dev_info_get(struct rte_cryptodev *dev,
@@ -48,30 +48,0 @@
-diff --git a/drivers/crypto/virtio/virtio_user_cryptodev.c b/drivers/crypto/virtio/virtio_user_cryptodev.c
-index 992e8fb43b..4daa188e1d 100644
---- a/drivers/crypto/virtio/virtio_user_cryptodev.c
-+++ b/drivers/crypto/virtio/virtio_user_cryptodev.c
-@@ -26,6 +26,8 @@
- 
- #define virtio_user_get_dev(hwp) container_of(hwp, struct virtio_user_dev, hw)
- 
-+uint8_t cryptodev_virtio_user_driver_id;
-+
- static void
- virtio_user_read_dev_config(struct virtio_crypto_hw *hw, size_t offset,
- 		     void *dst, int length __rte_unused)
-@@ -460,6 +462,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *vdev)
- 		goto end;
- 	}
- 
-+	cryptodev->driver_id = cryptodev_virtio_user_driver_id;
- 	if (crypto_virtio_dev_init(cryptodev, VIRTIO_USER_CRYPTO_PMD_GUEST_FEATURES,
- 			NULL) < 0) {
- 		PMD_INIT_LOG(ERR, "crypto_virtio_dev_init fails");
-@@ -563,8 +566,6 @@ static struct rte_vdev_driver virtio_user_driver = {
- 
- static struct cryptodev_driver virtio_crypto_drv;
- 
--uint8_t cryptodev_virtio_user_driver_id;
--
- RTE_PMD_REGISTER_VDEV(crypto_virtio_user, virtio_user_driver);
- RTE_PMD_REGISTER_CRYPTO_DRIVER(virtio_crypto_drv,
- 	virtio_user_driver.driver,