e1000e: Fix for offline diag test failure at first call
Subsystems (2)
PATCH 1/1 e1000e: Fix for offline diag test failure at first call
From: Carolyn Wyborny <[email protected]>
Move link test call to later in the offline sequence, move the restore settings block to afterwards and add another reset to ensure the hardware is in a known state afterwards.
Signed-off-by Carolyn Wyborny <[email protected]>
Acked-by Bruce Allan <[email protected]>
Tested-by Jeff Pieper <[email protected]>
Signed-off-by Jeff Kirsher <[email protected]>
---
drivers/net/e1000e/ethtool.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-)
drivers/net/e1000e/ethtool.c +8 -11
@@ -1717,13 +1717,6 @@ static void e1000_diag_test(struct net_device *netdev,e_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 ])) - eth_test->flags |=ETH_TEST_FL_FAILED ; -if (if_running)/* indicate we're in test mode */ dev_close (netdev);
@@ -1747,15 +1740,19 @@ static void e1000_diag_test(struct net_device *netdev,if (e1000_loopback_test (adapter, &data[3 ])) eth_test->flags |=ETH_TEST_FL_FAILED ; +/* force this routine to wait until autoneg complete/timeout */ + adapter->hw.phy.autoneg_wait_to_complete =1 ; +e1000e_reset (adapter); + adapter->hw.phy.autoneg_wait_to_complete =0 ; + +if (e1000_link_test (adapter, &data[4 ])) + eth_test->flags |=ETH_TEST_FL_FAILED ; +/* restore speed, duplex, autoneg settings */ adapter->hw.phy.autoneg_advertised = autoneg_advertised; adapter->hw.mac.forced_speed_duplex = forced_speed_duplex; adapter->hw.mac.autoneg = autoneg; - -/* force this routine to wait until autoneg complete/timeout */ - adapter->hw.phy.autoneg_wait_to_complete =1 ;e1000e_reset (adapter); - adapter->hw.phy.autoneg_wait_to_complete =0 ;clear_bit (__E1000_TESTING, &adapter->state);if (if_running)
From: Jeff Kirsher <[email protected]>
Date: Fri, 15 Oct 2010 20:35:31 -0700
Quoted 10 lines
From: Carolyn Wyborny <[email protected]>
Move link test call to later in the offline sequence, move the restore settings block to afterwards and add another reset to ensure the hardware is in a known state afterwards.
Signed-off-by Carolyn Wyborny <[email protected]>Acked-by Bruce Allan <[email protected]>Tested-by Jeff Pieper <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.