]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
igb: use mac loopback for i354 backplane
authorTodd Fujinaka <todd.fujinaka@intel.com>
Thu, 29 May 2014 05:45:15 +0000 (05:45 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 4 Jun 2014 06:57:45 +0000 (23:57 -0700)
We can't know what PHY is to be used for i354 backplane, so use MAC
loopback for ethtool tests.

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>
drivers/net/ethernet/intel/igb/igb_ethtool.c

index d8bbcf1873ca4d76ed953466ffdc6a12ef20a1dc..80e376377c3d40e183a3d27848c4579c3303edb8 100644 (file)
@@ -1665,8 +1665,8 @@ static int igb_setup_loopback_test(struct igb_adapter *adapter)
                (hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) ||
                (hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) ||
                (hw->device_id == E1000_DEV_ID_DH89XXCC_SFP) ||
-               (hw->device_id == E1000_DEV_ID_I354_SGMII)) {
-
+               (hw->device_id == E1000_DEV_ID_I354_SGMII) ||
+               (hw->device_id == E1000_DEV_ID_I354_BACKPLANE_2_5GBPS)) {
                        /* Enable DH89xxCC MPHY for near end loopback */
                        reg = rd32(E1000_MPHY_ADDR_CTL);
                        reg = (reg & E1000_MPHY_ADDR_CTL_OFFSET_MASK) |