Commit d658266e authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Auke Kok
Browse files

e1000: Explicitly power up the PHY during loopback testing. 



Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent 673a052f

drivers/net/e1000/e1000_ethtool.c

+7 −0
Original line number Diff line number Diff line
@@ -1590,6 +1590,8 @@ e1000_diag_test_count(struct net_device *netdev) 
	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 *netdev, 
		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 *netdev, 
			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 *netdev, 
		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;

drivers/net/e1000/e1000_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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;