Re: [Intel-wired-lan] [PATCH] e1000e: continue to init phy even when failed to disable ULP
From: Paul Menzel <hidden>
Date: 2020-06-16 10:20:33
Also in:
intel-wired-lan, lkml
Dear Aaron, Thank you for your patch. (Rant: Some more fallout from the other patch, which nobody reverted.) Am 16.06.20 um 12:05 schrieb Aaron Ma:
After commit "e1000e: disable s0ix entry and exit flows for ME systems", some ThinkPads always failed to disable ulp by ME.
Please add the (short) commit hash from the master branch. s/ulp/ULP/ Please list one ThinkPad as example.
commit "e1000e: Warn if disabling ULP failed" break out of init phy:
1. Please add the closing quote ". 2. Please add the commit hash.
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. Chnage e_warn to e_dbg, in case it confuses.
s/Chnage/Change/ Please leave the level warning, and improve the warning message instead, so a user knows what is going on. Could you please add a `Fixes:` tag and the URL to the bug report?
quoted hunk ↗ jump to hunk
Signed-off-by: Aaron Ma <redacted> --- drivers/net/ethernet/intel/e1000e/ich8lan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index f999cca37a8a..63405819eb83 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c@@ -302,8 +302,7 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw) hw->dev_spec.ich8lan.ulp_state = e1000_ulp_state_unknown; ret_val = e1000_disable_ulp_lpt_lp(hw, true); if (ret_val) { - e_warn("Failed to disable ULP\n"); - goto out; + e_dbg("Failed to disable ULP\n"); } ret_val = hw->phy.ops.acquire(hw);
Kind regards, Paul