patch 'net/nfp: fix reconfigure logic in PF 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=cb30eb9a1176718cb8b963361c5daf1700a22de9

Thanks.

Xueming Li <xuemingl at nvidia.com>

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

[ upstream commit 1e80c07472aeed5669c79c0430b8aeece5129a20 ]

There exists exit point between the reconfigure logic and the store
logic of the PF 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: b812daadad0d ("nfp: add Rx and Tx")

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.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 71832bfa23..a780887868 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -155,6 +155,8 @@ nfp_net_start(struct rte_eth_dev *dev)
 
 	nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);
 	if (nfp_net_reconfig(hw, new_ctrl, update) < 0)
+	hw->ctrl = new_ctrl;
+
 		return -EIO;
 
 	/*
@@ -173,8 +175,6 @@ nfp_net_start(struct rte_eth_dev *dev)
 		nfp_eth_set_configured(dev->process_private,
 				       hw->nfp_idx, 1);
 
-	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.032035500 +0800
+++ 0026-net-nfp-fix-reconfigure-logic-in-PF-initialization.patch	2023-12-11 17:56:22.927652300 +0800
@@ -1 +1 @@
-From 1e80c07472aeed5669c79c0430b8aeece5129a20 Mon Sep 17 00:00:00 2001
+From cb30eb9a1176718cb8b963361c5daf1700a22de9 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 1e80c07472aeed5669c79c0430b8aeece5129a20 ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index 76317925ec..0a0e3d6375 100644
+index 71832bfa23..a780887868 100644
@@ -27,3 +29 @@
-@@ -141,6 +141,8 @@ nfp_net_start(struct rte_eth_dev *dev)
- 	if (nfp_reconfig(hw, new_ctrl, update) != 0)
- 		return -EIO;
+@@ -155,6 +155,8 @@ nfp_net_start(struct rte_eth_dev *dev)
@@ -30,0 +31,2 @@
+ 	nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);
+ 	if (nfp_net_reconfig(hw, new_ctrl, update) < 0)
@@ -33,6 +35,6 @@
- 	/* Enable packet type offload by extend ctrl word1. */
- 	cap_extend = hw->cap_ext;
- 	if ((cap_extend & NFP_NET_CFG_CTRL_PKT_TYPE) != 0)
-@@ -171,8 +173,6 @@ nfp_net_start(struct rte_eth_dev *dev)
- 	else
- 		nfp_eth_set_configured(dev->process_private, net_hw->nfp_idx, 1);
+ 		return -EIO;
+ 
+ 	/*
+@@ -173,8 +175,6 @@ nfp_net_start(struct rte_eth_dev *dev)
+ 		nfp_eth_set_configured(dev->process_private,
+ 				       hw->nfp_idx, 1);