e1000: Explicitly power up the PHY during loopback testing.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
This commit is contained in:
parent
673a052fde
commit
d658266ed6
2 changed files with 8 additions and 1 deletions
|
@ -1590,6 +1590,8 @@ e1000_diag_test_count(struct net_device *netdev)
|
||||||
return E1000_TEST_LEN;
|
return E1000_TEST_LEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern void e1000_power_up_phy(struct e1000_adapter *);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
e1000_diag_test(struct net_device *netdev,
|
e1000_diag_test(struct net_device *netdev,
|
||||||
struct ethtool_test *eth_test, uint64_t *data)
|
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 forced_speed_duplex = adapter->hw.forced_speed_duplex;
|
||||||
uint8_t autoneg = adapter->hw.autoneg;
|
uint8_t autoneg = adapter->hw.autoneg;
|
||||||
|
|
||||||
|
DPRINTK(HW, INFO, "offline testing starting\n");
|
||||||
|
|
||||||
/* Link test performed before hardware reset so autoneg doesn't
|
/* Link test performed before hardware reset so autoneg doesn't
|
||||||
* interfere with test result */
|
* interfere with test result */
|
||||||
if (e1000_link_test(adapter, &data[4]))
|
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;
|
eth_test->flags |= ETH_TEST_FL_FAILED;
|
||||||
|
|
||||||
e1000_reset(adapter);
|
e1000_reset(adapter);
|
||||||
|
/* make sure the phy is powered up */
|
||||||
|
e1000_power_up_phy(adapter);
|
||||||
if (e1000_loopback_test(adapter, &data[3]))
|
if (e1000_loopback_test(adapter, &data[3]))
|
||||||
eth_test->flags |= ETH_TEST_FL_FAILED;
|
eth_test->flags |= ETH_TEST_FL_FAILED;
|
||||||
|
|
||||||
|
@ -1642,6 +1648,7 @@ e1000_diag_test(struct net_device *netdev,
|
||||||
if (if_running)
|
if (if_running)
|
||||||
dev_open(netdev);
|
dev_open(netdev);
|
||||||
} else {
|
} else {
|
||||||
|
DPRINTK(HW, INFO, "online testing starting\n");
|
||||||
/* Online tests */
|
/* Online tests */
|
||||||
if (e1000_link_test(adapter, &data[4]))
|
if (e1000_link_test(adapter, &data[4]))
|
||||||
eth_test->flags |= ETH_TEST_FL_FAILED;
|
eth_test->flags |= ETH_TEST_FL_FAILED;
|
||||||
|
|
|
@ -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;
|
uint16_t mii_reg = 0;
|
||||||
|
|
||||||
|
|
Reference in a new issue