From 0f4cb919bb858961d6884bde64a1b02e714695be Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 23 Sep 2022 19:57:47 +0200 Subject: [PATCH] 5.10-stable patches added patches: alsa-hda-add-intel-5-series-3400-pci-did.patch alsa-hda-realtek-add-pincfg-for-asus-g513-hp-jack.patch alsa-hda-realtek-add-pincfg-for-asus-g533z-hp-jack.patch alsa-hda-realtek-add-quirk-for-asus-ga503r-laptop.patch alsa-hda-realtek-add-quirk-for-huawei-wrt-wx9.patch alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch alsa-hda-realtek-enable-4-speaker-output-dell-precision-5570-laptop.patch alsa-hda-realtek-re-arrange-quirk-table-entries.patch efi-libstub-check-shim-mode-using-moksbstatert.patch efi-x86-wipe-setup_data-on-pure-efi-boot.patch iommu-vt-d-check-correct-capability-for-sagaw-determination.patch media-flexcop-usb-fix-endpoint-type-check.patch --- ...-hda-add-intel-5-series-3400-pci-did.patch | 34 ++++++++++ ...tek-add-pincfg-for-asus-g513-hp-jack.patch | 56 +++++++++++++++++ ...ek-add-pincfg-for-asus-g533z-hp-jack.patch | 56 +++++++++++++++++ ...tek-add-quirk-for-asus-ga503r-laptop.patch | 34 ++++++++++ ...realtek-add-quirk-for-huawei-wrt-wx9.patch | 30 +++++++++ ...er-output-dell-precision-5530-laptop.patch | 33 ++++++++++ ...er-output-dell-precision-5570-laptop.patch | 33 ++++++++++ ...altek-re-arrange-quirk-table-entries.patch | 53 ++++++++++++++++ ...b-check-shim-mode-using-moksbstatert.patch | 63 +++++++++++++++++++ ...x86-wipe-setup_data-on-pure-efi-boot.patch | 56 +++++++++++++++++ ...t-capability-for-sagaw-determination.patch | 38 +++++++++++ ...-flexcop-usb-fix-endpoint-type-check.patch | 38 +++++++++++ queue-5.10/series | 12 ++++ 13 files changed, 536 insertions(+) create mode 100644 queue-5.10/alsa-hda-add-intel-5-series-3400-pci-did.patch create mode 100644 queue-5.10/alsa-hda-realtek-add-pincfg-for-asus-g513-hp-jack.patch create mode 100644 queue-5.10/alsa-hda-realtek-add-pincfg-for-asus-g533z-hp-jack.patch create mode 100644 queue-5.10/alsa-hda-realtek-add-quirk-for-asus-ga503r-laptop.patch create mode 100644 queue-5.10/alsa-hda-realtek-add-quirk-for-huawei-wrt-wx9.patch create mode 100644 queue-5.10/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch create mode 100644 queue-5.10/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5570-laptop.patch create mode 100644 queue-5.10/alsa-hda-realtek-re-arrange-quirk-table-entries.patch create mode 100644 queue-5.10/efi-libstub-check-shim-mode-using-moksbstatert.patch create mode 100644 queue-5.10/efi-x86-wipe-setup_data-on-pure-efi-boot.patch create mode 100644 queue-5.10/iommu-vt-d-check-correct-capability-for-sagaw-determination.patch create mode 100644 queue-5.10/media-flexcop-usb-fix-endpoint-type-check.patch diff --git a/queue-5.10/alsa-hda-add-intel-5-series-3400-pci-did.patch b/queue-5.10/alsa-hda-add-intel-5-series-3400-pci-did.patch new file mode 100644 index 00000000000..5bf119ae558 --- /dev/null +++ b/queue-5.10/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 +@@ -2584,6 +2584,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-5.10/alsa-hda-realtek-add-pincfg-for-asus-g513-hp-jack.patch b/queue-5.10/alsa-hda-realtek-add-pincfg-for-asus-g513-hp-jack.patch new file mode 100644 index 00000000000..29bdb08cf28 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-add-pincfg-for-asus-g513-hp-jack.patch @@ -0,0 +1,56 @@ +From c611e659044168e7abcbae8ba1ea833521498fbb Mon Sep 17 00:00:00 2001 +From: "Luke D. Jones" +Date: Thu, 15 Sep 2022 20:09:19 +1200 +Subject: ALSA: hda/realtek: Add pincfg for ASUS G513 HP jack + +From: Luke D. Jones + +commit c611e659044168e7abcbae8ba1ea833521498fbb upstream. + +Fixes up the pincfg for ASUS ROG Strix G513 headphone and mic combo jack + +[ Fixed the position in the quirk table by tiwai ] + +Signed-off-by: Luke D. Jones +Cc: +Link: https://lore.kernel.org/r/20220915080921.35563-2-luke@ljones.dev +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -6824,6 +6824,7 @@ enum { + ALC294_FIXUP_ASUS_GU502_HP, + ALC294_FIXUP_ASUS_GU502_PINS, + ALC294_FIXUP_ASUS_GU502_VERBS, ++ ALC294_FIXUP_ASUS_G513_PINS, + ALC285_FIXUP_HP_GPIO_LED, + ALC285_FIXUP_HP_MUTE_LED, + ALC236_FIXUP_HP_GPIO_LED, +@@ -8150,6 +8151,15 @@ static const struct hda_fixup alc269_fix + .type = HDA_FIXUP_FUNC, + .v.func = alc294_fixup_gu502_hp, + }, ++ [ALC294_FIXUP_ASUS_G513_PINS] = { ++ .type = HDA_FIXUP_PINS, ++ .v.pins = (const struct hda_pintbl[]) { ++ { 0x19, 0x03a11050 }, /* front HP mic */ ++ { 0x1a, 0x03a11c30 }, /* rear external mic */ ++ { 0x21, 0x03211420 }, /* front HP out */ ++ { } ++ }, ++ }, + [ALC294_FIXUP_ASUS_COEF_1B] = { + .type = HDA_FIXUP_VERBS, + .v.verbs = (const struct hda_verb[]) { +@@ -8937,6 +8947,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE), + SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502), + SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS), ++ SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS), + SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2), diff --git a/queue-5.10/alsa-hda-realtek-add-pincfg-for-asus-g533z-hp-jack.patch b/queue-5.10/alsa-hda-realtek-add-pincfg-for-asus-g533z-hp-jack.patch new file mode 100644 index 00000000000..ff17938b8d5 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-add-pincfg-for-asus-g533z-hp-jack.patch @@ -0,0 +1,56 @@ +From bc2c23549ccd7105eb6ff0d4f0ac519285628673 Mon Sep 17 00:00:00 2001 +From: "Luke D. Jones" +Date: Thu, 15 Sep 2022 20:09:20 +1200 +Subject: ALSA: hda/realtek: Add pincfg for ASUS G533Z HP jack + +From: Luke D. Jones + +commit bc2c23549ccd7105eb6ff0d4f0ac519285628673 upstream. + +Fixes up the pincfg for ASUS ROG Strix G15 (G533Z) headphone combo jack + +[ Fixed the position in the quirk table by tiwai ] + +Signed-off-by: Luke D. Jones +Cc: +Link: https://lore.kernel.org/r/20220915080921.35563-3-luke@ljones.dev +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -6825,6 +6825,7 @@ enum { + ALC294_FIXUP_ASUS_GU502_PINS, + ALC294_FIXUP_ASUS_GU502_VERBS, + ALC294_FIXUP_ASUS_G513_PINS, ++ ALC285_FIXUP_ASUS_G533Z_PINS, + ALC285_FIXUP_HP_GPIO_LED, + ALC285_FIXUP_HP_MUTE_LED, + ALC236_FIXUP_HP_GPIO_LED, +@@ -8160,6 +8161,15 @@ static const struct hda_fixup alc269_fix + { } + }, + }, ++ [ALC285_FIXUP_ASUS_G533Z_PINS] = { ++ .type = HDA_FIXUP_PINS, ++ .v.pins = (const struct hda_pintbl[]) { ++ { 0x14, 0x90170120 }, ++ { } ++ }, ++ .chained = true, ++ .chain_id = ALC294_FIXUP_ASUS_G513_PINS, ++ }, + [ALC294_FIXUP_ASUS_COEF_1B] = { + .type = HDA_FIXUP_VERBS, + .v.verbs = (const struct hda_verb[]) { +@@ -8942,6 +8952,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC), + SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), ++ SND_PCI_QUIRK(0x1043, 0x1c92, "ASUS ROG Strix G15", ALC285_FIXUP_ASUS_G533Z_PINS), + SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC), + SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE), diff --git a/queue-5.10/alsa-hda-realtek-add-quirk-for-asus-ga503r-laptop.patch b/queue-5.10/alsa-hda-realtek-add-quirk-for-asus-ga503r-laptop.patch new file mode 100644 index 00000000000..ee96495a535 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-add-quirk-for-asus-ga503r-laptop.patch @@ -0,0 +1,34 @@ +From ba1f818053b0668a1ce2fe86b840e81b592cc560 Mon Sep 17 00:00:00 2001 +From: "Luke D. Jones" +Date: Thu, 15 Sep 2022 20:09:21 +1200 +Subject: ALSA: hda/realtek: Add quirk for ASUS GA503R laptop + +From: Luke D. Jones + +commit ba1f818053b0668a1ce2fe86b840e81b592cc560 upstream. + +The ASUS G15 2022 (GA503R) series laptop has the same node-to-DAC pairs +as early models and the G14, this includes bass speakers which are by +default mapped incorrectly to the 0x06 node. + +Add a quirk to use the same DAC pairs as the G14. + +Signed-off-by: Luke D. Jones +Cc: +Link: https://lore.kernel.org/r/20220915080921.35563-4-luke@ljones.dev +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 +@@ -8960,6 +8960,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS), + SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS), + SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401), ++ SND_PCI_QUIRK(0x1043, 0x1c52, "ASUS Zephyrus G15 2022", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2), + SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC), diff --git a/queue-5.10/alsa-hda-realtek-add-quirk-for-huawei-wrt-wx9.patch b/queue-5.10/alsa-hda-realtek-add-quirk-for-huawei-wrt-wx9.patch new file mode 100644 index 00000000000..f9d92abc211 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-add-quirk-for-huawei-wrt-wx9.patch @@ -0,0 +1,30 @@ +From cbcdf8c4d35cd74aee8581eb2f0453e0ecab7b05 Mon Sep 17 00:00:00 2001 +From: huangwenhui +Date: Tue, 13 Sep 2022 13:46:22 +0800 +Subject: ALSA: hda/realtek: Add quirk for Huawei WRT-WX9 + +From: huangwenhui + +commit cbcdf8c4d35cd74aee8581eb2f0453e0ecab7b05 upstream. + +Fixes headphone and headset microphone detection on Huawei WRT-WX9. + +Signed-off-by: huangwenhui +Cc: +Link: https://lore.kernel.org/r/20220913054622.15979-1-huangwenhuia@uniontech.com +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 +@@ -9134,6 +9134,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), + SND_PCI_QUIRK(0x1849, 0x1233, "ASRock NUC Box 1100", ALC233_FIXUP_NO_AUDIO_JACK), + SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS), ++ SND_PCI_QUIRK(0x19e5, 0x320f, "Huawei WRT-WX9 ", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1b35, 0x1235, "CZC B20", ALC269_FIXUP_CZC_B20), + SND_PCI_QUIRK(0x1b35, 0x1236, "CZC TMI", ALC269_FIXUP_CZC_TMI), + SND_PCI_QUIRK(0x1b35, 0x1237, "CZC L101", ALC269_FIXUP_CZC_L101), diff --git a/queue-5.10/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch b/queue-5.10/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch new file mode 100644 index 00000000000..612bc966bcb --- /dev/null +++ b/queue-5.10/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 +@@ -8774,6 +8774,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-5.10/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5570-laptop.patch b/queue-5.10/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5570-laptop.patch new file mode 100644 index 00000000000..70ec1285efc --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-enable-4-speaker-output-dell-precision-5570-laptop.patch @@ -0,0 +1,33 @@ +From bdc9b7396f7d4d6533e70fd8d5472f505b5ef58f Mon Sep 17 00:00:00 2001 +From: Callum Osmotherly +Date: Wed, 14 Sep 2022 18:44:00 +0930 +Subject: ALSA: hda/realtek: Enable 4-speaker output Dell Precision 5570 laptop + +From: Callum Osmotherly + +commit bdc9b7396f7d4d6533e70fd8d5472f505b5ef58f upstream. + +The Dell Precision 5570 uses the same 4-speakers-on-ALC289 just like the +previous Precision 5560. I replicated that patch onto this one, and can +confirm that the audio is much better (the woofers are now working); +I've tested it on my Dell Precision 5570. + +Signed-off-by: Callum Osmotherly +Cc: +Link: https://lore.kernel.org/r/YyGbWM5wEoFMbW2v@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 +@@ -8769,6 +8769,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1028, 0x0a9d, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x0a9e, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x0b19, "Dell XPS 15 9520", ALC289_FIXUP_DUAL_SPK), ++ SND_PCI_QUIRK(0x1028, 0x0b1a, "Dell Precision 5570", ALC289_FIXUP_DUAL_SPK), + SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), diff --git a/queue-5.10/alsa-hda-realtek-re-arrange-quirk-table-entries.patch b/queue-5.10/alsa-hda-realtek-re-arrange-quirk-table-entries.patch new file mode 100644 index 00000000000..187310247b3 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-re-arrange-quirk-table-entries.patch @@ -0,0 +1,53 @@ +From b16c8f229a58eaddfc58aab447253464abd3c85e Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 15 Sep 2022 17:47:24 +0200 +Subject: ALSA: hda/realtek: Re-arrange quirk table entries + +From: Takashi Iwai + +commit b16c8f229a58eaddfc58aab447253464abd3c85e upstream. + +A few entries have been mistakenly inserted in wrong positions without +considering the SSID ordering. Place them at right positions. + +Fixes: b7557267c233 ("ALSA: hda/realtek: Add quirk for ASUS GA402") +Fixes: 94db9cc8f8fa ("ALSA: hda/realtek: Add quirk for ASUS GU603") +Fixes: 739d0959fbed ("ALSA: hda: Add quirk for ASUS Flow x13") +Cc: +Link: https://lore.kernel.org/r/20220915154724.31634-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -8913,10 +8913,11 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC), + SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK), + SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), ++ SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK), ++ SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS), + SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK), +- SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK), + SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS), + SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), + SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC), +@@ -8932,13 +8933,12 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), + SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC), ++ SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE), + SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502), + SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS), + SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401), +- SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401), +- SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2), + SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC), diff --git a/queue-5.10/efi-libstub-check-shim-mode-using-moksbstatert.patch b/queue-5.10/efi-libstub-check-shim-mode-using-moksbstatert.patch new file mode 100644 index 00000000000..c8d08473774 --- /dev/null +++ b/queue-5.10/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 +@@ -19,7 +19,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"; + + /* + * Determine whether we're in secure boot mode. +@@ -53,8 +53,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, +@@ -63,7 +63,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-5.10/efi-x86-wipe-setup_data-on-pure-efi-boot.patch b/queue-5.10/efi-x86-wipe-setup_data-on-pure-efi-boot.patch new file mode 100644 index 00000000000..b75429364a0 --- /dev/null +++ b/queue-5.10/efi-x86-wipe-setup_data-on-pure-efi-boot.patch @@ -0,0 +1,56 @@ +From 63bf28ceb3ebbe76048c3fb2987996ca1ae64f83 Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Thu, 4 Aug 2022 15:39:48 +0200 +Subject: efi: x86: Wipe setup_data on pure EFI boot + +From: Ard Biesheuvel + +commit 63bf28ceb3ebbe76048c3fb2987996ca1ae64f83 upstream. + +When booting the x86 kernel via EFI using the LoadImage/StartImage boot +services [as opposed to the deprecated EFI handover protocol], the setup +header is taken from the image directly, and given that EFI's LoadImage +has no Linux/x86 specific knowledge regarding struct bootparams or +struct setup_header, any absolute addresses in the setup header must +originate from the file and not from a prior loading stage. + +Since we cannot generally predict where LoadImage() decides to load an +image (*), such absolute addresses must be treated as suspect: even if a +prior boot stage intended to make them point somewhere inside the +[signed] image, there is no way to validate that, and if they point at +an arbitrary location in memory, the setup_data nodes will not be +covered by any signatures or TPM measurements either, and could be made +to contain an arbitrary sequence of SETUP_xxx nodes, which could +interfere quite badly with the early x86 boot sequence. + +(*) Note that, while LoadImage() does take a buffer/size tuple in +addition to a device path, which can be used to provide the image +contents directly, it will re-allocate such images, as the memory +footprint of an image is generally larger than the PE/COFF file +representation. + +Cc: # v5.10+ +Link: https://lore.kernel.org/all/20220904165321.1140894-1-Jason@zx2c4.com/ +Signed-off-by: Ard Biesheuvel +Acked-by: Jason A. Donenfeld +Signed-off-by: Greg Kroah-Hartman +--- + drivers/firmware/efi/libstub/x86-stub.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/firmware/efi/libstub/x86-stub.c ++++ b/drivers/firmware/efi/libstub/x86-stub.c +@@ -414,6 +414,13 @@ efi_status_t __efiapi efi_pe_entry(efi_h + hdr->ramdisk_image = 0; + hdr->ramdisk_size = 0; + ++ /* ++ * Disregard any setup data that was provided by the bootloader: ++ * setup_data could be pointing anywhere, and we have no way of ++ * authenticating or validating the payload. ++ */ ++ hdr->setup_data = 0; ++ + efi_stub_entry(handle, sys_table_arg, boot_params); + /* not reached */ + diff --git a/queue-5.10/iommu-vt-d-check-correct-capability-for-sagaw-determination.patch b/queue-5.10/iommu-vt-d-check-correct-capability-for-sagaw-determination.patch new file mode 100644 index 00000000000..44155adb2de --- /dev/null +++ b/queue-5.10/iommu-vt-d-check-correct-capability-for-sagaw-determination.patch @@ -0,0 +1,38 @@ +From 154897807050c1161cb2660e502fc0470d46b986 Mon Sep 17 00:00:00 2001 +From: Yi Liu +Date: Wed, 21 Sep 2022 10:40:54 +0800 +Subject: iommu/vt-d: Check correct capability for sagaw determination + +From: Yi Liu + +commit 154897807050c1161cb2660e502fc0470d46b986 upstream. + +Check 5-level paging capability for 57 bits address width instead of +checking 1GB large page capability. + +Fixes: 53fc7ad6edf2 ("iommu/vt-d: Correctly calculate sagaw value of IOMMU") +Cc: stable@vger.kernel.org +Reported-by: Raghunathan Srinivasan +Signed-off-by: Yi Liu +Reviewed-by: Jerry Snitselaar +Reviewed-by: Kevin Tian +Reviewed-by: Raghunathan Srinivasan +Link: https://lore.kernel.org/r/20220916071212.2223869-2-yi.l.liu@intel.com +Signed-off-by: Lu Baolu +Signed-off-by: Joerg Roedel +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iommu/intel/iommu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/iommu/intel/iommu.c ++++ b/drivers/iommu/intel/iommu.c +@@ -569,7 +569,7 @@ static unsigned long __iommu_calculate_s + { + unsigned long fl_sagaw, sl_sagaw; + +- fl_sagaw = BIT(2) | (cap_fl1gp_support(iommu->cap) ? BIT(3) : 0); ++ fl_sagaw = BIT(2) | (cap_5lp_support(iommu->cap) ? BIT(3) : 0); + sl_sagaw = cap_sagaw(iommu->cap); + + /* Second level only. */ diff --git a/queue-5.10/media-flexcop-usb-fix-endpoint-type-check.patch b/queue-5.10/media-flexcop-usb-fix-endpoint-type-check.patch new file mode 100644 index 00000000000..d388432b77c --- /dev/null +++ b/queue-5.10/media-flexcop-usb-fix-endpoint-type-check.patch @@ -0,0 +1,38 @@ +From 763679f0eeff0185fc431498849bbc1c24460875 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Mon, 22 Aug 2022 17:10:27 +0200 +Subject: media: flexcop-usb: fix endpoint type check + +From: Johan Hovold + +commit 763679f0eeff0185fc431498849bbc1c24460875 upstream. + +Commit d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint +type") tried to add an endpoint type sanity check for the single +isochronous endpoint but instead broke the driver by checking the wrong +descriptor or random data beyond the last endpoint descriptor. + +Make sure to check the right endpoint descriptor. + +Fixes: d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint type") +Cc: Oliver Neukum +Cc: stable@vger.kernel.org # 5.9 +Reported-by: Dongliang Mu +Signed-off-by: Johan Hovold +Link: https://lore.kernel.org/r/20220822151027.27026-1-johan@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/media/usb/b2c2/flexcop-usb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/media/usb/b2c2/flexcop-usb.c ++++ b/drivers/media/usb/b2c2/flexcop-usb.c +@@ -512,7 +512,7 @@ static int flexcop_usb_init(struct flexc + + if (fc_usb->uintf->cur_altsetting->desc.bNumEndpoints < 1) + return -ENODEV; +- if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[1].desc)) ++ if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[0].desc)) + return -ENODEV; + + switch (fc_usb->udev->speed) { diff --git a/queue-5.10/series b/queue-5.10/series index 21b19f1929f..e509cc65534 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -41,3 +41,15 @@ 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-add-quirk-for-huawei-wrt-wx9.patch +alsa-hda-realtek-enable-4-speaker-output-dell-precision-5570-laptop.patch +alsa-hda-realtek-re-arrange-quirk-table-entries.patch +alsa-hda-realtek-add-pincfg-for-asus-g513-hp-jack.patch +alsa-hda-realtek-add-pincfg-for-asus-g533z-hp-jack.patch +alsa-hda-realtek-add-quirk-for-asus-ga503r-laptop.patch +alsa-hda-realtek-enable-4-speaker-output-dell-precision-5530-laptop.patch +iommu-vt-d-check-correct-capability-for-sagaw-determination.patch +media-flexcop-usb-fix-endpoint-type-check.patch +efi-x86-wipe-setup_data-on-pure-efi-boot.patch +efi-libstub-check-shim-mode-using-moksbstatert.patch -- 2.47.3