All of lore.kernel.org
 help / color / mirror / Atom feed
From: Aaron Ma <aaron.ma@canonical.com>
To: jeffrey.t.kirsher@intel.com, aaron.ma@canonical.com,
	davem@davemloft.net, intel-wired-lan@lists.osuosl.org,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	sasha.neftin@intel.com
Subject: [PATCH] e1000e: bump up timeout to wait when ME un-configure ULP mode
Date: Tue, 24 Mar 2020 03:16:39 +0800	[thread overview]
Message-ID: <20200323191639.48826-1-aaron.ma@canonical.com> (raw)

ME takes 2+ seconds to un-configure ULP mode done after resume
from s2idle on some ThinkPad laptops.
Without enough wait, reset and re-init will fail with error.

Fixes: f15bb6dde738cc8fa0 ("e1000e: Add support for S0ix")
BugLink: https://bugs.launchpad.net/bugs/1865570
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
---
 drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index b4135c50e905..147b15a2f8b3 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1240,9 +1240,9 @@ 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.5sec for ME to clear ULP_CFG_DONE. */
 		while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) {
-			if (i++ == 30) {
+			if (i++ == 250) {
 				ret_val = -E1000_ERR_PHY;
 				goto out;
 			}
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: Aaron Ma <aaron.ma@canonical.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH] e1000e: bump up timeout to wait when ME un-configure ULP mode
Date: Tue, 24 Mar 2020 03:16:39 +0800	[thread overview]
Message-ID: <20200323191639.48826-1-aaron.ma@canonical.com> (raw)

ME takes 2+ seconds to un-configure ULP mode done after resume
from s2idle on some ThinkPad laptops.
Without enough wait, reset and re-init will fail with error.

Fixes: f15bb6dde738cc8fa0 ("e1000e: Add support for S0ix")
BugLink: https://bugs.launchpad.net/bugs/1865570
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
---
 drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index b4135c50e905..147b15a2f8b3 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1240,9 +1240,9 @@ 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.5sec for ME to clear ULP_CFG_DONE. */
 		while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) {
-			if (i++ == 30) {
+			if (i++ == 250) {
 				ret_val = -E1000_ERR_PHY;
 				goto out;
 			}
-- 
2.17.1


             reply	other threads:[~2020-03-23 19:17 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-23 19:16 Aaron Ma [this message]
2020-03-23 19:16 ` [Intel-wired-lan] [PATCH] e1000e: bump up timeout to wait when ME un-configure ULP mode Aaron Ma
2020-03-25  4:17 ` Kai-Heng Feng
2020-03-25  4:17   ` [Intel-wired-lan] " Kai-Heng Feng
2020-03-25  6:36   ` Neftin, Sasha
2020-03-25  6:36     ` [Intel-wired-lan] " Neftin, Sasha
2020-03-25  6:39     ` Kai-Heng Feng
2020-03-25  6:39       ` [Intel-wired-lan] " Kai-Heng Feng
2020-03-25  6:42       ` Tsai, Rex
2020-03-25  6:42         ` [Intel-wired-lan] " Tsai, Rex
2020-03-25  6:49         ` Aaron Ma
2020-03-25  6:49           ` [Intel-wired-lan] " Aaron Ma
2020-03-25  6:43     ` Aaron Ma
2020-03-25  6:43       ` [Intel-wired-lan] " Aaron Ma
2020-03-25 13:58       ` Neftin, Sasha
2020-03-25 13:58         ` [Intel-wired-lan] " Neftin, Sasha
2020-03-25 14:07         ` Aaron Ma
2020-03-25 14:07           ` [Intel-wired-lan] " Aaron Ma
2020-03-25 15:49         ` Paul Menzel
2020-03-25 15:49           ` Paul Menzel
2020-03-26 11:29           ` Kai-Heng Feng
2020-03-26 11:29             ` Kai-Heng Feng
2020-03-26 11:41             ` Paul Menzel
2020-03-26 11:41               ` Paul Menzel
2020-03-26 14:34               ` Neftin, Sasha
2020-03-26 18:37                 ` Paul Menzel
2020-03-28 10:55             ` David Laight
2020-03-28 10:55               ` David Laight
2020-04-02 12:31 ` Hans de Goede
2020-04-02 12:31   ` Hans de Goede
2020-04-03  3:15   ` Aaron Ma
2020-04-03  3:15     ` Aaron Ma
2020-04-03  7:37     ` Paul Menzel
2020-04-03  7:37       ` Paul Menzel
2020-04-05  6:46     ` Neftin, Sasha
2020-04-05  6:46       ` Neftin, Sasha

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=20200323191639.48826-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=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sasha.neftin@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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.