[PATCH 0/3] Correct RSS algorithm related logic

[PATCH 0/3] Correct RSS algorithm related logic

[Chaoyong He]

This patch series try to correct the RSS algorithm related logic.

Chaoyong He (3):
  net/nfp: support get RSS algorithm capability
  net/nfp: support get RSS algorithm configuration
  net/nfp: correct RSS algorithm configuration logic

 drivers/common/nfp/nfp_common.h               |   1 +
 drivers/common/nfp/nfp_common_ctrl.h          |   3 +
 .../net/nfp/flower/nfp_flower_representor.c   |   1 +
 drivers/net/nfp/nfp_net_common.c              | 227 +++++++++++++-----
 drivers/net/nfp/nfp_net_common.h              |   3 +
 5 files changed, 170 insertions(+), 65 deletions(-)

-- 
2.43.5

[PATCH 1/3] net/nfp: support get RSS algorithm capability

[Chaoyong He]

Implement the logic of get RSS algorithm capability, also add the logic
of print RSS algorithm capability.

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
---
 drivers/common/nfp/nfp_common.h               |  1 +
 drivers/common/nfp/nfp_common_ctrl.h          |  3 +++
 .../net/nfp/flower/nfp_flower_representor.c   |  1 +
 drivers/net/nfp/nfp_net_common.c              | 26 +++++++++++++++++++
 drivers/net/nfp/nfp_net_common.h              |  3 +++
 5 files changed, 34 insertions(+)

diff --git a/drivers/common/nfp/nfp_common.h b/drivers/common/nfp/nfp_common.h
index 7597d4090b..f0a4c557d6 100644
--- a/drivers/common/nfp/nfp_common.h
+++ b/drivers/common/nfp/nfp_common.h
@@ -39,6 +39,7 @@ struct nfp_hw {
 	uint32_t ctrl_ext;
 	rte_spinlock_t reconfig_lock;
 	struct rte_ether_addr mac_addr;
+	uint32_t cap_rss;
 };
 
 static inline uint8_t
diff --git a/drivers/common/nfp/nfp_common_ctrl.h b/drivers/common/nfp/nfp_common_ctrl.h
index 3db3cc90a3..01839c13db 100644
--- a/drivers/common/nfp/nfp_common_ctrl.h
+++ b/drivers/common/nfp/nfp_common_ctrl.h
@@ -191,6 +191,8 @@ struct nfp_net_fw_ver {
 #define NFP_NET_CFG_RX_OFFSET           0x0050
 #define NFP_NET_CFG_RX_OFFSET_DYNAMIC          0    /* Prepend mode */
 
+#define NFP_NET_CFG_RSS_CAP             0x0054
+
 /* Start anchor of the TLV area */
 #define NFP_NET_CFG_TLV_BASE            0x0058
 
@@ -248,6 +250,7 @@ struct nfp_net_fw_ver {
 #define   NFP_NET_CFG_RSS_IPV4_SCTP       (1 << 14) /* RSS for IPv4/SCTP */
 #define   NFP_NET_CFG_RSS_IPV6_SCTP       (1 << 15) /* RSS for IPv6/SCTP */
 #define   NFP_NET_CFG_RSS_TOEPLITZ        (1 << 24) /* Use Toeplitz hash */
+#define   NFP_NET_CFG_RSS_XOR             (1 << 25) /* Use XOR as hash */
 #define   NFP_NET_CFG_RSS_CRC32           (1 << 26) /* Use CRC32 hash */
 #define NFP_NET_CFG_RSS_KEY             (NFP_NET_CFG_RSS_BASE + 0x4)
 #define NFP_NET_CFG_RSS_KEY_SZ          0x28
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index e377d45e53..33fb98ceea 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -181,6 +181,7 @@ nfp_flower_repr_dev_infos_get(__rte_unused struct rte_eth_dev *dev,
 		dev_info->flow_type_rss_offloads = NFP_NET_RSS_CAP;
 		dev_info->reta_size = NFP_NET_CFG_RSS_ITBL_SZ;
 		dev_info->hash_key_size = NFP_NET_CFG_RSS_KEY_SZ;
+		nfp_net_rss_algo_capa_get(pf_hw, dev_info);
 	}
 
 	return 0;
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index aaa515bac2..6284c54f5b 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -396,6 +396,7 @@ nfp_net_log_device_information(const struct nfp_net_hw *hw,
 {
 	uint32_t cap = hw->super.cap;
 	uint32_t cap_ext = hw->super.cap_ext;
+	uint32_t cap_rss = hw->super.cap_rss;
 
 	PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d.",
 			pf_dev->ver.major, pf_dev->ver.minor, hw->max_mtu);
@@ -442,6 +443,12 @@ nfp_net_log_device_information(const struct nfp_net_hw *hw,
 			cap_ext & NFP_NET_CFG_CTRL_FLOW_STEER      ? "FLOW_STEER "      : "",
 			cap_ext & NFP_NET_CFG_CTRL_IN_ORDER        ? "VIRTIO_IN_ORDER " : "");
 
+	PMD_INIT_LOG(INFO, "CAP_RSS: %#x.", cap_rss);
+	PMD_INIT_LOG(INFO, "%s%s%s",
+			cap_rss & NFP_NET_CFG_RSS_TOEPLITZ        ? "RSS_TOEPLITZ "   : "",
+			cap_rss & NFP_NET_CFG_RSS_XOR             ? "RSS_XOR "        : "",
+			cap_rss & NFP_NET_CFG_RSS_CRC32           ? "RSS_CRC32 "      : "");
+
 	PMD_INIT_LOG(INFO, "The max_rx_queues: %u, max_tx_queues: %u.",
 			hw->max_rx_queues, hw->max_tx_queues);
 }
@@ -1406,6 +1413,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 		dev_info->flow_type_rss_offloads = NFP_NET_RSS_CAP;
 		dev_info->reta_size = NFP_NET_CFG_RSS_ITBL_SZ;
 		dev_info->hash_key_size = NFP_NET_CFG_RSS_KEY_SZ;
+		nfp_net_rss_algo_capa_get(hw, dev_info);
 	}
 
 	/* Only PF supports getting speed capability. */
@@ -1430,6 +1438,7 @@ nfp_net_common_init(struct nfp_pf_dev *pf_dev,
 
 	hw->max_rx_queues = nn_cfg_readl(&hw->super, NFP_NET_CFG_MAX_RXRINGS);
 	hw->max_tx_queues = nn_cfg_readl(&hw->super, NFP_NET_CFG_MAX_TXRINGS);
+	hw->super.cap_rss = nn_cfg_readl(&hw->super, NFP_NET_CFG_RSS_CAP);
 	if (hw->max_rx_queues == 0 || hw->max_tx_queues == 0) {
 		PMD_INIT_LOG(ERR, "Device %s can not be used, there are no valid queue "
 				"pairs for use.", pci_dev->name);
@@ -3222,3 +3231,20 @@ nfp_net_led_off(struct rte_eth_dev *dev)
 {
 	return nfp_net_led_control(dev, false);
 }
+
+void
+nfp_net_rss_algo_capa_get(struct nfp_net_hw *hw,
+		struct rte_eth_dev_info *dev_info)
+{
+	uint32_t cap_rss;
+
+	cap_rss = hw->super.cap_rss;
+	if ((cap_rss & NFP_NET_CFG_RSS_TOEPLITZ) != 0)
+		dev_info->rss_algo_capa |= RTE_ETH_HASH_ALGO_CAPA_MASK(TOEPLITZ);
+
+	if ((cap_rss & NFP_NET_CFG_RSS_XOR) != 0)
+		dev_info->rss_algo_capa |= RTE_ETH_HASH_ALGO_CAPA_MASK(SIMPLE_XOR);
+
+	if ((cap_rss & NFP_NET_CFG_RSS_CRC32) != 0)
+		dev_info->rss_algo_capa |= RTE_ETH_HASH_ALGO_CAPA_MASK(DEFAULT);
+}
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index d85a00a75e..a6addf8610 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -402,6 +402,9 @@ int nfp_net_get_module_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_inf
 int nfp_net_led_on(struct rte_eth_dev *dev);
 int nfp_net_led_off(struct rte_eth_dev *dev);
 
+void nfp_net_rss_algo_capa_get(struct nfp_net_hw *hw,
+		struct rte_eth_dev_info *dev_info);
+
 #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\
 	((struct nfp_app_fw_nic *)app_fw_priv)
 
-- 
2.43.5

[PATCH 2/3] net/nfp: support get RSS algorithm configuration

[Chaoyong He]

Implement the logic of get RSS algorithm configuration, also do little
refactor to related functions.

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
---
 drivers/net/nfp/nfp_net_common.c | 84 ++++++++++++++++++++++----------
 1 file changed, 57 insertions(+), 27 deletions(-)

diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 6284c54f5b..7f1ab70d9b 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -1919,6 +1919,55 @@ nfp_net_reta_query(struct rte_eth_dev *dev,
 	return 0;
 }
 
+static void
+nfp_net_rss_hf_get(uint32_t cfg_rss_ctrl,
+		struct rte_eth_rss_conf *rss_conf)
+{
+	uint64_t rss_hf = 0;
+
+	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4) != 0)
+		rss_hf |= RTE_ETH_RSS_IPV4;
+
+	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_TCP) != 0)
+		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_TCP;
+
+	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_TCP) != 0)
+		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_TCP;
+
+	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_UDP) != 0)
+		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_UDP;
+
+	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_UDP) != 0)
+		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_UDP;
+
+	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6) != 0)
+		rss_hf |= RTE_ETH_RSS_IPV6;
+
+	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_SCTP) != 0)
+		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_SCTP;
+
+	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_SCTP) != 0)
+		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_SCTP;
+
+	rss_conf->rss_hf = rss_hf;
+}
+
+static int
+nfp_net_rss_algo_conf_get(uint32_t cfg_rss_ctrl,
+		struct rte_eth_rss_conf *rss_conf)
+{
+	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_TOEPLITZ) != 0)
+		rss_conf->algorithm = RTE_ETH_HASH_FUNCTION_TOEPLITZ;
+	else if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_XOR) != 0)
+		rss_conf->algorithm = RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
+	else if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_CRC32) != 0)
+		rss_conf->algorithm = RTE_ETH_HASH_FUNCTION_DEFAULT;
+	else
+		return -EIO;
+
+	return 0;
+}
+
 static int
 nfp_net_rss_hash_write(struct rte_eth_dev *dev,
 		struct rte_eth_rss_conf *rss_conf)
@@ -2024,9 +2073,9 @@ int
 nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
 		struct rte_eth_rss_conf *rss_conf)
 {
+	int ret;
 	uint8_t i;
 	uint8_t key;
-	uint64_t rss_hf;
 	struct nfp_hw *hw;
 	uint32_t cfg_rss_ctrl;
 	struct nfp_net_hw *net_hw;
@@ -2037,35 +2086,10 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
 	if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)
 		return -EINVAL;
 
-	rss_hf = rss_conf->rss_hf;
 	cfg_rss_ctrl = nn_cfg_readl(hw, NFP_NET_CFG_RSS_CTRL);
 
-	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4) != 0)
-		rss_hf |= RTE_ETH_RSS_IPV4;
-
-	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_TCP) != 0)
-		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_TCP;
-
-	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_TCP) != 0)
-		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_TCP;
-
-	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_UDP) != 0)
-		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_UDP;
-
-	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_UDP) != 0)
-		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_UDP;
-
-	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6) != 0)
-		rss_hf |= RTE_ETH_RSS_IPV6;
-
-	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_SCTP) != 0)
-		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_SCTP;
-
-	if ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_SCTP) != 0)
-		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_SCTP;
-
 	/* Propagate current RSS hash functions to caller */
-	rss_conf->rss_hf = rss_hf;
+	nfp_net_rss_hf_get(cfg_rss_ctrl, rss_conf);
 
 	/* Reading the key size */
 	rss_conf->rss_key_len = nn_cfg_readl(hw, NFP_NET_CFG_RSS_KEY_SZ);
@@ -2076,6 +2100,12 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
 		memcpy(&rss_conf->rss_key[i], &key, 1);
 	}
 
+	ret = nfp_net_rss_algo_conf_get(cfg_rss_ctrl, rss_conf);
+	if (ret != 0) {
+		PMD_DRV_LOG(ERR, "Fail to get rss algorithm configuration.");
+		return ret;
+	}
+
 	return 0;
 }
 
-- 
2.43.5

[PATCH 3/3] net/nfp: correct RSS algorithm configuration logic

[Chaoyong He]

Correct the RSS algorithm configuration logic, also do some refactor to
the related logic.

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
---
 drivers/net/nfp/nfp_net_common.c | 121 +++++++++++++++++++++----------
 1 file changed, 81 insertions(+), 40 deletions(-)

diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 7f1ab70d9b..f578ec1909 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -1952,6 +1952,37 @@ nfp_net_rss_hf_get(uint32_t cfg_rss_ctrl,
 	rss_conf->rss_hf = rss_hf;
 }
 
+static void
+nfp_net_rss_hf_set(uint32_t *cfg_rss_ctrl,
+		struct rte_eth_rss_conf *rss_conf)
+{
+	uint64_t rss_hf = rss_conf->rss_hf;
+
+	if ((rss_hf & RTE_ETH_RSS_IPV4) != 0)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4;
+
+	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_TCP) != 0)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_TCP;
+
+	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_UDP) != 0)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_UDP;
+
+	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_SCTP) != 0)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_SCTP;
+
+	if ((rss_hf & RTE_ETH_RSS_IPV6) != 0)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6;
+
+	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_TCP) != 0)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_TCP;
+
+	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_UDP) != 0)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_UDP;
+
+	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_SCTP) != 0)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_SCTP;
+}
+
 static int
 nfp_net_rss_algo_conf_get(uint32_t cfg_rss_ctrl,
 		struct rte_eth_rss_conf *rss_conf)
@@ -1968,13 +1999,31 @@ nfp_net_rss_algo_conf_get(uint32_t cfg_rss_ctrl,
 	return 0;
 }
 
+static int
+nfp_net_rss_algo_conf_set(uint32_t *cfg_rss_ctrl,
+		struct rte_eth_rss_conf *rss_conf)
+{
+	enum rte_eth_hash_function algorithm = rss_conf->algorithm;
+
+	if (algorithm == RTE_ETH_HASH_FUNCTION_TOEPLITZ)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_TOEPLITZ;
+	else if (algorithm == RTE_ETH_HASH_FUNCTION_SIMPLE_XOR)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_XOR;
+	else if (algorithm == RTE_ETH_HASH_FUNCTION_DEFAULT)
+		*cfg_rss_ctrl |= NFP_NET_CFG_RSS_CRC32;
+	else
+		return -ENOTSUP;
+
+	return 0;
+}
+
 static int
 nfp_net_rss_hash_write(struct rte_eth_dev *dev,
 		struct rte_eth_rss_conf *rss_conf)
 {
+	int ret;
 	uint8_t i;
 	uint8_t key;
-	uint64_t rss_hf;
 	struct nfp_hw *hw;
 	struct nfp_net_hw *net_hw;
 	uint32_t cfg_rss_ctrl = 0;
@@ -1988,38 +2037,15 @@ nfp_net_rss_hash_write(struct rte_eth_dev *dev,
 		nn_cfg_writeb(hw, NFP_NET_CFG_RSS_KEY + i, key);
 	}
 
-	rss_hf = rss_conf->rss_hf;
-
-	if ((rss_hf & RTE_ETH_RSS_IPV4) != 0)
-		cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4;
-
-	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_TCP) != 0)
-		cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_TCP;
-
-	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_UDP) != 0)
-		cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_UDP;
-
-	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_SCTP) != 0)
-		cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_SCTP;
-
-	if ((rss_hf & RTE_ETH_RSS_IPV6) != 0)
-		cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6;
-
-	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_TCP) != 0)
-		cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_TCP;
-
-	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_UDP) != 0)
-		cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_UDP;
-
-	if ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_SCTP) != 0)
-		cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_SCTP;
+	nfp_net_rss_hf_set(&cfg_rss_ctrl, rss_conf);
 
 	cfg_rss_ctrl |= NFP_NET_CFG_RSS_MASK;
 
-	if (rte_eth_dev_is_repr(dev))
-		cfg_rss_ctrl |= NFP_NET_CFG_RSS_CRC32;
-	else
-		cfg_rss_ctrl |= NFP_NET_CFG_RSS_TOEPLITZ;
+	ret = nfp_net_rss_algo_conf_set(&cfg_rss_ctrl, rss_conf);
+	if (ret != 0) {
+		PMD_DRV_LOG(ERR, "Fail to set rss algorithm configuration.");
+		return ret;
+	}
 
 	/* Configuring where to apply the RSS hash */
 	nn_cfg_writel(hw, NFP_NET_CFG_RSS_CTRL, cfg_rss_ctrl);
@@ -2034,24 +2060,18 @@ int
 nfp_net_rss_hash_update(struct rte_eth_dev *dev,
 		struct rte_eth_rss_conf *rss_conf)
 {
+	int ret;
 	uint32_t update;
-	uint64_t rss_hf;
 	struct nfp_hw *hw;
 	struct nfp_net_hw *net_hw;
 
 	net_hw = nfp_net_get_hw(dev);
 	hw = &net_hw->super;
 
-	rss_hf = rss_conf->rss_hf;
-
 	/* Checking if RSS is enabled */
 	if ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {
-		if (rss_hf != 0) {
-			PMD_DRV_LOG(ERR, "RSS unsupported.");
-			return -EINVAL;
-		}
-
-		return 0; /* Nothing to do */
+		PMD_DRV_LOG(ERR, "RSS unsupported.");
+		return -EINVAL;
 	}
 
 	if (rss_conf->rss_key_len > NFP_NET_CFG_RSS_KEY_SZ) {
@@ -2059,7 +2079,11 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,
 		return -EINVAL;
 	}
 
-	nfp_net_rss_hash_write(dev, rss_conf);
+	ret = nfp_net_rss_hash_write(dev, rss_conf);
+	if (ret != 0) {
+		PMD_DRV_LOG(ERR, "RSS write failed.");
+		return ret;
+	}
 
 	update = NFP_NET_CFG_UPDATE_RSS;
 
@@ -2116,6 +2140,18 @@ nfp_net_rss_config_default(struct rte_eth_dev *dev)
 	uint8_t i;
 	uint8_t j;
 	uint16_t queue = 0;
+	uint8_t default_key[] = {
+		0x6d, 0x5a, 0x56, 0xda,
+		0x25, 0x5b, 0x0e, 0xc2,
+		0x41, 0x67, 0x25, 0x3d,
+		0x43, 0xa3, 0x8f, 0xb0,
+		0xd0, 0xca, 0x2b, 0xcb,
+		0xae, 0x7b, 0x30, 0xb4,
+		0x77, 0xcb, 0x2d, 0xa3,
+		0x80, 0x30, 0xf2, 0x0c,
+		0x6a, 0x42, 0xb7, 0x3b,
+		0xbe, 0xac, 0x01, 0xfa,
+	};
 	struct rte_eth_conf *dev_conf;
 	struct rte_eth_rss_conf rss_conf;
 	uint16_t rx_queues = dev->data->nb_rx_queues;
@@ -2143,6 +2179,11 @@ nfp_net_rss_config_default(struct rte_eth_dev *dev)
 	}
 
 	rss_conf = dev_conf->rx_adv_conf.rss_conf;
+	if (rss_conf.rss_key_len == 0) {
+		rss_conf.rss_key = default_key;
+		rss_conf.rss_key_len = NFP_NET_CFG_RSS_KEY_SZ;
+	}
+
 	ret = nfp_net_rss_hash_write(dev, &rss_conf);
 
 	return ret;
-- 
2.43.5