]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
UBUNTU: SAUCE: e1000e: bump up timeout to wait when ME un-configure ULP mode
authorAaron Ma <aaron.ma@canonical.com>
Thu, 2 Apr 2020 04:22:28 +0000 (12:22 +0800)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 15 Dec 2020 08:17:53 +0000 (09:17 +0100)
commitb97a9ad57d72cd17b36f7bf819b532e2a1a4be5e
tree746facc12aa95953fbe19917473a8e2562d967f1
parent6a670fcfcece706c6c51986eecf983ce377febb0
UBUNTU: SAUCE: e1000e: bump up timeout to wait when ME un-configure ULP mode

BugLink: https://bugs.launchpad.net/bugs/1865570
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>
(cherry picked from commit 29ae4ba09c15869dd3dc9b76f92d9d6d50249885
 https://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git dev-queue)
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
drivers/net/ethernet/intel/e1000e/ich8lan.c