When adding the i40e PMD, the rss_hash_conf_get function was changed
to update the RSS key len.
The corresponding functions for ixgbe & e1000 were not updated to
follow the new convention.
Fixes: 8a387fa85f02 ("ethdev: more RSS flags")
Signed-off-by: Thierry Herbelot <[email protected]>
---
V2: For igb & ixgbe, a hard-coded integer is replaced a symbolic constant.
---
drivers/net/intel/e1000/igb_rxtx.c | 3 ++-
drivers/net/intel/e1000/igc_ethdev.c | 1 +
drivers/net/intel/ixgbe/ixgbe_rxtx.c | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/intel/e1000/igb_rxtx.c
b/drivers/net/intel/e1000/igb_rxtx.c
index cdd7a3338f61..14b28588174f 100644
--- a/drivers/net/intel/e1000/igb_rxtx.c
+++ b/drivers/net/intel/e1000/igb_rxtx.c
@@ -2035,13 +2035,14 @@ int eth_igb_rss_hash_conf_get(struct rte_eth_dev *dev,
hash_key = rss_conf->rss_key;
if (hash_key != NULL) {
/* Return RSS hash key */
- for (i = 0; i < 10; i++) {
+ for (i = 0; i < IGB_HKEY_MAX_INDEX; i++) {
rss_key = E1000_READ_REG_ARRAY(hw, E1000_RSSRK(0), i);
hash_key[(i * 4)] = rss_key & 0x000000FF;
hash_key[(i * 4) + 1] = (rss_key >> 8) & 0x000000FF;
hash_key[(i * 4) + 2] = (rss_key >> 16) & 0x000000FF;
hash_key[(i * 4) + 3] = (rss_key >> 24) & 0x000000FF;
}
+ rss_conf->rss_key_len = IGB_HKEY_MAX_INDEX * sizeof(uint32_t);
}
/* Get RSS functions configured in MRQC register */
diff --git a/drivers/net/intel/e1000/igc_ethdev.c
b/drivers/net/intel/e1000/igc_ethdev.c
index b9c91d2446c0..9f6ada3bc6cd 100644
--- a/drivers/net/intel/e1000/igc_ethdev.c
+++ b/drivers/net/intel/e1000/igc_ethdev.c
@@ -2559,6 +2559,7 @@ eth_igc_rss_hash_conf_get(struct rte_eth_dev *dev,
/* read RSS key from register */
for (i = 0; i < IGC_HKEY_MAX_INDEX; i++)
hash_key[i] = E1000_READ_REG_LE_VALUE(hw,
E1000_RSSRK(i));
+ rss_conf->rss_key_len = IGC_HKEY_MAX_INDEX * sizeof(uint32_t);
}
/* get RSS functions configured in MRQC register */
diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx.c
b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
index a7583c178a14..e830bb9495b8 100644
--- a/drivers/net/intel/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
@@ -3749,13 +3749,14 @@ ixgbe_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
hash_key = rss_conf->rss_key;
if (hash_key != NULL) {
/* Return RSS hash key */
- for (i = 0; i < 10; i++) {
+ for (i = 0; i < IXGBE_HKEY_MAX_INDEX; i++) {
rss_key = IXGBE_READ_REG_ARRAY(hw, rssrk_reg, i);
hash_key[(i * 4)] = rss_key & 0x000000FF;
hash_key[(i * 4) + 1] = (rss_key >> 8) & 0x000000FF;
hash_key[(i * 4) + 2] = (rss_key >> 16) & 0x000000FF;
hash_key[(i * 4) + 3] = (rss_key >> 24) & 0x000000FF;
}
+ rss_conf->rss_key_len = IXGBE_HKEY_MAX_INDEX * sizeof(uint32_t);
}
if (!ixgbe_rss_enabled(hw)) { /* RSS is disabled */
--
2.39.2
