Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f60439bc authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Force VLNCTRL.VFE to be set in all VMDq paths 



When I was adding the code for enabling VLAN promiscuous mode with SR-IOV
enabled I had inadvertently left the VLNCTRL.VFE bit unchanged as I has
assumed there was code in another path that was setting it when we enabled
SR-IOV.  This wasn't the case and as a result we were just disabling VLAN
filtering for all the VFs apparently.

Also the previous patches were always clearing CFIEN which was always set
to 0 by the hardware anyway so I am dropping the redundant bit clearing.

Fixes: 16369564 ("ixgbe: Add support for VLAN promiscuous with SR-IOV")
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8037dd60

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+12 −6
Original line number Diff line number Diff line
@@ -4100,6 +4100,8 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter) 
	struct ixgbe_hw *hw = &adapter->hw;

	u32 vlnctrl, i;



	vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);



	switch (hw->mac.type) {

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:
@@ -4112,8 +4114,7 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter) 
		/* fall through */

	case ixgbe_mac_82598EB:

		/* legacy case, we can just disable VLAN filtering */

		vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);

		vlnctrl &= ~(IXGBE_VLNCTRL_VFE | IXGBE_VLNCTRL_CFIEN);

		vlnctrl &= ~IXGBE_VLNCTRL_VFE;

		IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);

		return;

	}
@@ -4125,6 +4126,10 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter) 
	/* Set flag so we don't redo unnecessary work */

	adapter->flags2 |= IXGBE_FLAG2_VLAN_PROMISC;



	/* For VMDq and SR-IOV we must leave VLAN filtering enabled */

	vlnctrl |= IXGBE_VLNCTRL_VFE;

	IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);



	/* Add PF to all active pools */

	for (i = IXGBE_VLVF_ENTRIES; --i;) {

		u32 reg_offset = IXGBE_VLVFB(i * 2 + VMDQ_P(0) / 32);
@@ -4191,6 +4196,11 @@ static void ixgbe_vlan_promisc_disable(struct ixgbe_adapter *adapter) 
	struct ixgbe_hw *hw = &adapter->hw;

	u32 vlnctrl, i;



	/* Set VLAN filtering to enabled */

	vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);

	vlnctrl |= IXGBE_VLNCTRL_VFE;

	IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);



	switch (hw->mac.type) {

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540:
@@ -4202,10 +4212,6 @@ static void ixgbe_vlan_promisc_disable(struct ixgbe_adapter *adapter) 
			break;

		/* fall through */

	case ixgbe_mac_82598EB:

		vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);

		vlnctrl &= ~IXGBE_VLNCTRL_CFIEN;

		vlnctrl |= IXGBE_VLNCTRL_VFE;

		IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);

		return;

	}