From: Greg Kroah-Hartman Date: Sat, 30 Jan 2021 15:39:09 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.4.255~59 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ad9a395f6ba749924c05ff6a79d15762ae13b36;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: acpi-sysfs-prefer-compatible-modalias.patch alsa-hda-realtek-enable-headset-of-asus-b1400cepe-with-alc256.patch alsa-hda-via-apply-the-workaround-generically-for-clevo-machines.patch kernel-kexec-remove-the-lock-operation-of-system_transition_mutex.patch --- diff --git a/queue-5.4/acpi-sysfs-prefer-compatible-modalias.patch b/queue-5.4/acpi-sysfs-prefer-compatible-modalias.patch new file mode 100644 index 00000000000..dd1138bdccf --- /dev/null +++ b/queue-5.4/acpi-sysfs-prefer-compatible-modalias.patch @@ -0,0 +1,65 @@ +From 36af2d5c4433fb40ee2af912c4ac0a30991aecfc Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Fri, 22 Jan 2021 20:53:02 +0800 +Subject: ACPI: sysfs: Prefer "compatible" modalias + +From: Kai-Heng Feng + +commit 36af2d5c4433fb40ee2af912c4ac0a30991aecfc upstream. + +Commit 8765c5ba1949 ("ACPI / scan: Rework modalias creation when +"compatible" is present") may create two "MODALIAS=" in one uevent +file if specific conditions are met. + +This breaks systemd-udevd, which assumes each "key" in one uevent file +to be unique. The internal implementation of systemd-udevd overwrites +the first MODALIAS with the second one, so its kmod rule doesn't load +the driver for the first MODALIAS. + +So if both the ACPI modalias and the OF modalias are present, use the +latter to ensure that there will be only one MODALIAS. + +Link: https://github.com/systemd/systemd/pull/18163 +Suggested-by: Mika Westerberg +Fixes: 8765c5ba1949 ("ACPI / scan: Rework modalias creation when "compatible" is present") +Signed-off-by: Kai-Heng Feng +Reviewed-by: Mika Westerberg +Reviewed-by: Greg Kroah-Hartman +Cc: 4.1+ # 4.1+ +[ rjw: Subject and changelog edits ] +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/device_sysfs.c | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) + +--- a/drivers/acpi/device_sysfs.c ++++ b/drivers/acpi/device_sysfs.c +@@ -251,20 +251,12 @@ int __acpi_device_uevent_modalias(struct + if (add_uevent_var(env, "MODALIAS=")) + return -ENOMEM; + +- len = create_pnp_modalias(adev, &env->buf[env->buflen - 1], +- sizeof(env->buf) - env->buflen); +- if (len < 0) +- return len; +- +- env->buflen += len; +- if (!adev->data.of_compatible) +- return 0; +- +- if (len > 0 && add_uevent_var(env, "MODALIAS=")) +- return -ENOMEM; +- +- len = create_of_modalias(adev, &env->buf[env->buflen - 1], +- sizeof(env->buf) - env->buflen); ++ if (adev->data.of_compatible) ++ len = create_of_modalias(adev, &env->buf[env->buflen - 1], ++ sizeof(env->buf) - env->buflen); ++ else ++ len = create_pnp_modalias(adev, &env->buf[env->buflen - 1], ++ sizeof(env->buf) - env->buflen); + if (len < 0) + return len; + diff --git a/queue-5.4/alsa-hda-realtek-enable-headset-of-asus-b1400cepe-with-alc256.patch b/queue-5.4/alsa-hda-realtek-enable-headset-of-asus-b1400cepe-with-alc256.patch new file mode 100644 index 00000000000..a6f9f7152f8 --- /dev/null +++ b/queue-5.4/alsa-hda-realtek-enable-headset-of-asus-b1400cepe-with-alc256.patch @@ -0,0 +1,45 @@ +From 5de3b9430221b11a5e1fc2f5687af80777c8392a Mon Sep 17 00:00:00 2001 +From: Jian-Hong Pan +Date: Fri, 22 Jan 2021 13:47:06 +0800 +Subject: ALSA: hda/realtek: Enable headset of ASUS B1400CEPE with ALC256 + +From: Jian-Hong Pan + +commit 5de3b9430221b11a5e1fc2f5687af80777c8392a upstream. + +ASUS B1400CEPE laptop's headset audio is not enabled until +ALC256_FIXUP_ASUS_HPE quirk is applied. + +Here is the original pin node values: + +0x12 0x40000000 +0x13 0x411111f0 +0x14 0x90170110 +0x18 0x411111f0 +0x19 0x411111f0 +0x1a 0x411111f0 +0x1b 0x411111f0 +0x1d 0x40461b45 +0x1e 0x411111f0 +0x21 0x04211020 + +Signed-off-by: Jian-Hong Pan +Cc: +Link: https://lore.kernel.org/r/20210122054705.48804-1-jhp@endlessos.org +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -7907,6 +7907,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), + SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC), + SND_PCI_QUIRK(0x1043, 0x194e, "ASUS UX563FD", ALC294_FIXUP_ASUS_HPE), ++ SND_PCI_QUIRK(0x1043, 0x1982, "ASUS B1400CEPE", ALC256_FIXUP_ASUS_HPE), + SND_PCI_QUIRK(0x1043, 0x19ce, "ASUS B9450FA", ALC294_FIXUP_ASUS_HPE), + SND_PCI_QUIRK(0x1043, 0x19e1, "ASUS UX581LV", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), diff --git a/queue-5.4/alsa-hda-via-apply-the-workaround-generically-for-clevo-machines.patch b/queue-5.4/alsa-hda-via-apply-the-workaround-generically-for-clevo-machines.patch new file mode 100644 index 00000000000..81cb3bc26b1 --- /dev/null +++ b/queue-5.4/alsa-hda-via-apply-the-workaround-generically-for-clevo-machines.patch @@ -0,0 +1,35 @@ +From 4961167bf7482944ca09a6f71263b9e47f949851 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 26 Jan 2021 17:56:03 +0100 +Subject: ALSA: hda/via: Apply the workaround generically for Clevo machines + +From: Takashi Iwai + +commit 4961167bf7482944ca09a6f71263b9e47f949851 upstream. + +We've got another report indicating a similar problem wrt the +power-saving behavior with VIA codec on Clevo machines. Let's apply +the existing workaround generically to all Clevo devices with VIA +codecs to cover all in once. + +BugLink: https://bugzilla.opensuse.org/show_bug.cgi?id=1181330 +Cc: +Link: https://lore.kernel.org/r/20210126165603.11683-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_via.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_via.c ++++ b/sound/pci/hda/patch_via.c +@@ -1043,7 +1043,7 @@ static const struct hda_fixup via_fixups + 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), ++ SND_PCI_QUIRK_VENDOR(0x1558, "Clevo", VIA_FIXUP_POWER_SAVE), + {} + }; + diff --git a/queue-5.4/kernel-kexec-remove-the-lock-operation-of-system_transition_mutex.patch b/queue-5.4/kernel-kexec-remove-the-lock-operation-of-system_transition_mutex.patch new file mode 100644 index 00000000000..342650e3eda --- /dev/null +++ b/queue-5.4/kernel-kexec-remove-the-lock-operation-of-system_transition_mutex.patch @@ -0,0 +1,49 @@ +From 56c91a18432b631ca18438841fd1831ef756cabf Mon Sep 17 00:00:00 2001 +From: Baoquan He +Date: Fri, 22 Jan 2021 15:42:14 +0800 +Subject: kernel: kexec: remove the lock operation of system_transition_mutex + +From: Baoquan He + +commit 56c91a18432b631ca18438841fd1831ef756cabf upstream. + +Function kernel_kexec() is called with lock system_transition_mutex +held in reboot system call. While inside kernel_kexec(), it will +acquire system_transition_mutex agin. This will lead to dead lock. + +The dead lock should be easily triggered, it hasn't caused any +failure report just because the feature 'kexec jump' is almost not +used by anyone as far as I know. An inquiry can be made about who +is using 'kexec jump' and where it's used. Before that, let's simply +remove the lock operation inside CONFIG_KEXEC_JUMP ifdeffery scope. + +Fixes: 55f2503c3b69 ("PM / reboot: Eliminate race between reboot and suspend") +Signed-off-by: Baoquan He +Reported-by: Dan Carpenter +Reviewed-by: Pingfan Liu +Cc: 4.19+ # 4.19+ +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/kexec_core.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/kernel/kexec_core.c ++++ b/kernel/kexec_core.c +@@ -1129,7 +1129,6 @@ int kernel_kexec(void) + + #ifdef CONFIG_KEXEC_JUMP + if (kexec_image->preserve_context) { +- lock_system_sleep(); + pm_prepare_console(); + error = freeze_processes(); + if (error) { +@@ -1192,7 +1191,6 @@ int kernel_kexec(void) + thaw_processes(); + Restore_console: + pm_restore_console(); +- unlock_system_sleep(); + } + #endif + diff --git a/queue-5.4/series b/queue-5.4/series index c611083028f..2391a048551 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,3 +1,7 @@ icmpv6-add-icmpv6-parameter-problem-code-3-definition.patch ipv6-reply-icmp-error-if-the-first-fragment-don-t-include-all-headers.patch nbd-freeze-the-queue-while-we-re-adding-connections.patch +acpi-sysfs-prefer-compatible-modalias.patch +kernel-kexec-remove-the-lock-operation-of-system_transition_mutex.patch +alsa-hda-realtek-enable-headset-of-asus-b1400cepe-with-alc256.patch +alsa-hda-via-apply-the-workaround-generically-for-clevo-machines.patch