summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Fujinaka <todd.fujinaka@intel.com>2013-09-17 05:08:48 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-09-27 04:50:38 -0700
commit5aa3a44918db13257ade0bb1caf662f7815de357 (patch)
treecc5f03a0b739bca0045f3efb85dc607e25c0c339
parentf875691640cd3fa67f7ad1d3130ff9fa7fdca042 (diff)
downloadlinux-5aa3a44918db13257ade0bb1caf662f7815de357.tar.gz
linux-5aa3a44918db13257ade0bb1caf662f7815de357.tar.bz2
linux-5aa3a44918db13257ade0bb1caf662f7815de357.zip
igb: Fix ethtool loopback test for 82580 copper
Add back 82580 loopback tests to ethtool. Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/igb/igb_ethtool.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 48cbc833b051..86d51429a189 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -1607,6 +1607,9 @@ static int igb_integrated_phy_loopback(struct igb_adapter *adapter)
igb_write_phy_reg(hw, I347AT4_PAGE_SELECT, 0);
igb_write_phy_reg(hw, PHY_CONTROL, 0x4140);
}
+ } else if (hw->phy.type == e1000_phy_82580) {
+ /* enable MII loopback */
+ igb_write_phy_reg(hw, I82580_PHY_LBK_CTRL, 0x8041);
}
/* add small delay to avoid loopback test failure */