ixgbe: change config srrctl to only program one register per VMDq/RSS id

This change makes it so only one srrctl register is programmed per VMDq id, and if VMDq is not enabled it is one register per RSS queue.  Currently this function is working correctly for the multiqueue RSS and single queue cases, but if any advances features such as VMDq or DCB would have been enabled this function would have caused issues as it was not correct.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 198b9d9a3d4cce7c201c882474ff0c5cb2def8b0..99e0b34416e8706f4b5cc078f0a97576bb7588cd 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1417,18 +1417,23 @@ static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter, int index)
        struct ixgbe_ring *rx_ring;
        u32 srrctl;
        int queue0;
-       unsigned long *mask, maskval = 1;
-       long shift, len;
-
-       if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
-               mask = (unsigned long *) &adapter->ring_feature[RING_F_RSS].mask;
-               len = sizeof(adapter->ring_feature[RING_F_RSS].mask) * 8;
+       unsigned long mask;
+
+       /* program one srrctl register per VMDq index */
+       if (adapter->flags & IXGBE_FLAG_VMDQ_ENABLED) {
+               long shift, len;
+               mask = (unsigned long) adapter->ring_feature[RING_F_RSS].mask;
+               len = sizeof(adapter->ring_feature[RING_F_VMDQ].mask) * 8;
+               shift = find_first_bit(&mask, len);
+               queue0 = index & mask;
+               index = (index & mask) >> shift;
+       /* program one srrctl per RSS queue since RDRXCTL.MVMEN is enabled */
        } else {
-               mask = &maskval;
-               len = 1;
+               mask = (unsigned long) adapter->ring_feature[RING_F_RSS].mask;
+               queue0 = index & mask;
+               index = index & mask;
        }
-       shift = find_first_bit(mask, len);
-       queue0 = index << shift;
+
        rx_ring = &adapter->rx_ring[queue0];
 
        srrctl = IXGBE_READ_REG(&adapter->hw, IXGBE_SRRCTL(index));