patch 'net/nfp: fix multi-PF control flag' has been queued to stable release 23.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
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=92bddea79da424642f3c194619ccb02ff3a28898

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 92bddea79da424642f3c194619ccb02ff3a28898 Mon Sep 17 00:00:00 2001
From: Peng Zhang <peng.zhang at corigine.com>
Date: Wed, 22 Jan 2025 09:39:30 +0800
Subject: [PATCH] net/nfp: fix multi-PF control flag
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 02c056aaac1ba1bd16658eef19cb78457d556041 ]

In the original logic of 'nfp_net_start()', we don't set the
'NFP_NET_CFG_CTRL_MULTI_PF' flag when using multi-pf firmware.

Fix it by adding the missing logic.

Fixes: 95f978efab42 ("net/nfp: enable multiple PF in application firmware")

Signed-off-by: Peng Zhang <peng.zhang at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
---
 drivers/net/nfp/nfp_ethdev.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index b27324c0b4..32f49a6613 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -150,6 +150,9 @@ nfp_net_start(struct rte_eth_dev *dev)
 		ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP
 				| NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;

+	if ((cap_extend & NFP_NET_CFG_CTRL_MULTI_PF) != 0 && pf_dev->multi_pf.enabled)
+		ctrl_extend |= NFP_NET_CFG_CTRL_MULTI_PF;
+
 	update = NFP_NET_CFG_UPDATE_GEN;
 	if (nfp_ext_reconfig(hw, ctrl_extend, update) != 0)
 		return -EIO;
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-18 19:39:01.724540359 +0800
+++ 0028-net-nfp-fix-multi-PF-control-flag.patch	2025-02-18 19:39:00.498244070 +0800
@@ -1 +1 @@
-From 02c056aaac1ba1bd16658eef19cb78457d556041 Mon Sep 17 00:00:00 2001
+From 92bddea79da424642f3c194619ccb02ff3a28898 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 02c056aaac1ba1bd16658eef19cb78457d556041 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index 58a5b1d94e..ca808afdd9 100644
+index b27324c0b4..32f49a6613 100644
@@ -24,3 +26,3 @@
-@@ -472,6 +472,9 @@ nfp_net_start(struct rte_eth_dev *dev)
- 	if ((cap_extend & NFP_NET_CFG_CTRL_FLOW_STEER) != 0)
- 		ctrl_extend |= NFP_NET_CFG_CTRL_FLOW_STEER;
+@@ -150,6 +150,9 @@ nfp_net_start(struct rte_eth_dev *dev)
+ 		ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP
+ 				| NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;