e1000e: do not initiate autonegotiation during OEM configuration
Subsystems (2)
PATCH 1/1 e1000e: do not initiate autonegotiation during OEM configuration
From: Bruce Allan <[email protected]>
When configuring the OEM bits in the PHY on 82577/82578, do not restart autonegotiation if the firmware is blocking it (e.g. when an IDE-R session is active) because the link must not go down.
Signed-off-by Bruce Allan <[email protected]>
Signed-off-by Jeff Kirsher <[email protected]>
---
drivers/net/e1000e/ich8lan.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/e1000e/ich8lan.c +2 -1
@@ -1118,7 +1118,8 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state) oem_reg |=HV_OEM_BITS_LPLU ; }/* Restart auto-neg to activate the bits */ - oem_reg |=HV_OEM_BITS_RESTART_AN ; +if (!e1000_check_reset_block (hw)) + oem_reg |=HV_OEM_BITS_RESTART_AN ; ret_val = hw->phy.ops.write_phy_reg_locked (hw,HV_OEM_BITS , oem_reg); out:
From: Jeff Kirsher <[email protected]>
Date: Thu, 19 Nov 2009 16:17:30 -0800
Quoted 8 lines
From: Bruce Allan <[email protected]>
When configuring the OEM bits in the PHY on 82577/82578, do not restart autonegotiation if the firmware is blocking it (e.g. when an IDE-R session is active) because the link must not go down.
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.