aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFujinaka, Todd <todd.fujinaka@intel.com>2013-10-01 07:33:55 -0400
committerDavid S. Miller <davem@davemloft.net>2013-10-01 12:49:49 -0400
commita4e979a27db3eb77e286dbe484e96c0c9c986e83 (patch)
tree40e9f1ca38b25b8b8084a18fd9c685b03c1aface
parentb4640030ec987ec29f5f74792c8f5cc8068d1829 (diff)
igb: Add ethtool offline tests for i354
Add the ethtool offline tests for i354 devices. 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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/intel/igb/igb_ethtool.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 48cbc833b051..e4c77c041d37 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -1656,7 +1656,8 @@ static int igb_setup_loopback_test(struct igb_adapter *adapter)
1656 if ((hw->device_id == E1000_DEV_ID_DH89XXCC_SGMII) || 1656 if ((hw->device_id == E1000_DEV_ID_DH89XXCC_SGMII) ||
1657 (hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) || 1657 (hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) ||
1658 (hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) || 1658 (hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) ||
1659 (hw->device_id == E1000_DEV_ID_DH89XXCC_SFP)) { 1659 (hw->device_id == E1000_DEV_ID_DH89XXCC_SFP) ||
1660 (hw->device_id == E1000_DEV_ID_I354_SGMII)) {
1660 1661
1661 /* Enable DH89xxCC MPHY for near end loopback */ 1662 /* Enable DH89xxCC MPHY for near end loopback */
1662 reg = rd32(E1000_MPHY_ADDR_CTL); 1663 reg = rd32(E1000_MPHY_ADDR_CTL);
@@ -1722,7 +1723,8 @@ static void igb_loopback_cleanup(struct igb_adapter *adapter)
1722 if ((hw->device_id == E1000_DEV_ID_DH89XXCC_SGMII) || 1723 if ((hw->device_id == E1000_DEV_ID_DH89XXCC_SGMII) ||
1723 (hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) || 1724 (hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) ||
1724 (hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) || 1725 (hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) ||
1725 (hw->device_id == E1000_DEV_ID_DH89XXCC_SFP)) { 1726 (hw->device_id == E1000_DEV_ID_DH89XXCC_SFP) ||
1727 (hw->device_id == E1000_DEV_ID_I354_SGMII)) {
1726 u32 reg; 1728 u32 reg;
1727 1729
1728 /* Disable near end loopback on DH89xxCC */ 1730 /* Disable near end loopback on DH89xxCC */