From: "Kok, Auke" Signed-off-by: Jesse Brandeburg Signed-off-by: Andrew Morton --- drivers/net/e1000/e1000_ethtool.c | 7 +++++++ drivers/net/e1000/e1000_main.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff -puN drivers/net/e1000/e1000_ethtool.c~e1000-explicitly-power-up-the-phy-during-loopback-testing drivers/net/e1000/e1000_ethtool.c --- a/drivers/net/e1000/e1000_ethtool.c~e1000-explicitly-power-up-the-phy-during-loopback-testing +++ a/drivers/net/e1000/e1000_ethtool.c @@ -1590,6 +1590,8 @@ e1000_diag_test_count(struct net_device return E1000_TEST_LEN; } +extern void e1000_power_up_phy(struct e1000_adapter *); + static void e1000_diag_test(struct net_device *netdev, struct ethtool_test *eth_test, uint64_t *data) @@ -1606,6 +1608,8 @@ e1000_diag_test(struct net_device *netde uint8_t forced_speed_duplex = adapter->hw.forced_speed_duplex; uint8_t autoneg = adapter->hw.autoneg; + DPRINTK(HW, INFO, "offline testing starting\n"); + /* Link test performed before hardware reset so autoneg doesn't * interfere with test result */ if (e1000_link_test(adapter, &data[4])) @@ -1629,6 +1633,8 @@ e1000_diag_test(struct net_device *netde eth_test->flags |= ETH_TEST_FL_FAILED; e1000_reset(adapter); + /* make sure the phy is powered up */ + e1000_power_up_phy(adapter); if (e1000_loopback_test(adapter, &data[3])) eth_test->flags |= ETH_TEST_FL_FAILED; @@ -1642,6 +1648,7 @@ e1000_diag_test(struct net_device *netde if (if_running) dev_open(netdev); } else { + DPRINTK(HW, INFO, "online testing starting\n"); /* Online tests */ if (e1000_link_test(adapter, &data[4])) eth_test->flags |= ETH_TEST_FL_FAILED; diff -puN drivers/net/e1000/e1000_main.c~e1000-explicitly-power-up-the-phy-during-loopback-testing drivers/net/e1000/e1000_main.c --- a/drivers/net/e1000/e1000_main.c~e1000-explicitly-power-up-the-phy-during-loopback-testing +++ a/drivers/net/e1000/e1000_main.c @@ -484,7 +484,7 @@ e1000_up(struct e1000_adapter *adapter) * **/ -static void e1000_power_up_phy(struct e1000_adapter *adapter) +void e1000_power_up_phy(struct e1000_adapter *adapter) { uint16_t mii_reg = 0; _