patch 'net/nfp: fix hash key length logic' has been queued to stable release 23.11.5

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/28/25. 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=26f6134cfee6e64f1da5a446bf7b975f88894983

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 26f6134cfee6e64f1da5a446bf7b975f88894983 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Tue, 1 Apr 2025 07:09:31 -0700
Subject: [PATCH] net/nfp: fix hash key length logic
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 346a007e161e68950acbf59984fefc2bb6fe3982 ]

There does not exist an API for driver to get/set the hash key length
from/to the firmware.
---
 drivers/net/nfp/nfp_net_common.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 61a3685e2f..b0ccd2fcab 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -1724,9 +1724,6 @@ nfp_net_rss_hash_write(struct rte_eth_dev *dev,
 	/* Configuring where to apply the RSS hash */
 	nn_cfg_writel(hw, NFP_NET_CFG_RSS_CTRL, cfg_rss_ctrl);
 
-	/* Writing the key size */
-	nn_cfg_writeb(hw, NFP_NET_CFG_RSS_KEY_SZ, rss_conf->rss_key_len);
-
 	return 0;
 }
 
@@ -1817,7 +1814,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
 	rss_conf->rss_hf = rss_hf;
 
 	/* Reading the key size */
-	rss_conf->rss_key_len = nn_cfg_readl(hw, NFP_NET_CFG_RSS_KEY_SZ);
+	rss_conf->rss_key_len = NFP_NET_CFG_RSS_KEY_SZ;
 
 	/* Reading the key byte a byte */
 	if (rss_conf->rss_key != NULL) {
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-26 19:59:19.154149770 +0800
+++ 0031-net-nfp-fix-hash-key-length-logic.patch	2025-06-26 19:59:17.330418046 +0800
@@ -1 +1 @@
-From 346a007e161e68950acbf59984fefc2bb6fe3982 Mon Sep 17 00:00:00 2001
+From 26f6134cfee6e64f1da5a446bf7b975f88894983 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 346a007e161e68950acbf59984fefc2bb6fe3982 ]
@@ -9,15 +11,0 @@
-	#define NFP_NET_CFG_RSS_KEY_SZ          0x28
-	#define NFP_NET_CFG_MACADDR             0x0024
----
-
-The original logic try to use the 'NFP_NET_CFG_RSS_KEY_SZ' as the
-inexistent API, read from this address will get wrong hash key length
-and write to this address will overwrite the MAC address unexpected,
-which will cause very strange problem.
-
-Fixes: 934e4c60fbff ("nfp: add RSS")
-Cc: stable at dpdk.org
-
-Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
-Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
----
@@ -28 +16 @@
-index 600fcd5c0e..df89595773 100644
+index 61a3685e2f..b0ccd2fcab 100644
@@ -31 +19 @@
-@@ -1966,9 +1966,6 @@ nfp_net_rss_hash_write(struct rte_eth_dev *dev,
+@@ -1724,9 +1724,6 @@ nfp_net_rss_hash_write(struct rte_eth_dev *dev,
@@ -41 +29 @@
-@@ -2059,7 +2056,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
+@@ -1817,7 +1814,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,