From: Aaron Ma <aaron.ma@canonical.com> To: jeffrey.t.kirsher@intel.com, davem@davemloft.net, kuba@kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, vitaly.lifshits@intel.com, kai.heng.feng@canonical.com, sasha.neftin@intel.com Subject: [PATCH] e1000e: continue to init phy even when failed to disable ULP Date: Tue, 16 Jun 2020 18:05:12 +0800 Message-ID: <20200616100512.22512-1-aaron.ma@canonical.com> (raw) After commit "e1000e: disable s0ix entry and exit flows for ME systems", some ThinkPads always failed to disable ulp by ME. commit "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. Chnage e_warn to e_dbg, in case it confuses. Signed-off-by: Aaron Ma <aaron.ma@canonical.com> --- 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); -- 2.26.2
next reply index Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-16 10:05 Aaron Ma [this message] 2020-06-16 10:20 ` [Intel-wired-lan] " Paul Menzel 2020-06-16 10:31 ` Aaron Ma 2020-06-16 11:23 ` Kai-Heng Feng 2020-06-16 11:26 ` Aaron Ma 2020-06-17 11:12 ` [v2][PATCH] " Aaron Ma 2020-06-17 16:28 ` Jakub Kicinski 2020-06-18 6:45 ` [v3][PATCH] " Aaron Ma 2020-06-18 6:54 ` [v4][PATCH] " Aaron Ma 2020-07-28 20:34 ` [Intel-wired-lan] " Brown, Aaron F
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200616100512.22512-1-aaron.ma@canonical.com \ --to=aaron.ma@canonical.com \ --cc=davem@davemloft.net \ --cc=intel-wired-lan@lists.osuosl.org \ --cc=jeffrey.t.kirsher@intel.com \ --cc=kai.heng.feng@canonical.com \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=sasha.neftin@intel.com \ --cc=vitaly.lifshits@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
LKML Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git git clone --mirror https://lore.kernel.org/lkml/9 lkml/git/9.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \ linux-kernel@vger.kernel.org public-inbox-index lkml Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git