patch 'net/nfp: fix getting RSS configuration' has been queued to stable release 22.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/11/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/log/?h=22.11-staging/commit/03cfac3c9935306137f5c4b48beedb179b394577

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 03cfac3c9935306137f5c4b48beedb179b394577 Mon Sep 17 00:00:00 2001
From: Long Wu <long.wu at corigine.com>
Date: Tue, 21 Feb 2023 13:52:22 +0800
Subject: [PATCH] net/nfp: fix getting RSS configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd ]

"NFP_NET_CFG_RSS_IPV4" and "NFP_NET_CFG_RSS_IPV6" represent that
firmware will calculate RSS base on L3 rather than UDP or TCP
information from packets. So the logic of return RSS configuration in
driver is wrong.

Modify code to return the right configuration.

Fixes: 934e4c60fbff ("nfp: add RSS")

Signed-off-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund at corigine.com>
---
 drivers/net/nfp/nfp_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index c962ed0fc0..c9eeaa02fc 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -1256,7 +1256,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
 	cfg_rss_ctrl = nn_cfg_readl(hw, NFP_NET_CFG_RSS_CTRL);
 
 	if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4)
-		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_NONFRAG_IPV4_UDP;
+		rss_hf |= RTE_ETH_RSS_IPV4;
 
 	if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_TCP)
 		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_TCP;
@@ -1271,7 +1271,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
 		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_UDP;
 
 	if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6)
-		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_NONFRAG_IPV6_UDP;
+		rss_hf |= RTE_ETH_RSS_IPV6;
 
 	/* Propagate current RSS hash functions to caller */
 	rss_conf->rss_hf = rss_hf;
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-04-09 21:45:39.746208000 +0800
+++ 0037-net-nfp-fix-getting-RSS-configuration.patch	2023-04-09 21:45:38.619042200 +0800
@@ -1 +1 @@
-From ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd Mon Sep 17 00:00:00 2001
+From 03cfac3c9935306137f5c4b48beedb179b394577 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd ]
@@ -17 +19,0 @@
-Cc: stable at dpdk.org
@@ -27 +29 @@
-index 837056cc12..5922bfea8e 100644
+index c962ed0fc0..c9eeaa02fc 100644
@@ -30 +32 @@
-@@ -1420,7 +1420,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
+@@ -1256,7 +1256,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
@@ -39 +41 @@
-@@ -1435,7 +1435,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
+@@ -1271,7 +1271,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
@@ -46,2 +48,2 @@
- 	if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_SCTP)
- 		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_SCTP;
+ 	/* Propagate current RSS hash functions to caller */
+ 	rss_conf->rss_hf = rss_hf;