summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SOURCES/0001-ALSA-hda-via-Fix-runtime-PM-for-Clevo-W35xSS.patch86
-rw-r--r--SOURCES/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch35
-rw-r--r--SPECS/kernel.spec12
3 files changed, 6 insertions, 127 deletions
diff --git a/SOURCES/0001-ALSA-hda-via-Fix-runtime-PM-for-Clevo-W35xSS.patch b/SOURCES/0001-ALSA-hda-via-Fix-runtime-PM-for-Clevo-W35xSS.patch
deleted file mode 100644
index fb9b5f5..0000000
--- a/SOURCES/0001-ALSA-hda-via-Fix-runtime-PM-for-Clevo-W35xSS.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 4bfd6247fa9164c8e193a55ef9c0ea3ee22f82d8 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 4 Jan 2021 16:30:46 +0100
-Subject: [PATCH] ALSA: hda/via: Fix runtime PM for Clevo W35xSS
-
-Clevo W35xSS_370SS with VIA codec has had the runtime PM problem that
-looses the power state of some nodes after the runtime resume. This
-was worked around by disabling the default runtime PM via a denylist
-entry. Since 5.10.x made the runtime PM applied (casually) even
-though it's disabled in the denylist, this problem was revisited. The
-result was that disabling power_save_node feature suffices for the
-runtime PM problem.
-
-This patch implements the disablement of power_save_node feature in
-VIA codec for the device. It also drops the former denylist entry,
-too, as the runtime PM should work in the codec side properly now.
-
-Fixes: b529ef2464ad ("ALSA: hda: Add Clevo W35xSS_370SS to the power_save blacklist")
-Reported-by: Christian Labisch <clnetbox@gmail.com>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/20210104153046.19993-1-tiwai@suse.de
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- sound/pci/hda/hda_intel.c | 2 --
- sound/pci/hda/patch_via.c | 13 +++++++++++++
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index 6852668f1bcb..770ad25f1907 100644
---- a/sound/pci/hda/hda_intel.c
-+++ b/sound/pci/hda/hda_intel.c
-@@ -2220,8 +2220,6 @@ static const struct snd_pci_quirk power_save_denylist[] = {
- SND_PCI_QUIRK(0x1849, 0x7662, "Asrock H81M-HDS", 0),
- /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
- SND_PCI_QUIRK(0x1043, 0x8733, "Asus Prime X370-Pro", 0),
-- /* https://bugzilla.redhat.com/show_bug.cgi?id=1581607 */
-- SND_PCI_QUIRK(0x1558, 0x3501, "Clevo W35xSS_370SS", 0),
- /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
- SND_PCI_QUIRK(0x1558, 0x6504, "Clevo W65_67SB", 0),
- /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
-diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
-index 7ef8f3105cdb..0ab40a8a68fb 100644
---- a/sound/pci/hda/patch_via.c
-+++ b/sound/pci/hda/patch_via.c
-@@ -1002,6 +1002,7 @@ static const struct hda_verb vt1802_init_verbs[] = {
- enum {
- VIA_FIXUP_INTMIC_BOOST,
- VIA_FIXUP_ASUS_G75,
-+ VIA_FIXUP_POWER_SAVE,
- };
-
- static void via_fixup_intmic_boost(struct hda_codec *codec,
-@@ -1011,6 +1012,13 @@ static void via_fixup_intmic_boost(struct hda_codec *codec,
- override_mic_boost(codec, 0x30, 0, 2, 40);
- }
-
-+static void via_fixup_power_save(struct hda_codec *codec,
-+ const struct hda_fixup *fix, int action)
-+{
-+ if (action == HDA_FIXUP_ACT_PRE_PROBE)
-+ codec->power_save_node = 0;
-+}
-+
- static const struct hda_fixup via_fixups[] = {
- [VIA_FIXUP_INTMIC_BOOST] = {
- .type = HDA_FIXUP_FUNC,
-@@ -1025,11 +1033,16 @@ static const struct hda_fixup via_fixups[] = {
- { }
- }
- },
-+ [VIA_FIXUP_POWER_SAVE] = {
-+ .type = HDA_FIXUP_FUNC,
-+ .v.func = via_fixup_power_save,
-+ },
- };
-
- static const struct snd_pci_quirk vt2002p_fixups[] = {
- SND_PCI_QUIRK(0x1043, 0x1487, "Asus G75", VIA_FIXUP_ASUS_G75),
- SND_PCI_QUIRK(0x1043, 0x8532, "Asus X202E", VIA_FIXUP_INTMIC_BOOST),
-+ SND_PCI_QUIRK(0x1558, 0x3501, "Clevo W35xSS_370SS", VIA_FIXUP_POWER_SAVE),
- {}
- };
-
---
-2.29.2
-
diff --git a/SOURCES/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch b/SOURCES/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
deleted file mode 100644
index 150ddd7..0000000
--- a/SOURCES/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
-
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 78baf84..abcc29a 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -94,7 +94,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 7
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -832,7 +832,6 @@ Patch65: 0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch
Patch66: 0001-dt-bindings-panel-add-binding-for-Xingbangda-XBD599-.patch
Patch67: 0001-drm-panel-add-Xingbangda-XBD599-panel.patch
Patch68: 0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
-Patch70: 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
Patch72: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
# https://patchwork.kernel.org/patch/11796255/
@@ -847,8 +846,6 @@ Patch102: 0001-update-phy-on-pine64-a64-devices.patch
# OMAP Pandaboard fix
Patch103: arm-pandaboard-fix-add-bluetooth.patch
-Patch105: 0001-ALSA-hda-via-Fix-runtime-PM-for-Clevo-W35xSS.patch
-
# Nouveau mDP detection fix
Patch107: 0001-drm-nouveau-kms-handle-mDP-connectors.patch
@@ -2969,8 +2966,11 @@ fi
#
#
%changelog
-* Thu Jan 14 21:14:08 CET 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.10.6-201.fsync
-- Linux v5.10.6 futex2 zen
+* Thu Jan 14 22:29:17 CET 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.10.7-201.fsync
+- Linux v5.10.7 futex2 zen
+
+* Tue Jan 12 13:41:35 CST 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.7-200
+- Linux v5.10.7
* Mon Jan 11 06:51:13 CST 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.6-200
- Linux v5.10.6 rebase
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 10:32:14 +0000