UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2010-03-22 14:07:46 +00:00 committed by David S. Miller
parent 411f557c3a
commit 52a1dd4d15
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/igb/igb_main.c
View File

@ -6137,19 +6137,23 @@ static void igb_vmm_control(struct igb_adapter *adapter)
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
u32 reg; u32 reg;
/* replication is not supported for 82575 */ switch (hw->mac.type) {
if (hw->mac.type == e1000_82575) case e1000_82575:
default:
/* replication is not supported for 82575 */
return; return;
case e1000_82576:
/* enable replication vlan tag stripping */ /* notify HW that the MAC is adding vlan tags */
reg = rd32(E1000_RPLOLR); reg = rd32(E1000_DTXCTL);
reg |= E1000_RPLOLR_STRVLAN; reg |= E1000_DTXCTL_VLAN_ADDED;
wr32(E1000_RPLOLR, reg); wr32(E1000_DTXCTL, reg);
case e1000_82580:
/* notify HW that the MAC is adding vlan tags */ /* enable replication vlan tag stripping */
reg = rd32(E1000_DTXCTL); reg = rd32(E1000_RPLOLR);
reg |= E1000_DTXCTL_VLAN_ADDED; reg |= E1000_RPLOLR_STRVLAN;
wr32(E1000_DTXCTL, reg); wr32(E1000_RPLOLR, reg);
break;
}
if (adapter->vfs_allocated_count) { if (adapter->vfs_allocated_count) {
igb_vmdq_set_loopback_pf(hw, true); igb_vmdq_set_loopback_pf(hw, true);