patch 'net/nfp: fix link change return value' has been queued to stable release 22.11.7

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/25/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://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/4e6b6c42ce56ff93451a218e746d82fcdace6c20

Thanks.

Luca Boccassi

---
From 4e6b6c42ce56ff93451a218e746d82fcdace6c20 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he@corigine.com>
Date: Sat, 12 Oct 2024 10:41:02 +0800
Subject: [PATCH] net/nfp: fix link change return value

[ upstream commit 0ca4f216b89162ce8142d665a98924bdf4a23a6e ]

The return value of 'nfp_eth_set_configured()' is three ways, the
original logic considered it as two ways wrongly.

Fixes: 61d4008fe6bb ("net/nfp: support setting link up/down")

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/nfp/nfp_ethdev.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 68fd67a024..d795025004 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -205,6 +205,7 @@ error:
 static int
 nfp_net_stop(struct rte_eth_dev *dev)
 {
+	int ret;
 	struct nfp_net_hw *hw;
 
 	PMD_INIT_LOG(DEBUG, "Stop");
@@ -220,10 +221,12 @@ nfp_net_stop(struct rte_eth_dev *dev)
 
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
 		/* Configure the physical port down */
-		nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
 	else
-		nfp_eth_set_configured(dev->process_private,
+		ret = nfp_eth_set_configured(dev->process_private,
 				       hw->nfp_idx, 0);
+	if (ret < 0)
+		return ret;
 
 	return 0;
 }
@@ -232,6 +235,7 @@ nfp_net_stop(struct rte_eth_dev *dev)
 static int
 nfp_net_set_link_up(struct rte_eth_dev *dev)
 {
+	int ret;
 	struct nfp_net_hw *hw;
 
 	PMD_DRV_LOG(DEBUG, "Set link up");
@@ -240,16 +244,21 @@ nfp_net_set_link_up(struct rte_eth_dev *dev)
 
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
 		/* Configure the physical port down */
-		return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);
+		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);
 	else
-		return nfp_eth_set_configured(dev->process_private,
+		ret = nfp_eth_set_configured(dev->process_private,
 					      hw->nfp_idx, 1);
+	if (ret < 0)
+		return ret;
+
+	return 0;
 }
 
 /* Set the link down. */
 static int
 nfp_net_set_link_down(struct rte_eth_dev *dev)
 {
+	int ret;
 	struct nfp_net_hw *hw;
 
 	PMD_DRV_LOG(DEBUG, "Set link down");
@@ -258,10 +267,14 @@ nfp_net_set_link_down(struct rte_eth_dev *dev)
 
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
 		/* Configure the physical port down */
-		return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
 	else
-		return nfp_eth_set_configured(dev->process_private,
+		ret = nfp_eth_set_configured(dev->process_private,
 					      hw->nfp_idx, 0);
+	if (ret < 0)
+		return ret;
+
+	return 0;
 }
 
 static void
-- 
2.45.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-10-23 22:16:42.982841281 +0100
+++ 0065-net-nfp-fix-link-change-return-value.patch	2024-10-23 22:16:40.527943830 +0100
@@ -1 +1 @@
-From 0ca4f216b89162ce8142d665a98924bdf4a23a6e Mon Sep 17 00:00:00 2001
+From 4e6b6c42ce56ff93451a218e746d82fcdace6c20 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0ca4f216b89162ce8142d665a98924bdf4a23a6e ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -17,2 +18,2 @@
- drivers/net/nfp/nfp_ethdev.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
+ drivers/net/nfp/nfp_ethdev.c | 25 +++++++++++++++++++------
+ 1 file changed, 19 insertions(+), 6 deletions(-)
@@ -21 +22 @@
-index 4b31785b9f..ef1c2a94b7 100644
+index 68fd67a024..d795025004 100644
@@ -24 +25,24 @@
-@@ -527,26 +527,36 @@ error:
+@@ -205,6 +205,7 @@ error:
+ static int
+ nfp_net_stop(struct rte_eth_dev *dev)
+ {
++	int ret;
+ 	struct nfp_net_hw *hw;
+ 
+ 	PMD_INIT_LOG(DEBUG, "Stop");
+@@ -220,10 +221,12 @@ nfp_net_stop(struct rte_eth_dev *dev)
+ 
+ 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ 		/* Configure the physical port down */
+-		nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
++		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+ 	else
+-		nfp_eth_set_configured(dev->process_private,
++		ret = nfp_eth_set_configured(dev->process_private,
+ 				       hw->nfp_idx, 0);
++	if (ret < 0)
++		return ret;
+ 
+ 	return 0;
+ }
+@@ -232,6 +235,7 @@ nfp_net_stop(struct rte_eth_dev *dev)
@@ -30 +53,0 @@
- 	struct nfp_net_hw_priv *hw_priv;
@@ -32,2 +55,2 @@
- 	hw = dev->data->dev_private;
- 	hw_priv = dev->process_private;
+ 	PMD_DRV_LOG(DEBUG, "Set link up");
+@@ -240,16 +244,21 @@ nfp_net_set_link_up(struct rte_eth_dev *dev)
@@ -35,2 +58,8 @@
--	return nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 1);
-+	ret = nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 1);
+ 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ 		/* Configure the physical port down */
+-		return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);
++		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);
+ 	else
+-		return nfp_eth_set_configured(dev->process_private,
++		ret = nfp_eth_set_configured(dev->process_private,
+ 					      hw->nfp_idx, 1);
@@ -49 +77,0 @@
- 	struct nfp_net_hw_priv *hw_priv;
@@ -51,2 +79,2 @@
- 	hw = dev->data->dev_private;
- 	hw_priv = dev->process_private;
+ 	PMD_DRV_LOG(DEBUG, "Set link down");
+@@ -258,10 +267,14 @@ nfp_net_set_link_down(struct rte_eth_dev *dev)
@@ -54,2 +82,8 @@
--	return nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 0);
-+	ret = nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 0);
+ 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ 		/* Configure the physical port down */
+-		return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
++		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+ 	else
+-		return nfp_eth_set_configured(dev->process_private,
++		ret = nfp_eth_set_configured(dev->process_private,
+ 					      hw->nfp_idx, 0);