Skip to contentSkip to conversation

ixgbe: Fix misuse of word as register offset instead of offset in register array

PATCH New Alexander Duyck 2 participants 2 messages Dec 23, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ixgbe: Fix misuse of word as register offset instead of offset in register array

When I had rewritten the code for ixgbe_clear_vf_vlans() it looks like I had transitioned back and forth between using word as an offset and using word as a register offset. As a result I honestly don't see how the code was working before other than the fact that resetting the VLANs on the VF like didn't do much to clear them.

I have updated the code so that word represents the offset in the array. This way we can use the modulus and xor operations and they will make sense instead of being performed on a 4 byte aligned value.

I replaced the statement "(word % 2) ^ 1" with "~word % 2" in order to reduce the line length as the line exceeded 80 characters with the register name inserted. The two should be equivalent so the change should be safe.

---
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +3 -3
index eeff3d075bf8..009ba2e21687 100644
@@ -593,11 +593,11 @@ static void ixgbe_clear_vf_vlans(struct ixgbe_adapter *adapter, u32 vf)
 
 	/* post increment loop, covers VLVF_ENTRIES - 1 to 0 */
 	for (i = IXGBE_VLVF_ENTRIES; i--;) {
-		u32 word = IXGBE_VLVFB(i * 2 + vf / 32);
 		u32 bits[2], vlvfb, vid, vfta, vlvf;
+		u32 word = i * 2 + vf / 32;
 		u32 mask = 1 << (vf / 32);
 
-		vlvfb = IXGBE_READ_REG(hw, word);
+		vlvfb = IXGBE_READ_REG(hw, IXGBE_VLVFB(word));
 
 		/* if our bit isn't set we can skip it */
 		if (!(vlvfb & mask))
@@ -608,7 +608,7 @@ static void ixgbe_clear_vf_vlans(struct ixgbe_adapter *adapter, u32 vf)
 
 		/* create 64b mask to chedk to see if we should clear VLVF */
 		bits[word % 2] = vlvfb;
-		bits[(word % 2) ^ 1] = IXGBE_READ_REG(hw, word ^ 1);
+		bits[~word % 2] = IXGBE_READ_REG(hw, IXGBE_VLVFB(word ^ 1));
 
 		/* if promisc is enabled, PF will be present, leave VFTA */
 		if (adapter->flags2 & IXGBE_FLAG2_VLAN_PROMISC) {
#1 lore raw

PATCH 1/1 ixgbe: Fix misuse of word as register offset instead of offset in register array

Quoted 25 lines · Alexander Duyck

When I had rewritten the code for ixgbe_clear_vf_vlans() it looks like I had transitioned back and forth between using word as an offset and using word as a register offset. As a result I honestly don't see how the code was working before other than the fact that resetting the VLANs on the VF like didn't do much to clear them.

I have updated the code so that word represents the offset in the array. This way we can use the modulus and xor operations and they will make sense instead of being performed on a 4 byte aligned value.

I replaced the statement "(word % 2) ^ 1" with "~word % 2" in order to reduce the line length as the line exceeded 80 characters with the register name inserted. The two should be equivalent so the change should be safe.

---
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +0 -0
index eeff3d075bf8..009ba2e21687 100644

drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c static void ixgbe_clear_vf_vlans(struct ixgbe_adapter *adapter, u32 vf) · line 598

Quoted 7 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +1 -1
@@ -593,11 +593,11 @@ static void ixgbe_clear_vf_vlans(struct ixgbe_adapter *adapter, u32 vf)
 
        /* post increment loop, covers VLVF_ENTRIES - 1 to 0 */
        for (i = IXGBE_VLVF_ENTRIES; i--;) {
-               u32 word = IXGBE_VLVFB(i * 2 + vf / 32);
                u32 bits[2], vlvfb, vid, vfta, vlvf;
+               u32 word = i * 2 + vf / 32;
                u32 mask = 1 << (vf / 32);

I'll need to submit a v2 for this. It turns out the mask is wrong as well. That should be a % 32, not a / 32 used.

Quoted 15 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +2 -2
-               vlvfb = IXGBE_READ_REG(hw, word);
+               vlvfb = IXGBE_READ_REG(hw, IXGBE_VLVFB(word));
 
                /* if our bit isn't set we can skip it */
                if (!(vlvfb & mask))
@@ -608,7 +608,7 @@ static void ixgbe_clear_vf_vlans(struct ixgbe_adapter *adapter, u32 vf)
 
                /* create 64b mask to chedk to see if we should clear VLVF */
                bits[word % 2] = vlvfb;
-               bits[(word % 2) ^ 1] = IXGBE_READ_REG(hw, word ^ 1);
+               bits[~word % 2] = IXGBE_READ_REG(hw, IXGBE_VLVFB(word ^ 1));
 
                /* if promisc is enabled, PF will be present, leave VFTA */
                if (adapter->flags2 & IXGBE_FLAG2_VLAN_PROMISC) {