From 76320b5307f009f98e5eb0e180fe4ab5a94066e2 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 2 Apr 2020 15:56:09 +0200 Subject: Add patch fixing Lenovo X1 7th and 8th gen not suspending (rhbz 1816621) --- ...out-to-wait-when-ME-un-configure-ULP-mode.patch | 112 +++++++++++++++++++++ kernel.spec | 7 ++ 2 files changed, 119 insertions(+) create mode 100644 e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch 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 +X-Patchwork-Id: 1260523 +X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com +Return-Path: +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=) +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 ; + 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 ; + 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 ; + 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 ; + 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 ; + 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 ) + id 1jGSZN-00031K-JS; Mon, 23 Mar 2020 19:17:06 +0000 +From: Aaron Ma +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 + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Errors-To: intel-wired-lan-bounces@osuosl.org +Sender: "Intel-wired-lan" + +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 +--- + 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 8e8d27a64..59d867a41 100644 --- a/kernel.spec +++ b/kernel.spec @@ -864,6 +864,10 @@ Patch508: 20200310_chris_chris_wilson_co_uk.patch # Backport vboxsf from 5.6, can be dropped when we move to 5.6 Patch510: 0001-fs-Add-VirtualBox-guest-shared-folder-vboxsf-support.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1816621 +# https://patchwork.ozlabs.org/patch/1260523/ +Patch511: e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch + # END OF PATCH DEFINITIONS %endif @@ -2893,6 +2897,9 @@ fi # # %changelog +* Thu Apr 02 2020 Hans de Goede +- Add patch fixing Lenovo X1 7th and 8th gen not suspending (rhbz 1816621) + * Wed Apr 01 2020 Justin M. Forbes - 5.5.14-200 - Linux v5.5.14 - Fixes CVE-2020-8835 (rhbz 1818941 1817350) -- cgit From 680aa3e5c4b3a0aeb8e21d2b7919596d1681885f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 2 Apr 2020 19:56:26 +0200 Subject: Add patch fixing Lenovo X1 7th and 8th gen not suspending (rhbz 1816621) Add patch fixing Lenovo X1 8th gen speaker volume control (rhbz 1820196) --- ...altek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch | 34 ++++++++++++++++++++++ kernel.spec | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch diff --git a/0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch b/0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch new file mode 100644 index 000000000..9c482f90c --- /dev/null +++ b/0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch @@ -0,0 +1,34 @@ +From 672798e7b896ad659009882b7fd3242935c8fcdf Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 2 Apr 2020 18:02:05 +0200 +Subject: [PATCH] ALSA: hda/realtek - Add quirk for Lenovo Carbon X1 8th gen + +The audio setup on the Lenovo Carbon X1 8th gen is the same as that on +the Lenovo Carbon X1 7th gen, as such it needs the same +ALC285_FIXUP_THINKPAD_HEADSET_JACK quirk. + +This fixes volume control of the speaker not working among other things. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1820196 +Cc: stable@vger.kernel.org +Suggested-by: Jaroslav Kysela +Signed-off-by: Hans de Goede +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 63e1a56f705b..9c3bbf1df93e 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -7299,6 +7299,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { + SND_PCI_QUIRK(0x17aa, 0x225d, "Thinkpad T480", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), + SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Yoga 7th", ALC285_FIXUP_THINKPAD_HEADSET_JACK), + SND_PCI_QUIRK(0x17aa, 0x2293, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_THINKPAD_HEADSET_JACK), ++ SND_PCI_QUIRK(0x17aa, 0x22be, "Thinkpad X1 Carbon 8th", ALC285_FIXUP_THINKPAD_HEADSET_JACK), + SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), + SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), + SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), +-- +2.26.0 + diff --git a/kernel.spec b/kernel.spec index 59d867a41..0854f9222 100644 --- a/kernel.spec +++ b/kernel.spec @@ -868,6 +868,9 @@ Patch510: 0001-fs-Add-VirtualBox-guest-shared-folder-vboxsf-support.patch # https://patchwork.ozlabs.org/patch/1260523/ Patch511: e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1820196 +Patch512: 0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch + # END OF PATCH DEFINITIONS %endif @@ -2899,6 +2902,7 @@ fi %changelog * Thu Apr 02 2020 Hans de Goede - Add patch fixing Lenovo X1 7th and 8th gen not suspending (rhbz 1816621) +- Add patch fixing Lenovo X1 8th gen speaker volume control (rhbz 1820196) * Wed Apr 01 2020 Justin M. Forbes - 5.5.14-200 - Linux v5.5.14 -- cgit From 16c5c0f7b388dac3b671d7a2f7d258ee6ce3b06d Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 2 Apr 2020 13:40:28 -0500 Subject: Linux v5.5.15 --- kernel.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index 0854f9222..d1a954a67 100644 --- a/kernel.spec +++ b/kernel.spec @@ -89,7 +89,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 14 +%define stable_update 15 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -2900,6 +2900,9 @@ fi # # %changelog +* Thu Apr 02 2020 Justin M. Forbes - 5.5.15-200 +- Linux v5.5.15 + * Thu Apr 02 2020 Hans de Goede - Add patch fixing Lenovo X1 7th and 8th gen not suspending (rhbz 1816621) - Add patch fixing Lenovo X1 8th gen speaker volume control (rhbz 1820196) diff --git a/sources b/sources index 85c5f595f..d584a3de6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.5.tar.xz) = fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86 -SHA512 (patch-5.5.14.xz) = 3f975cbbaa68a6455eb3fce81e9ac14bf68721077cd0d6b5dc530034bcde3ccc9046e712c08253d89157a25ab29fae614a6b99e7186bfddc960938ce242ba55b +SHA512 (patch-5.5.15.xz) = 2d60a47b38d72e816525b2f23d70d12ac130f20956b032dda3ede895aa031b47c56b2b0a758b4845e2ad058c673afa3cba9449ddb1d92280bf000b2c4bad3250 -- cgit