patch 'vdpa/nfp: fix hardware initialization' has been queued to stable release 23.11.3

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/30/24. 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=d0688a90529e682fd211f991e7a0b7ceb899993e

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From d0688a90529e682fd211f991e7a0b7ceb899993e Mon Sep 17 00:00:00 2001
From: Xinying Yu <xinying.yu at corigine.com>
Date: Mon, 5 Aug 2024 10:12:39 +0800
Subject: [PATCH] vdpa/nfp: fix hardware initialization
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit fc470d5e88f848957b8f6d2089210254525e9e13 ]

Reconfigure the NIC will fail because lack of the
initialization logic of queue configuration pointer.
Fix this by adding the correct initialization logic.

Fixes: d89f4990c14e ("vdpa/nfp: add hardware init")

Signed-off-by: Xinying Yu <xinying.yu at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 .mailmap                         | 1 +
 drivers/vdpa/nfp/nfp_vdpa_core.c | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/.mailmap b/.mailmap
index f4d2a72009..a72dce1a61 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1601,6 +1601,7 @@ Xieming Katty <katty.xieming at huawei.com>
 Xinfeng Zhao <xinfengx.zhao at intel.com>
 Xingguang He <xingguang.he at intel.com>
 Xingyou Chen <niatlantice at gmail.com>
+Xinying Yu <xinying.yu at corigine.com>
 Xin Long <longxin.xl at alibaba-inc.com>
 Xi Zhang <xix.zhang at intel.com>
 Xuan Ding <xuan.ding at intel.com>
diff --git a/drivers/vdpa/nfp/nfp_vdpa_core.c b/drivers/vdpa/nfp/nfp_vdpa_core.c
index 7b877605e4..291798196c 100644
--- a/drivers/vdpa/nfp/nfp_vdpa_core.c
+++ b/drivers/vdpa/nfp/nfp_vdpa_core.c
@@ -55,7 +55,10 @@ nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw,
 		struct rte_pci_device *pci_dev)
 {
 	uint32_t queue;
+	uint8_t *tx_bar;
+	uint32_t start_q;
 	struct nfp_hw *hw;
+	uint32_t tx_bar_off;
 	uint8_t *notify_base;

 	hw = &vdpa_hw->super;
@@ -82,6 +85,12 @@ nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw,
 				idx + 1, vdpa_hw->notify_addr[idx + 1]);
 	}

+	/* NFP vDPA cfg queue setup */
+	start_q = nn_cfg_readl(hw, NFP_NET_CFG_START_TXQ);
+	tx_bar_off = start_q * NFP_QCP_QUEUE_ADDR_SZ;
+	tx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + tx_bar_off;
+	hw->qcp_cfg = tx_bar + NFP_QCP_QUEUE_ADDR_SZ;
+
 	vdpa_hw->features = (1ULL << VIRTIO_F_VERSION_1) |
 			(1ULL << VIRTIO_F_IN_ORDER) |
 			(1ULL << VHOST_USER_F_PROTOCOL_FEATURES);
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-11 14:23:07.394025494 +0800
+++ 0048-vdpa-nfp-fix-hardware-initialization.patch	2024-11-11 14:23:05.122192840 +0800
@@ -1 +1 @@
-From fc470d5e88f848957b8f6d2089210254525e9e13 Mon Sep 17 00:00:00 2001
+From d0688a90529e682fd211f991e7a0b7ceb899993e Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit fc470d5e88f848957b8f6d2089210254525e9e13 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index 544e62df7d..f51b1dda5d 100644
+index f4d2a72009..a72dce1a61 100644
@@ -27 +29 @@
-@@ -1655,6 +1655,7 @@ Xieming Katty <katty.xieming at huawei.com>
+@@ -1601,6 +1601,7 @@ Xieming Katty <katty.xieming at huawei.com>