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

Commit 52a1dd4d authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: cleanup usage of virtualization registers 



The igb driver was incorrectly attempting to write to registers that do not
exist on 82580 hardware.  This wasn't causing any issues that I can tell,
but it is not recommended behavior either so I have changed this so we are
determining which registers to write to based on mac type.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 411f557c

drivers/net/igb/igb_main.c

+16 −12
Original line number Diff line number Diff line
@@ -6137,19 +6137,23 @@ static void igb_vmm_control(struct igb_adapter *adapter) 
	struct e1000_hw *hw = &adapter->hw;

	u32 reg;



	switch (hw->mac.type) {

	case e1000_82575:

	default:

		/* replication is not supported for 82575 */

	if (hw->mac.type == e1000_82575)

		return;



	/* enable replication vlan tag stripping */

	reg = rd32(E1000_RPLOLR);

	reg |= E1000_RPLOLR_STRVLAN;

	wr32(E1000_RPLOLR, reg);



	case e1000_82576:

		/* notify HW that the MAC is adding vlan tags */

		reg = rd32(E1000_DTXCTL);

		reg |= E1000_DTXCTL_VLAN_ADDED;

		wr32(E1000_DTXCTL, reg);

	case e1000_82580:

		/* enable replication vlan tag stripping */

		reg = rd32(E1000_RPLOLR);

		reg |= E1000_RPLOLR_STRVLAN;

		wr32(E1000_RPLOLR, reg);

		break;

	}



	if (adapter->vfs_allocated_count) {

		igb_vmdq_set_loopback_pf(hw, true);