diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-07 13:25:32 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-07 13:32:55 +0100 |
| commit | fb72952d5b63e40f63bfa1e3a5bce2262c424197 (patch) | |
| tree | d1a9bf30437653b57b398fd3b4f3fb4897ca29cd /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | |
| parent | b9488a288ec844af97a516ac9ffe441221f6e67d (diff) | |
| parent | 3422e04a2e31dba3e17af206f160d4fc409f4250 (diff) | |
| download | kernel-fb72952d5b63e40f63bfa1e3a5bce2262c424197.tar.gz kernel-fb72952d5b63e40f63bfa1e3a5bce2262c424197.tar.xz kernel-fb72952d5b63e40f63bfa1e3a5bce2262c424197.zip | |
:merge origin/stabilization and update to 5.10.4kernel-5.11.4-125.vanilla.1.fc33kernel-5.11.4-125.vanilla.1.fc32
Diffstat (limited to '0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch')
| -rw-r--r-- | 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch deleted file mode 100644 index 150ddd76f..000000000 --- a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aaron Ma <aaron.ma@canonical.com> -Date: Tue, 24 Mar 2020 03:16:39 +0800 -Subject: [PATCH] e1000e: bump up timeout to wait when ME un-configure ULP mode - -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 b2f2fcfdf732..a9e4c059d402 100644 ---- a/drivers/net/ethernet/intel/e1000e/ich8lan.c -+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c -@@ -1245,9 +1245,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.28.0 - |