Skip to content

Commit 1050242

Browse files
pyma1anguy11
authored andcommitted
e1000e: continue to init PHY even when failed to disable ULP
After 'commit e086ba2 ("e1000e: disable s0ix entry and exit flows for ME systems")', ThinkPad P14s always failed to disable ULP by ME. 'commit 0c80cdb ("e1000e: Warn if disabling ULP failed")' break out of init phy: error log: [ 42.364753] e1000e 0000:00:1f.6 enp0s31f6: Failed to disable ULP [ 42.524626] e1000e 0000:00:1f.6 enp0s31f6: PHY Wakeup cause - Unicast Packet [ 42.822476] e1000e 0000:00:1f.6 enp0s31f6: Hardware Error When disable s0ix, E1000_FWSM_ULP_CFG_DONE will never be 1. If continue to init phy like before, it can work as before. iperf test result good too. Fixes: 0c80cdb ("e1000e: Warn if disabling ULP failed") Signed-off-by: Aaron Ma <[email protected]> Tested-by: Aaron Brown <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent 27a2145 commit 1050242

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/net/ethernet/intel/e1000e/ich8lan.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,8 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
301301
*/
302302
hw->dev_spec.ich8lan.ulp_state = e1000_ulp_state_unknown;
303303
ret_val = e1000_disable_ulp_lpt_lp(hw, true);
304-
if (ret_val) {
304+
if (ret_val)
305305
e_warn("Failed to disable ULP\n");
306-
goto out;
307-
}
308306

309307
ret_val = hw->phy.ops.acquire(hw);
310308
if (ret_val) {

0 commit comments

Comments
 (0)