From 015fe6376100675baae33dc1e7d7d9191dd22b70 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 23 Sep 2022 19:57:33 +0200 Subject: [PATCH] 4.19-stable patches added patches: alsa-hda-add-intel-5-series-3400-pci-did.patch alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch efi-libstub-check-shim-mode-using-moksbstatert.patch --- ...-hda-add-intel-5-series-3400-pci-did.patch | 34 ++++++++++ ...er-output-dell-precision-5530-laptop.patch | 33 ++++++++++ ...b-check-shim-mode-using-moksbstatert.patch | 63 +++++++++++++++++++ queue-4.19/series | 3 + 4 files changed, 133 insertions(+) create mode 100644 queue-4.19/alsa-hda-add-intel-5-series-3400-pci-did.patch create mode 100644 queue-4.19/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch create mode 100644 queue-4.19/efi-libstub-check-shim-mode-using-moksbstatert.patch diff --git a/queue-4.19/alsa-hda-add-intel-5-series-3400-pci-did.patch b/queue-4.19/alsa-hda-add-intel-5-series-3400-pci-did.patch new file mode 100644 index 00000000000..1f81e09ef9b --- /dev/null +++ b/queue-4.19/alsa-hda-add-intel-5-series-3400-pci-did.patch @@ -0,0 +1,34 @@ +From 4d40ceef4745536289012670103c59264e0fb3ec Mon Sep 17 00:00:00 2001 +From: Kai Vehmanen +Date: Mon, 12 Sep 2022 21:37:16 +0300 +Subject: ALSA: hda: add Intel 5 Series / 3400 PCI DID + +From: Kai Vehmanen + +commit 4d40ceef4745536289012670103c59264e0fb3ec upstream. + +Handle 0x3b57 variant with same AZX_DCAPS_INTEL_PCH_NOPM +capabilities as 0x3b56. In practise this allow use of HDMI/DP +display audio via i915. + +BugLink: https://gitlab.freedesktop.org/drm/intel/-/issues/2751 +Signed-off-by: Kai Vehmanen +Cc: +Link: https://lore.kernel.org/r/20220912183716.2126312-1-kai.vehmanen@linux.intel.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/hda_intel.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -2634,6 +2634,8 @@ static const struct pci_device_id azx_id + /* 5 Series/3400 */ + { PCI_DEVICE(0x8086, 0x3b56), + .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, ++ { PCI_DEVICE(0x8086, 0x3b57), ++ .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, + /* Poulsbo */ + { PCI_DEVICE(0x8086, 0x811b), + .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE }, diff --git a/queue-4.19/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch b/queue-4.19/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch new file mode 100644 index 00000000000..77caae7a0f3 --- /dev/null +++ b/queue-4.19/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch @@ -0,0 +1,33 @@ +From 1885ff13d4c42910b37a0e3f7c2f182520f4eed1 Mon Sep 17 00:00:00 2001 +From: Callum Osmotherly +Date: Thu, 15 Sep 2022 22:36:08 +0930 +Subject: ALSA: hda/realtek: Enable 4-speaker output Dell Precision 5530 laptop + +From: Callum Osmotherly + +commit 1885ff13d4c42910b37a0e3f7c2f182520f4eed1 upstream. + +Just as with the 5570 (and the other Dell laptops), this enables the two +subwoofer speakers on the Dell Precision 5530 together with the main +ones, significantly increasing the audio quality. I've tested this +myself on a 5530 and can confirm it's working as expected. + +Signed-off-by: Callum Osmotherly +Cc: +Link: https://lore.kernel.org/r/YyMjQO3mhyXlMbCf@piranha +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 +@@ -7081,6 +7081,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC), + SND_PCI_QUIRK(0x1028, 0x0872, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC), + SND_PCI_QUIRK(0x1028, 0x0873, "Dell Precision 3930", ALC255_FIXUP_DUMMY_LINEOUT_VERB), ++ SND_PCI_QUIRK(0x1028, 0x087d, "Dell Precision 5530", ALC289_FIXUP_DUAL_SPK), + SND_PCI_QUIRK(0x1028, 0x08ad, "Dell WYSE AIO", ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x08ae, "Dell WYSE NB", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB), diff --git a/queue-4.19/efi-libstub-check-shim-mode-using-moksbstatert.patch b/queue-4.19/efi-libstub-check-shim-mode-using-moksbstatert.patch new file mode 100644 index 00000000000..877023e2a43 --- /dev/null +++ b/queue-4.19/efi-libstub-check-shim-mode-using-moksbstatert.patch @@ -0,0 +1,63 @@ +From 5f56a74cc0a6d9b9f8ba89cea29cd7c4774cb2b1 Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Tue, 20 Sep 2022 17:08:23 +0200 +Subject: efi: libstub: check Shim mode using MokSBStateRT + +From: Ard Biesheuvel + +commit 5f56a74cc0a6d9b9f8ba89cea29cd7c4774cb2b1 upstream. + +We currently check the MokSBState variable to decide whether we should +treat UEFI secure boot as being disabled, even if the firmware thinks +otherwise. This is used by shim to indicate that it is not checking +signatures on boot images. In the kernel, we use this to relax lockdown +policies. + +However, in cases where shim is not even being used, we don't want this +variable to interfere with lockdown, given that the variable may be +non-volatile and therefore persist across a reboot. This means setting +it once will persistently disable lockdown checks on a given system. + +So switch to the mirrored version of this variable, called MokSBStateRT, +which is supposed to be volatile, and this is something we can check. + +Cc: # v4.19+ +Signed-off-by: Ard Biesheuvel +Reviewed-by: Ilias Apalodimas +Reviewed-by: Peter Jones +Signed-off-by: Greg Kroah-Hartman +--- + drivers/firmware/efi/libstub/secureboot.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/firmware/efi/libstub/secureboot.c ++++ b/drivers/firmware/efi/libstub/secureboot.c +@@ -21,7 +21,7 @@ static const efi_char16_t efi_SetupMode_ + + /* SHIM variables */ + static const efi_guid_t shim_guid = EFI_SHIM_LOCK_GUID; +-static const efi_char16_t shim_MokSBState_name[] = L"MokSBState"; ++static const efi_char16_t shim_MokSBState_name[] = L"MokSBStateRT"; + + #define get_efi_var(name, vendor, ...) \ + efi_call_runtime(get_variable, \ +@@ -60,8 +60,8 @@ enum efi_secureboot_mode efi_get_secureb + + /* + * See if a user has put the shim into insecure mode. If so, and if the +- * variable doesn't have the runtime attribute set, we might as well +- * honor that. ++ * variable doesn't have the non-volatile attribute set, we might as ++ * well honor that. + */ + size = sizeof(moksbstate); + status = get_efi_var(shim_MokSBState_name, &shim_guid, +@@ -70,7 +70,7 @@ enum efi_secureboot_mode efi_get_secureb + /* If it fails, we don't care why. Default to secure */ + if (status != EFI_SUCCESS) + goto secure_boot_enabled; +- if (!(attr & EFI_VARIABLE_RUNTIME_ACCESS) && moksbstate == 1) ++ if (!(attr & EFI_VARIABLE_NON_VOLATILE) && moksbstate == 1) + return efi_secureboot_mode_disabled; + + secure_boot_enabled: diff --git a/queue-4.19/series b/queue-4.19/series index c2899e3381c..cbfdbdc3b3c 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -26,3 +26,6 @@ usb-core-fix-rst-error-in-hub.c.patch usb-serial-option-add-quectel-bg95-0x0203-composition.patch usb-serial-option-add-quectel-rm520n.patch alsa-hda-tegra-set-depop-delay-for-tegra.patch +alsa-hda-add-intel-5-series-3400-pci-did.patch +alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch +efi-libstub-check-shim-mode-using-moksbstatert.patch -- 2.47.3