patch 'net/nfp: fix representor port link status update' has been queued to stable release 23.11.3

Xueming Li xuemingl at nvidia.com
Mon Nov 11 07:28:17 CET 2024


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=d2484a7f388c787198637ea4e39a2722ab231f15

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From d2484a7f388c787198637ea4e39a2722ab231f15 Mon Sep 17 00:00:00 2001
From: Qin Ke <qin.ke at corigine.com>
Date: Thu, 5 Sep 2024 14:25:11 +0800
Subject: [PATCH] net/nfp: fix representor port link status update
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit d95cf21d2ed6630d21b5b1ca4abc40155720cd3f ]

The link status of representor port is reported by the flower
firmware through control message and it already parsed and
stored in the 'link' field of representor port structure.

The original logic read link status from the control BAR again,
and use it rather then the 'link' field of the representor port
structure in the following logic wrongly.

Fix this by delete the read control BAR statement and use the
right link status value.

Fixes: c4de52eca76c ("net/nfp: remove redundancy for representor port")

Signed-off-by: Qin Ke <qin.ke 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>
---
 drivers/net/nfp/flower/nfp_flower_representor.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index 88fb6975af..23709acbba 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -23,7 +23,6 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev,
 		__rte_unused int wait_to_complete)
 {
 	int ret;
-	uint32_t nn_link_status;
 	struct nfp_net_hw *pf_hw;
 	struct rte_eth_link *link;
 	struct nfp_flower_representor *repr;
@@ -32,9 +31,7 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev,
 	link = &repr->link;

 	pf_hw = repr->app_fw_flower->pf_hw;
-	nn_link_status = nn_cfg_readw(&pf_hw->super, NFP_NET_CFG_STS);
-
-	ret = nfp_net_link_update_common(dev, pf_hw, link, nn_link_status);
+	ret = nfp_net_link_update_common(dev, pf_hw, link, link->link_status);

 	return ret;
 }
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-11 14:23:09.255512556 +0800
+++ 0091-net-nfp-fix-representor-port-link-status-update.patch	2024-11-11 14:23:05.232192837 +0800
@@ -1 +1 @@
-From d95cf21d2ed6630d21b5b1ca4abc40155720cd3f Mon Sep 17 00:00:00 2001
+From d2484a7f388c787198637ea4e39a2722ab231f15 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit d95cf21d2ed6630d21b5b1ca4abc40155720cd3f ]
@@ -18 +20,0 @@
-Cc: stable at dpdk.org
@@ -25,2 +27,2 @@
- drivers/net/nfp/flower/nfp_flower_representor.c | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
+ drivers/net/nfp/flower/nfp_flower_representor.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
@@ -29 +31 @@
-index 054ea1a938..5db7d50618 100644
+index 88fb6975af..23709acbba 100644
@@ -32 +34 @@
-@@ -29,18 +29,13 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev,
+@@ -23,7 +23,6 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev,
@@ -37 +39 @@
--	struct nfp_net_hw *pf_hw;
+ 	struct nfp_net_hw *pf_hw;
@@ -40,2 +42 @@
-
- 	repr = dev->data->dev_private;
+@@ -32,9 +31,7 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev,
@@ -44 +45 @@
--	pf_hw = repr->app_fw_flower->pf_hw;
+ 	pf_hw = repr->app_fw_flower->pf_hw;
@@ -47,2 +48,2 @@
--	ret = nfp_net_link_update_common(dev, link, nn_link_status);
-+	ret = nfp_net_link_update_common(dev, link, link->link_status);
+-	ret = nfp_net_link_update_common(dev, pf_hw, link, nn_link_status);
++	ret = nfp_net_link_update_common(dev, pf_hw, link, link->link_status);


More information about the stable mailing list