Add patch fixing Lenovo X1 7th and 8th gen not suspending (rhbz 1816621)

2 files changed, 119 insertions, 0 deletions

diff --git a/e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch b/e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch
new file mode 100644
index 000000000..921228c2b
--- /dev/null
+++ b/e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch
@@ -0,0 +1,112 @@
+From patchwork Mon Mar 23 19:16:39 2020
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Aaron Ma <aaron.ma@canonical.com>
+X-Patchwork-Id: 1260523
+X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com
+Return-Path: <intel-wired-lan-bounces@osuosl.org>
+X-Original-To: incoming@patchwork.ozlabs.org
+Delivered-To: patchwork-incoming@bilbo.ozlabs.org
+Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized)
+ smtp.mailfrom=osuosl.org (client-ip=140.211.166.137;
+ helo=fraxinus.osuosl.org;
+ envelope-from=intel-wired-lan-bounces@osuosl.org;
+ receiver=<UNKNOWN>)
+Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none)
+ header.from=canonical.com
+Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])
+ (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
+ bits)) (No client certificate requested)
+ by ozlabs.org (Postfix) with ESMTPS id 48ml8T0lZVz9sRf
+ for <incoming@patchwork.ozlabs.org>;
+ Tue, 24 Mar 2020 19:41:11 +1100 (AEDT)
+Received: from localhost (localhost [127.0.0.1])
+ by fraxinus.osuosl.org (Postfix) with ESMTP id 3FD71861C9;
+ Tue, 24 Mar 2020 08:41:10 +0000 (UTC)
+X-Virus-Scanned: amavisd-new at osuosl.org
+Received: from fraxinus.osuosl.org ([127.0.0.1])
+ by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id Z-iCoXjZ6uPi; Tue, 24 Mar 2020 08:41:09 +0000 (UTC)
+Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34])
+ by fraxinus.osuosl.org (Postfix) with ESMTP id 9184E860D1;
+ Tue, 24 Mar 2020 08:41:09 +0000 (UTC)
+X-Original-To: intel-wired-lan@lists.osuosl.org
+Delivered-To: intel-wired-lan@lists.osuosl.org
+Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])
+ by ash.osuosl.org (Postfix) with ESMTP id 522811BF2B6
+ for <intel-wired-lan@lists.osuosl.org>;
+ Mon, 23 Mar 2020 19:17:15 +0000 (UTC)
+Received: from localhost (localhost [127.0.0.1])
+ by whitealder.osuosl.org (Postfix) with ESMTP id 4BD3187D15
+ for <intel-wired-lan@lists.osuosl.org>;
+ Mon, 23 Mar 2020 19:17:15 +0000 (UTC)
+X-Virus-Scanned: amavisd-new at osuosl.org
+Received: from whitealder.osuosl.org ([127.0.0.1])
+ by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id Cyxj7lfnvPR6 for <intel-wired-lan@lists.osuosl.org>;
+ Mon, 23 Mar 2020 19:17:12 +0000 (UTC)
+X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6
+Received: from youngberry.canonical.com (youngberry.canonical.com
+ [91.189.89.112])
+ by whitealder.osuosl.org (Postfix) with ESMTP id 68B4087EBD
+ for <intel-wired-lan@lists.osuosl.org>;
+ Mon, 23 Mar 2020 19:17:12 +0000 (UTC)
+Received: from [222.129.50.174] (helo=localhost.localdomain)
+ by youngberry.canonical.com with esmtpsa
+ (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2)
+ (envelope-from <aaron.ma@canonical.com>)
+ id 1jGSZN-00031K-JS; Mon, 23 Mar 2020 19:17:06 +0000
+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
+Date: Tue, 24 Mar 2020 03:16:39 +0800
+Message-Id: <20200323191639.48826-1-aaron.ma@canonical.com>
+X-Mailer: git-send-email 2.25.2
+MIME-Version: 1.0
+X-Mailman-Approved-At: Tue, 24 Mar 2020 08:41:05 +0000
+Subject: [Intel-wired-lan] [PATCH] e1000e: bump up timeout to wait when ME
+ un-configure ULP mode
+X-BeenThere: intel-wired-lan@osuosl.org
+X-Mailman-Version: 2.1.29
+Precedence: list
+List-Id: Intel Wired Ethernet Linux Kernel Driver Development
+ <intel-wired-lan.osuosl.org>
+List-Unsubscribe: <https://lists.osuosl.org/mailman/options/intel-wired-lan>, 
+ <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>
+List-Archive: <http://lists.osuosl.org/pipermail/intel-wired-lan/>
+List-Post: <mailto:intel-wired-lan@osuosl.org>
+List-Help: <mailto:intel-wired-lan-request@osuosl.org?subject=help>
+List-Subscribe: <https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, 
+ <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>
+Errors-To: intel-wired-lan-bounces@osuosl.org
+Sender: "Intel-wired-lan" <intel-wired-lan-bounces@osuosl.org>
+
+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;
+ 			}
diff --git a/kernel.spec b/kernel.spec
index 596bc9989..17e547f29 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -883,6 +883,10 @@ Patch507: drm-dp-mst-error-handling-improvements.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1811850
 Patch509: drm-i915-backports.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1816621
+# https://patchwork.ozlabs.org/patch/1260523/
+Patch510: e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2978,6 +2982,9 @@ fi
 #
 #
 %changelog
+* Thu Apr 02 2020 Hans de Goede <hdegoede@redhat.com>
+- Add patch fixing Lenovo X1 7th and 8th gen not suspending (rhbz 1816621)
+
 * Wed Apr 01 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.0-0.rc0.git3.1
 - Linux v5.6-5611-g1a323ea5356e