patch 'net/nfp: fix reconfigure logic in VF initialization' has been queued to stable release 22.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/13/23. 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=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=8d45a7ecacdfa22d32aa47c93561ac74e305aba8

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 8d45a7ecacdfa22d32aa47c93561ac74e305aba8 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Sat, 28 Oct 2023 14:23:14 +0800
Subject: [PATCH] net/nfp: fix reconfigure logic in VF initialization
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 61847adc98057c0e500c65110a83181b7db4ebc9 ]

There exists exit point between the reconfigure logic and the store
logic of the VF initialization, this may lead one situation that value
in the config bar is not same with the value stored in the data
structure.

Fix this by move up the store statement.

Fixes: 7f8e73201dae ("net/nfp: move VF functions into its own file")

Signed-off-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>
---
 drivers/net/nfp/nfp_ethdev_vf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c
index 268820cbea..6a70daca90 100644
--- a/drivers/net/nfp/nfp_ethdev_vf.c
+++ b/drivers/net/nfp/nfp_ethdev_vf.c
@@ -114,6 +114,8 @@ nfp_netvf_start(struct rte_eth_dev *dev)
 	if (nfp_net_reconfig(hw, new_ctrl, update) < 0)
 		return -EIO;
 
+	hw->ctrl = new_ctrl;
+
 	/*
 	 * Allocating rte mbufs for configured rx queues.
 	 * This requires queues being enabled before
@@ -123,8 +125,6 @@ nfp_netvf_start(struct rte_eth_dev *dev)
 		goto error;
 	}
 
-	hw->ctrl = new_ctrl;
-
 	for (i = 0; i < dev->data->nb_rx_queues; i++)
 		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
 	for (i = 0; i < dev->data->nb_tx_queues; i++)
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-12-11 17:56:24.061159400 +0800
+++ 0027-net-nfp-fix-reconfigure-logic-in-VF-initialization.patch	2023-12-11 17:56:22.927652300 +0800
@@ -1 +1 @@
-From 61847adc98057c0e500c65110a83181b7db4ebc9 Mon Sep 17 00:00:00 2001
+From 8d45a7ecacdfa22d32aa47c93561ac74e305aba8 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 61847adc98057c0e500c65110a83181b7db4ebc9 ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index b9cfb48021..2d08a07913 100644
+index 268820cbea..6a70daca90 100644
@@ -27,2 +29,2 @@
-@@ -91,6 +91,8 @@ nfp_netvf_start(struct rte_eth_dev *dev)
- 	if (nfp_reconfig(hw, new_ctrl, update) != 0)
+@@ -114,6 +114,8 @@ nfp_netvf_start(struct rte_eth_dev *dev)
+ 	if (nfp_net_reconfig(hw, new_ctrl, update) < 0)
@@ -35,2 +37,2 @@
- 	 * This requires queues being enabled before.
-@@ -100,8 +102,6 @@ nfp_netvf_start(struct rte_eth_dev *dev)
+ 	 * This requires queues being enabled before
+@@ -123,8 +125,6 @@ nfp_netvf_start(struct rte_eth_dev *dev)