diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2011-12-16 00:46:49 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-01-26 18:29:08 -0800 |
| commit | 464c85e37e6b2d2ad4f3bea23a59408c5595db15 (patch) | |
| tree | 542292cb0bf432b637c6db84ac9bcb558635ec11 /drivers | |
| parent | 7f1557e1422a4cc842af641c6716714751c06865 (diff) | |
| download | linux-3.10-464c85e37e6b2d2ad4f3bea23a59408c5595db15.tar.gz linux-3.10-464c85e37e6b2d2ad4f3bea23a59408c5595db15.tar.bz2 linux-3.10-464c85e37e6b2d2ad4f3bea23a59408c5595db15.zip | |
e1000e: conditionally restart autoneg on 82577/8/9 when setting LPLU state
When setting the Low Power Link Up (LPLU, a.k.a. reverse auto-negotiation)
on 82577/8278/82579, do not restart auto-negotiation if reset of the Phy is
blocked by the Manageability Engine.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index d99548ce4da..6a6e6f6d9e7 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -1921,7 +1921,9 @@ static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active) else oem_reg &= ~HV_OEM_BITS_LPLU; - oem_reg |= HV_OEM_BITS_RESTART_AN; + if (!e1000_check_reset_block(hw)) + oem_reg |= HV_OEM_BITS_RESTART_AN; + ret_val = e1e_wphy(hw, HV_OEM_BITS, oem_reg); out: |