| Message ID | 20201214192935.895174-3-mario.limonciello@dell.com |
|---|---|
| State | Accepted |
| Delegated to: | Anthony Nguyen |
| Headers | show |
| Series | Improve s0ix flows for systems i219LM | expand |
Hi, On 12/14/20 8:29 PM, Mario Limonciello wrote: > Per guidance from Intel ethernet architecture team, it may take > up to 1 second for unconfiguring ULP mode. > > However in practice this seems to be taking up to 2 seconds on > some Lenovo machines. Detect scenarios that take more than 1 second > but less than 2.5 seconds and emit a warning on resume for those > scenarios. > > Suggested-by: Aaron Ma <aaron.ma@canonical.com> > Suggested-by: Sasha Netfin <sasha.neftin@intel.com> > Suggested-by: Hans de Goede <hdegoede@redhat.com> > CC: Mark Pearson <markpearson@lenovo.com> > Fixes: f15bb6dde738cc8fa0 ("e1000e: Add support for S0ix") > BugLink: https://bugs.launchpad.net/bugs/1865570 > Link: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200323191639.48826-1-aaron.ma@canonical.com/ > Link: https://lkml.org/lkml/2020/12/13/15 > Link: https://lkml.org/lkml/2020/12/14/708 > Signed-off-by: Mario Limonciello <mario.limonciello@dell.com> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > drivers/net/ethernet/intel/e1000e/ich8lan.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c > index 9aa6fad8ed47..fdf23d20c954 100644 > --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c > +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c > @@ -1240,6 +1240,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) > return 0; > > if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) { > + struct e1000_adapter *adapter = hw->adapter; > + bool firmware_bug = false; > + > if (force) { > /* Request ME un-configure ULP mode in the PHY */ > mac_reg = er32(H2ME); > @@ -1248,16 +1251,23 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) > ew32(H2ME, mac_reg); > } > > - /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */ > + /* Poll up to 2.5 seconds for ME to clear ULP_CFG_DONE. > + * If this takes more than 1 second, show a warning indicating a firmware > + * bug */ > while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) { > - if (i++ == 30) { > + if (i++ == 250) { > ret_val = -E1000_ERR_PHY; > goto out; > } > + if (i > 100 && !firmware_bug) > + firmware_bug = true; > > usleep_range(10000, 11000); > } > - e_dbg("ULP_CONFIG_DONE cleared after %dmsec\n", i * 10); > + if (firmware_bug) > + e_warn("ULP_CONFIG_DONE took %dmsec. This is a firmware bug\n", i * 10); > + else > + e_dbg("ULP_CONFIG_DONE cleared after %dmsec\n", i * 10); > > if (force) { > mac_reg = er32(H2ME); >
> -----Original Message----- > From: Limonciello, Mario <Mario_Limonciello@Dell.com> > Sent: Tuesday, December 15, 2020 3:30 AM > To: Jeff Kirsher; Tony Nguyen; intel-wired-lan@lists.osuosl.org > Cc: linux-kernel@vger.kernel.org; Netdev; Alexander Duyck; Jakub Kicinski; > Sasha Netfin; Aaron Brown; Stefan Assmann; David Miller; > darcari@redhat.com; Shen, Yijun; Yuan, Perry; > anthony.wong@canonical.com; Hans de Goede; Limonciello, Mario; Aaron > Ma; Mark Pearson > Subject: [PATCH v5 2/4] e1000e: bump up timeout to wait when ME un- > configures ULP mode > > Per guidance from Intel ethernet architecture team, it may take up to 1 > second for unconfiguring ULP mode. > > However in practice this seems to be taking up to 2 seconds on some Lenovo > machines. Detect scenarios that take more than 1 second but less than 2.5 > seconds and emit a warning on resume for those scenarios. > > Suggested-by: Aaron Ma <aaron.ma@canonical.com> > Suggested-by: Sasha Netfin <sasha.neftin@intel.com> > Suggested-by: Hans de Goede <hdegoede@redhat.com> > CC: Mark Pearson <markpearson@lenovo.com> > Fixes: f15bb6dde738cc8fa0 ("e1000e: Add support for S0ix") > BugLink: https://bugs.launchpad.net/bugs/1865570 > Link: https://patchwork.ozlabs.org/project/intel-wired- > lan/patch/20200323191639.48826-1-aaron.ma@canonical.com/ > Link: https://lkml.org/lkml/2020/12/13/15 > Link: https://lkml.org/lkml/2020/12/14/708 > Signed-off-by: Mario Limonciello <mario.limonciello@dell.com> Verified this series patches with Dell Systems. Tested-By: Yijun Shen <Yijun.shen@dell.com> > --- > drivers/net/ethernet/intel/e1000e/ich8lan.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c > b/drivers/net/ethernet/intel/e1000e/ich8lan.c > index 9aa6fad8ed47..fdf23d20c954 100644 > --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c > +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c > @@ -1240,6 +1240,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct > e1000_hw *hw, bool force) > return 0; > > if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) { > + struct e1000_adapter *adapter = hw->adapter; > + bool firmware_bug = false; > + > if (force) { > /* Request ME un-configure ULP mode in the PHY */ > mac_reg = er32(H2ME); > @@ -1248,16 +1251,23 @@ static s32 e1000_disable_ulp_lpt_lp(struct > e1000_hw *hw, bool force) > ew32(H2ME, mac_reg); > } > > - /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */ > + /* Poll up to 2.5 seconds for ME to clear ULP_CFG_DONE. > + * If this takes more than 1 second, show a warning indicating > a firmware > + * bug */ > while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) { > - if (i++ == 30) { > + if (i++ == 250) { > ret_val = -E1000_ERR_PHY; > goto out; > } > + if (i > 100 && !firmware_bug) > + firmware_bug = true; > > usleep_range(10000, 11000); > } > - e_dbg("ULP_CONFIG_DONE cleared after %dmsec\n", i * 10); > + if (firmware_bug) > + e_warn("ULP_CONFIG_DONE took %dmsec. This is a > firmware bug\n", i * 10); > + else > + e_dbg("ULP_CONFIG_DONE cleared after %dmsec\n", > i * 10); > > if (force) { > mac_reg = er32(H2ME); > -- > 2.25.1
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index 9aa6fad8ed47..fdf23d20c954 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -1240,6 +1240,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) return 0; if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) { + struct e1000_adapter *adapter = hw->adapter; + bool firmware_bug = false; + if (force) { /* Request ME un-configure ULP mode in the PHY */ mac_reg = er32(H2ME); @@ -1248,16 +1251,23 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) ew32(H2ME, mac_reg); } - /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */ + /* Poll up to 2.5 seconds for ME to clear ULP_CFG_DONE. + * If this takes more than 1 second, show a warning indicating a firmware + * bug */ while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) { - if (i++ == 30) { + if (i++ == 250) { ret_val = -E1000_ERR_PHY; goto out; } + if (i > 100 && !firmware_bug) + firmware_bug = true; usleep_range(10000, 11000); } - e_dbg("ULP_CONFIG_DONE cleared after %dmsec\n", i * 10); + if (firmware_bug) + e_warn("ULP_CONFIG_DONE took %dmsec. This is a firmware bug\n", i * 10); + else + e_dbg("ULP_CONFIG_DONE cleared after %dmsec\n", i * 10); if (force) { mac_reg = er32(H2ME);
Per guidance from Intel ethernet architecture team, it may take up to 1 second for unconfiguring ULP mode. However in practice this seems to be taking up to 2 seconds on some Lenovo machines. Detect scenarios that take more than 1 second but less than 2.5 seconds and emit a warning on resume for those scenarios. Suggested-by: Aaron Ma <aaron.ma@canonical.com> Suggested-by: Sasha Netfin <sasha.neftin@intel.com> Suggested-by: Hans de Goede <hdegoede@redhat.com> CC: Mark Pearson <markpearson@lenovo.com> Fixes: f15bb6dde738cc8fa0 ("e1000e: Add support for S0ix") BugLink: https://bugs.launchpad.net/bugs/1865570 Link: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200323191639.48826-1-aaron.ma@canonical.com/ Link: https://lkml.org/lkml/2020/12/13/15 Link: https://lkml.org/lkml/2020/12/14/708 Signed-off-by: Mario Limonciello <mario.limonciello@dell.com> --- drivers/net/ethernet/intel/e1000e/ich8lan.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)