patch 'net/vmxnet3: fix Rx data ring initialization' has been queued to stable release 21.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.2

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/13/22. 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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/a3f86b4d6b55f28cabf130c1a5223da3ed5f71d6

Thanks.

Kevin

---
>From a3f86b4d6b55f28cabf130c1a5223da3ed5f71d6 Mon Sep 17 00:00:00 2001
From: Pankaj Gupta <pagupta at vmware.com>
Date: Tue, 24 May 2022 17:40:28 -0700
Subject: [PATCH] net/vmxnet3: fix Rx data ring initialization

[ upstream commit cac5e257f670159310a9558860463e562d480aa8 ]

Fix merge error.

Tested, using testpmd, for different hardware versions on ESXi 7.0
Update 2.

Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt")

Signed-off-by: Pankaj Gupta <pagupta at vmware.com>
Reviewed-by: Jochen Behrens <jbehrens at vmware.com>
---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index d1ef1cad08..d4aea74026 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -823,4 +823,9 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
 		rqd->conf.compRingSize    = rxq->comp_ring.size;
 
+		if (VMXNET3_VERSION_GE_3(hw)) {
+			rqd->conf.rxDataRingBasePA = rxq->data_ring.basePA;
+			rqd->conf.rxDataRingDescSize = rxq->data_desc_size;
+		}
+
 		if (hw->intr.lsc_only)
 			rqd->conf.intrIdx = 1;
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-09 12:34:30.773603050 +0100
+++ 0043-net-vmxnet3-fix-Rx-data-ring-initialization.patch	2022-06-09 12:34:29.751980651 +0100
@@ -1 +1 @@
-From cac5e257f670159310a9558860463e562d480aa8 Mon Sep 17 00:00:00 2001
+From a3f86b4d6b55f28cabf130c1a5223da3ed5f71d6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cac5e257f670159310a9558860463e562d480aa8 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index c9e352b73a..2af67dc0a3 100644
+index d1ef1cad08..d4aea74026 100644
@@ -24 +25 @@
-@@ -876,4 +876,9 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
+@@ -823,4 +823,9 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)