[PATCH AUTOSEL for-4.4 32/39] ixgbe: add mask for 64 RSS queues

[Levin, Alexander (Sasha Levin)]

From: Emil Tantilov 

[ Upstream commit 2bf1a87b903bd81b1448a1cef73de59fb6c4d340 ]

The indirection table was reported incorrectly for X550 and newer
where we can support up to 64 RSS queues.

Reported-by Krishneil Singh 
Signed-off-by: Emil Tantilov 
Tested-by: Andrew Bowers 
Signed-off-by: Jeff Kirsher 

Signed-off-by: Sasha Levin 
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c 
b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index f3168bcc7d87..f0de09db8283 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -307,6 +307,7 @@ static void ixgbe_cache_ring_register(struct ixgbe_adapter 
*adapter)
ixgbe_cache_ring_rss(adapter);
 }
 
+#define IXGBE_RSS_64Q_MASK 0x3F
 #define IXGBE_RSS_16Q_MASK 0xF
 #define IXGBE_RSS_8Q_MASK  0x7
 #define IXGBE_RSS_4Q_MASK  0x3
@@ -602,6 +603,7 @@ static bool ixgbe_set_sriov_queues(struct ixgbe_adapter 
*adapter)
  **/
 static bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter)
 {
+   struct ixgbe_hw *hw = >hw;
struct ixgbe_ring_feature *f;
u16 rss_i;
 
@@ -610,7 +612,11 @@ static bool ixgbe_set_rss_queues(struct ixgbe_adapter 
*adapter)
rss_i = f->limit;
 
f->indices = rss_i;
-   f->mask = IXGBE_RSS_16Q_MASK;
+
+   if (hw->mac.type < ixgbe_mac_X550)
+   f->mask = IXGBE_RSS_16Q_MASK;
+   else
+   f->mask = IXGBE_RSS_64Q_MASK;
 
/* disable ATR by default, it will be configured below */
adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
-- 
2.11.0

[PATCH AUTOSEL for-4.4 32/39] ixgbe: add mask for 64 RSS queues

[Levin, Alexander (Sasha Levin)]

From: Emil Tantilov 

[ Upstream commit 2bf1a87b903bd81b1448a1cef73de59fb6c4d340 ]

The indirection table was reported incorrectly for X550 and newer
where we can support up to 64 RSS queues.

Reported-by Krishneil Singh 
Signed-off-by: Emil Tantilov 
Tested-by: Andrew Bowers 
Signed-off-by: Jeff Kirsher 

Signed-off-by: Sasha Levin 
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c 
b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index f3168bcc7d87..f0de09db8283 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -307,6 +307,7 @@ static void ixgbe_cache_ring_register(struct ixgbe_adapter 
*adapter)
ixgbe_cache_ring_rss(adapter);
 }
 
+#define IXGBE_RSS_64Q_MASK 0x3F
 #define IXGBE_RSS_16Q_MASK 0xF
 #define IXGBE_RSS_8Q_MASK  0x7
 #define IXGBE_RSS_4Q_MASK  0x3
@@ -602,6 +603,7 @@ static bool ixgbe_set_sriov_queues(struct ixgbe_adapter 
*adapter)
  **/
 static bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter)
 {
+   struct ixgbe_hw *hw = >hw;
struct ixgbe_ring_feature *f;
u16 rss_i;
 
@@ -610,7 +612,11 @@ static bool ixgbe_set_rss_queues(struct ixgbe_adapter 
*adapter)
rss_i = f->limit;
 
f->indices = rss_i;
-   f->mask = IXGBE_RSS_16Q_MASK;
+
+   if (hw->mac.type < ixgbe_mac_X550)
+   f->mask = IXGBE_RSS_16Q_MASK;
+   else
+   f->mask = IXGBE_RSS_64Q_MASK;
 
/* disable ATR by default, it will be configured below */
adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
-- 
2.11.0