From 84196b580050f1f881cd49b6b83eedaf1fcc0e5f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 29 May 2021 15:54:05 +0200 Subject: [PATCH] 5.10-stable patches added patches: alsa-hda-realtek-chain-in-pop-reduction-fixup-for-thinkstation-p340.patch alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-15-g8.patch alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-17-g8.patch alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-g8.patch alsa-hda-realtek-fix-mute-micmute-leds-for-hp-855-g8.patch alsa-hda-realtek-headphone-volume-is-controlled-by-front-mixer.patch alsa-hda-realtek-the-bass-speaker-can-t-output-sound-on-yoga-9i.patch alsa-usb-audio-scarlett2-fix-device-hang-with-ehci-pci.patch alsa-usb-audio-scarlett2-improve-driver-startup-messages.patch cifs-set-server-cipher_type-to-aes-128-ccm-for-smb3.0.patch iommu-vt-d-fix-sysfs-leak-in-alloc_iommu.patch nfsv4-fix-a-null-pointer-dereference-in-pnfs_mark_matching_lsegs_return.patch --- ...eduction-fixup-for-thinkstation-p340.patch | 66 ++++++++ ...-and-speaker-for-hp-zbook-fury-15-g8.patch | 33 ++++ ...-and-speaker-for-hp-zbook-fury-17-g8.patch | 33 ++++ ...ute-leds-and-speaker-for-hp-zbook-g8.patch | 33 ++++ ...-fix-mute-micmute-leds-for-hp-855-g8.patch | 32 ++++ ...-volume-is-controlled-by-front-mixer.patch | 70 +++++++++ ...peaker-can-t-output-sound-on-yoga-9i.patch | 65 ++++++++ ...rlett2-fix-device-hang-with-ehci-pci.patch | 34 ++++ ...ett2-improve-driver-startup-messages.patch | 145 ++++++++++++++++++ ...ipher_type-to-aes-128-ccm-for-smb3.0.patch | 48 ++++++ ...u-vt-d-fix-sysfs-leak-in-alloc_iommu.patch | 44 ++++++ ...e-in-pnfs_mark_matching_lsegs_return.patch | 60 ++++++++ queue-5.10/series | 12 ++ 13 files changed, 675 insertions(+) create mode 100644 queue-5.10/alsa-hda-realtek-chain-in-pop-reduction-fixup-for-thinkstation-p340.patch create mode 100644 queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-15-g8.patch create mode 100644 queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-17-g8.patch create mode 100644 queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-g8.patch create mode 100644 queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-for-hp-855-g8.patch create mode 100644 queue-5.10/alsa-hda-realtek-headphone-volume-is-controlled-by-front-mixer.patch create mode 100644 queue-5.10/alsa-hda-realtek-the-bass-speaker-can-t-output-sound-on-yoga-9i.patch create mode 100644 queue-5.10/alsa-usb-audio-scarlett2-fix-device-hang-with-ehci-pci.patch create mode 100644 queue-5.10/alsa-usb-audio-scarlett2-improve-driver-startup-messages.patch create mode 100644 queue-5.10/cifs-set-server-cipher_type-to-aes-128-ccm-for-smb3.0.patch create mode 100644 queue-5.10/iommu-vt-d-fix-sysfs-leak-in-alloc_iommu.patch create mode 100644 queue-5.10/nfsv4-fix-a-null-pointer-dereference-in-pnfs_mark_matching_lsegs_return.patch diff --git a/queue-5.10/alsa-hda-realtek-chain-in-pop-reduction-fixup-for-thinkstation-p340.patch b/queue-5.10/alsa-hda-realtek-chain-in-pop-reduction-fixup-for-thinkstation-p340.patch new file mode 100644 index 00000000000..5e93d98196b --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-chain-in-pop-reduction-fixup-for-thinkstation-p340.patch @@ -0,0 +1,66 @@ +From 29c8f40b54a45dd23971e2bc395697731bcffbe1 Mon Sep 17 00:00:00 2001 +From: Peter Ujfalusi +Date: Mon, 24 May 2021 23:37:26 +0300 +Subject: ALSA: hda/realtek: Chain in pop reduction fixup for ThinkStation P340 + +From: Peter Ujfalusi + +commit 29c8f40b54a45dd23971e2bc395697731bcffbe1 upstream. + +Lenovo ThinkStation P340 uses ALC623 codec (SSID 17aa:1048) and it produces +bug plock/pop noise over line out (green jack on the back) which can be +fixed by applying ALC269_FIXUP_NO_SHUTUP tot he machine. + +Convert the existing entry for the same SSID to chain to apply this fixup +as well. + +Suggested-by: Takashi Iwai +Signed-off-by: Peter Ujfalusi +Cc: +Link: https://lore.kernel.org/r/20210524203726.2278-1-peter.ujfalusi@linux.intel.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -6559,6 +6559,7 @@ enum { + ALC295_FIXUP_HP_OMEN, + ALC285_FIXUP_HP_SPECTRE_X360, + ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, ++ ALC623_FIXUP_LENOVO_THINKSTATION_P340, + }; + + static const struct hda_fixup alc269_fixups[] = { +@@ -8125,6 +8126,12 @@ static const struct hda_fixup alc269_fix + .chained = true, + .chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK, + }, ++ [ALC623_FIXUP_LENOVO_THINKSTATION_P340] = { ++ .type = HDA_FIXUP_FUNC, ++ .v.func = alc_fixup_no_shutup, ++ .chained = true, ++ .chain_id = ALC283_FIXUP_HEADSET_MIC, ++ }, + }; + + static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -8442,7 +8449,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1558, 0xc019, "Clevo NH77D[BE]Q", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0xc022, "Clevo NH77[DC][QW]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS), +- SND_PCI_QUIRK(0x17aa, 0x1048, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC), ++ SND_PCI_QUIRK(0x17aa, 0x1048, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340), + SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE), + SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE), + SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE), +@@ -8709,6 +8716,7 @@ static const struct hda_model_fixup alc2 + {.id = ALC295_FIXUP_HP_OMEN, .name = "alc295-hp-omen"}, + {.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"}, + {.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"}, ++ {.id = ALC623_FIXUP_LENOVO_THINKSTATION_P340, .name = "alc623-lenovo-thinkstation-p340"}, + {} + }; + #define ALC225_STANDARD_PINS \ diff --git a/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-15-g8.patch b/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-15-g8.patch new file mode 100644 index 00000000000..6b57a3089e7 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-15-g8.patch @@ -0,0 +1,33 @@ +From e650c1a959da49f2b873cb56564b825882c22e7a Mon Sep 17 00:00:00 2001 +From: Jeremy Szu +Date: Thu, 20 May 2021 01:03:55 +0800 +Subject: ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook Fury 15 G8 + +From: Jeremy Szu + +commit e650c1a959da49f2b873cb56564b825882c22e7a upstream. + +The HP ZBook Fury 15.6 Inch G8 is using ALC285 codec which is +using 0x04 to control mute LED and 0x01 to control micmute LED. +In the other hand, there is no output from right channel of speaker. +Therefore, add a quirk to make it works. + +Signed-off-by: Jeremy Szu +Cc: +Link: https://lore.kernel.org/r/20210519170357.58410-3-jeremy.szu@canonical.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 +@@ -8314,6 +8314,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP), + SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED), ++ SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED), + SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC), diff --git a/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-17-g8.patch b/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-17-g8.patch new file mode 100644 index 00000000000..89a3ead5bd3 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-17-g8.patch @@ -0,0 +1,33 @@ +From 50dbfae972cbe0e3c631e73c7c58cbc48bfc6a49 Mon Sep 17 00:00:00 2001 +From: Jeremy Szu +Date: Thu, 20 May 2021 01:03:56 +0800 +Subject: ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook Fury 17 G8 + +From: Jeremy Szu + +commit 50dbfae972cbe0e3c631e73c7c58cbc48bfc6a49 upstream. + +The HP ZBook Studio 17.3 Inch G8 is using ALC285 codec which is +using 0x04 to control mute LED and 0x01 to control micmute LED. +In the other hand, there is no output from right channel of speaker. +Therefore, add a quirk to make it works. + +Signed-off-by: Jeremy Szu +Cc: +Link: https://lore.kernel.org/r/20210519170357.58410-4-jeremy.szu@canonical.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 +@@ -8314,6 +8314,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP), + SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED), ++ SND_PCI_QUIRK(0x103c, 0x886d, "HP ZBook Fury 17.3 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED), diff --git a/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-g8.patch b/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-g8.patch new file mode 100644 index 00000000000..dbf27bba880 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-g8.patch @@ -0,0 +1,33 @@ +From bbe183e07817a46cf8d3d7fc88093df81d23a957 Mon Sep 17 00:00:00 2001 +From: Jeremy Szu +Date: Thu, 20 May 2021 01:03:54 +0800 +Subject: ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook G8 + +From: Jeremy Szu + +commit bbe183e07817a46cf8d3d7fc88093df81d23a957 upstream. + +The HP ZBook Studio 15.6 Inch G8 is using ALC285 codec which is +using 0x04 to control mute LED and 0x01 to control micmute LED. +In the other hand, there is no output from right channel of speaker. +Therefore, add a quirk to make it works. + +Signed-off-by: Jeremy Szu +Cc: +Link: https://lore.kernel.org/r/20210519170357.58410-2-jeremy.szu@canonical.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 +@@ -8314,6 +8314,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP), + SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED), ++ SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT), + SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED), + SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC), + SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300), diff --git a/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-for-hp-855-g8.patch b/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-for-hp-855-g8.patch new file mode 100644 index 00000000000..7f01cc0dfbc --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-fix-mute-micmute-leds-for-hp-855-g8.patch @@ -0,0 +1,32 @@ +From 0e68c4b11f1e66d211ad242007e9f1076a6b7709 Mon Sep 17 00:00:00 2001 +From: Jeremy Szu +Date: Thu, 20 May 2021 01:03:53 +0800 +Subject: ALSA: hda/realtek: fix mute/micmute LEDs for HP 855 G8 + +From: Jeremy Szu + +commit 0e68c4b11f1e66d211ad242007e9f1076a6b7709 upstream. + +The HP EliteBook 855 G8 Notebook PC is using ALC285 codec which needs +ALC285_FIXUP_HP_MUTE_LED fixup to make it works. After applying the +fixup, the mute/micmute LEDs work good. + +Signed-off-by: Jeremy Szu +Cc: +Link: https://lore.kernel.org/r/20210519170357.58410-1-jeremy.szu@canonical.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 +@@ -8314,6 +8314,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP), + SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED), ++ SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED), + SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC), + SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300), + SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), diff --git a/queue-5.10/alsa-hda-realtek-headphone-volume-is-controlled-by-front-mixer.patch b/queue-5.10/alsa-hda-realtek-headphone-volume-is-controlled-by-front-mixer.patch new file mode 100644 index 00000000000..306f775fdc1 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-headphone-volume-is-controlled-by-front-mixer.patch @@ -0,0 +1,70 @@ +From 119b75c150773425a89033215eab4d15d4198f8b Mon Sep 17 00:00:00 2001 +From: Hui Wang +Date: Sat, 22 May 2021 11:47:41 +0800 +Subject: ALSA: hda/realtek: Headphone volume is controlled by Front mixer + +From: Hui Wang + +commit 119b75c150773425a89033215eab4d15d4198f8b upstream. + +On some ASUS and MSI machines, the audio codec is alc1220 and the +Headphone is connected to audio mixer 0xf and DAC 0x5, in theory +the Headphone volume is controlled by DAC 0x5 (Heapdhone Playback +Volume), but somehow it is controlled by DAC 0x2 (Front Playback +Volume), maybe this is a defect on the codec alc1220. + +Because of this issue, the PA couldn't switch the headphone and +Lineout correctly, If we apply the quirk CLEVO_P950 to those machines, +the Lineout and Headphone will share the audio mixer 0xc and DAC 0x2, +and generate Headphone+LO mixer, then PA could handle them when +switching between them. + +BugLink: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1206 +Cc: +Signed-off-by: Hui Wang +Link: https://lore.kernel.org/r/20210522034741.13415-1-hui.wang@canonical.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -2603,6 +2603,28 @@ static const struct hda_model_fixup alc8 + {} + }; + ++static const struct snd_hda_pin_quirk alc882_pin_fixup_tbl[] = { ++ SND_HDA_PIN_QUIRK(0x10ec1220, 0x1043, "ASUS", ALC1220_FIXUP_CLEVO_P950, ++ {0x14, 0x01014010}, ++ {0x15, 0x01011012}, ++ {0x16, 0x01016011}, ++ {0x18, 0x01a19040}, ++ {0x19, 0x02a19050}, ++ {0x1a, 0x0181304f}, ++ {0x1b, 0x0221401f}, ++ {0x1e, 0x01456130}), ++ SND_HDA_PIN_QUIRK(0x10ec1220, 0x1462, "MS-7C35", ALC1220_FIXUP_CLEVO_P950, ++ {0x14, 0x01015010}, ++ {0x15, 0x01011012}, ++ {0x16, 0x01011011}, ++ {0x18, 0x01a11040}, ++ {0x19, 0x02a19050}, ++ {0x1a, 0x0181104f}, ++ {0x1b, 0x0221401f}, ++ {0x1e, 0x01451130}), ++ {} ++}; ++ + /* + * BIOS auto configuration + */ +@@ -2644,6 +2666,7 @@ static int patch_alc882(struct hda_codec + + snd_hda_pick_fixup(codec, alc882_fixup_models, alc882_fixup_tbl, + alc882_fixups); ++ snd_hda_pick_pin_fixup(codec, alc882_pin_fixup_tbl, alc882_fixups, true); + snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); + + alc_auto_parse_customize_define(codec); diff --git a/queue-5.10/alsa-hda-realtek-the-bass-speaker-can-t-output-sound-on-yoga-9i.patch b/queue-5.10/alsa-hda-realtek-the-bass-speaker-can-t-output-sound-on-yoga-9i.patch new file mode 100644 index 00000000000..098076b80da --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-the-bass-speaker-can-t-output-sound-on-yoga-9i.patch @@ -0,0 +1,65 @@ +From 9ebaef0540a981093bce5df15af32354d32391d9 Mon Sep 17 00:00:00 2001 +From: Hui Wang +Date: Sat, 22 May 2021 12:26:45 +0800 +Subject: ALSA: hda/realtek: the bass speaker can't output sound on Yoga 9i + +From: Hui Wang + +commit 9ebaef0540a981093bce5df15af32354d32391d9 upstream. + +The Lenovo Yoga 9i has bass speaker, but the bass speaker can't work, +that is because there is an i2s amplifier on that speaker, need to +run ideapad_s740_coef() to initialize the amplifier. + +And also needs to apply ALC285_FIXUP_THINKPAD_HEADSET_JACK to rename +the speaker's mixer control name, otherwise the PA can't handle them. + +BugLink: http://bugs.launchpad.net/bugs/1926165 +Signed-off-by: Hui Wang +Cc: +Link: https://lore.kernel.org/r/20210522042645.14221-1-hui.wang@canonical.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -6535,6 +6535,7 @@ enum { + ALC295_FIXUP_ASUS_DACS, + ALC295_FIXUP_HP_OMEN, + ALC285_FIXUP_HP_SPECTRE_X360, ++ ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, + }; + + static const struct hda_fixup alc269_fixups[] = { +@@ -8095,6 +8096,12 @@ static const struct hda_fixup alc269_fix + .chained = true, + .chain_id = ALC285_FIXUP_SPEAKER2_TO_DAC1, + }, ++ [ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP] = { ++ .type = HDA_FIXUP_FUNC, ++ .v.func = alc285_fixup_ideapad_s740_coef, ++ .chained = true, ++ .chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK, ++ }, + }; + + static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -8462,6 +8469,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x17aa, 0x3178, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC), + SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940", ALC298_FIXUP_LENOVO_SPK_VOLUME), + SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF), ++ SND_PCI_QUIRK(0x17aa, 0x3843, "Yoga 9i", ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP), + SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), + SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), + SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI), +@@ -8677,6 +8685,7 @@ static const struct hda_model_fixup alc2 + {.id = ALC245_FIXUP_HP_X360_AMP, .name = "alc245-hp-x360-amp"}, + {.id = ALC295_FIXUP_HP_OMEN, .name = "alc295-hp-omen"}, + {.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"}, ++ {.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"}, + {} + }; + #define ALC225_STANDARD_PINS \ diff --git a/queue-5.10/alsa-usb-audio-scarlett2-fix-device-hang-with-ehci-pci.patch b/queue-5.10/alsa-usb-audio-scarlett2-fix-device-hang-with-ehci-pci.patch new file mode 100644 index 00000000000..aa5e418c4e9 --- /dev/null +++ b/queue-5.10/alsa-usb-audio-scarlett2-fix-device-hang-with-ehci-pci.patch @@ -0,0 +1,34 @@ +From 764fa6e686e0107c0357a988d193de04cf047583 Mon Sep 17 00:00:00 2001 +From: "Geoffrey D. Bennett" +Date: Fri, 21 May 2021 17:50:12 +0930 +Subject: ALSA: usb-audio: scarlett2: Fix device hang with ehci-pci + +From: Geoffrey D. Bennett + +commit 764fa6e686e0107c0357a988d193de04cf047583 upstream. + +Use usb_rcvctrlpipe() not usb_sndctrlpipe() for USB control input in +the Scarlett Gen 2 mixer driver. This fixes the device hang during +initialisation when used with the ehci-pci host driver. + +Fixes: 9e4d5c1be21f ("ALSA: usb-audio: Scarlett Gen 2 mixer interface") +Signed-off-by: Geoffrey D. Bennett +Cc: +Link: https://lore.kernel.org/r/66a3d05dac325d5b53e4930578e143cef1f50dbe.1621584566.git.g@b4.vu +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/usb/mixer_scarlett_gen2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/usb/mixer_scarlett_gen2.c ++++ b/sound/usb/mixer_scarlett_gen2.c +@@ -635,7 +635,7 @@ static int scarlett2_usb( + /* send a second message to get the response */ + + err = snd_usb_ctl_msg(mixer->chip->dev, +- usb_sndctrlpipe(mixer->chip->dev, 0), ++ usb_rcvctrlpipe(mixer->chip->dev, 0), + SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, + 0, diff --git a/queue-5.10/alsa-usb-audio-scarlett2-improve-driver-startup-messages.patch b/queue-5.10/alsa-usb-audio-scarlett2-improve-driver-startup-messages.patch new file mode 100644 index 00000000000..bcf11b04b78 --- /dev/null +++ b/queue-5.10/alsa-usb-audio-scarlett2-improve-driver-startup-messages.patch @@ -0,0 +1,145 @@ +From 265d1a90e4fb6d3264d8122fbd10760e5e733be6 Mon Sep 17 00:00:00 2001 +From: "Geoffrey D. Bennett" +Date: Fri, 21 May 2021 17:50:13 +0930 +Subject: ALSA: usb-audio: scarlett2: Improve driver startup messages + +From: Geoffrey D. Bennett + +commit 265d1a90e4fb6d3264d8122fbd10760e5e733be6 upstream. + +Add separate init function to call the existing controls_create +function so a custom error can be displayed if initialisation fails. + +Use info level instead of error for notifications. + +Display the VID/PID so device_setup is targeted to the right device. + +Display "enabled" message to easily confirm that the driver is loaded. + +Signed-off-by: Geoffrey D. Bennett +Cc: +Link: https://lore.kernel.org/r/b5d140c65f640faf2427e085fbbc0297b32e5fce.1621584566.git.g@b4.vu +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/usb/mixer_quirks.c | 2 - + sound/usb/mixer_scarlett_gen2.c | 79 +++++++++++++++++++++++++--------------- + sound/usb/mixer_scarlett_gen2.h | 2 - + 3 files changed, 52 insertions(+), 31 deletions(-) + +--- a/sound/usb/mixer_quirks.c ++++ b/sound/usb/mixer_quirks.c +@@ -3017,7 +3017,7 @@ int snd_usb_mixer_apply_create_quirk(str + case USB_ID(0x1235, 0x8203): /* Focusrite Scarlett 6i6 2nd Gen */ + case USB_ID(0x1235, 0x8204): /* Focusrite Scarlett 18i8 2nd Gen */ + case USB_ID(0x1235, 0x8201): /* Focusrite Scarlett 18i20 2nd Gen */ +- err = snd_scarlett_gen2_controls_create(mixer); ++ err = snd_scarlett_gen2_init(mixer); + break; + + case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */ +--- a/sound/usb/mixer_scarlett_gen2.c ++++ b/sound/usb/mixer_scarlett_gen2.c +@@ -1997,38 +1997,11 @@ static int scarlett2_mixer_status_create + return usb_submit_urb(mixer->urb, GFP_KERNEL); + } + +-/* Entry point */ +-int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer) ++int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer, ++ const struct scarlett2_device_info *info) + { +- const struct scarlett2_device_info *info; + int err; + +- /* only use UAC_VERSION_2 */ +- if (!mixer->protocol) +- return 0; +- +- switch (mixer->chip->usb_id) { +- case USB_ID(0x1235, 0x8203): +- info = &s6i6_gen2_info; +- break; +- case USB_ID(0x1235, 0x8204): +- info = &s18i8_gen2_info; +- break; +- case USB_ID(0x1235, 0x8201): +- info = &s18i20_gen2_info; +- break; +- default: /* device not (yet) supported */ +- return -EINVAL; +- } +- +- if (!(mixer->chip->setup & SCARLETT2_ENABLE)) { +- usb_audio_err(mixer->chip, +- "Focusrite Scarlett Gen 2 Mixer Driver disabled; " +- "use options snd_usb_audio device_setup=1 " +- "to enable and report any issues to g@b4.vu"); +- return 0; +- } +- + /* Initialise private data, routing, sequence number */ + err = scarlett2_init_private(mixer, info); + if (err < 0) +@@ -2073,3 +2046,51 @@ int snd_scarlett_gen2_controls_create(st + + return 0; + } ++ ++int snd_scarlett_gen2_init(struct usb_mixer_interface *mixer) ++{ ++ struct snd_usb_audio *chip = mixer->chip; ++ const struct scarlett2_device_info *info; ++ int err; ++ ++ /* only use UAC_VERSION_2 */ ++ if (!mixer->protocol) ++ return 0; ++ ++ switch (chip->usb_id) { ++ case USB_ID(0x1235, 0x8203): ++ info = &s6i6_gen2_info; ++ break; ++ case USB_ID(0x1235, 0x8204): ++ info = &s18i8_gen2_info; ++ break; ++ case USB_ID(0x1235, 0x8201): ++ info = &s18i20_gen2_info; ++ break; ++ default: /* device not (yet) supported */ ++ return -EINVAL; ++ } ++ ++ if (!(chip->setup & SCARLETT2_ENABLE)) { ++ usb_audio_info(chip, ++ "Focusrite Scarlett Gen 2 Mixer Driver disabled; " ++ "use options snd_usb_audio vid=0x%04x pid=0x%04x " ++ "device_setup=1 to enable and report any issues " ++ "to g@b4.vu", ++ USB_ID_VENDOR(chip->usb_id), ++ USB_ID_PRODUCT(chip->usb_id)); ++ return 0; ++ } ++ ++ usb_audio_info(chip, ++ "Focusrite Scarlett Gen 2 Mixer Driver enabled pid=0x%04x", ++ USB_ID_PRODUCT(chip->usb_id)); ++ ++ err = snd_scarlett_gen2_controls_create(mixer, info); ++ if (err < 0) ++ usb_audio_err(mixer->chip, ++ "Error initialising Scarlett Mixer Driver: %d", ++ err); ++ ++ return err; ++} +--- a/sound/usb/mixer_scarlett_gen2.h ++++ b/sound/usb/mixer_scarlett_gen2.h +@@ -2,6 +2,6 @@ + #ifndef __USB_MIXER_SCARLETT_GEN2_H + #define __USB_MIXER_SCARLETT_GEN2_H + +-int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer); ++int snd_scarlett_gen2_init(struct usb_mixer_interface *mixer); + + #endif /* __USB_MIXER_SCARLETT_GEN2_H */ diff --git a/queue-5.10/cifs-set-server-cipher_type-to-aes-128-ccm-for-smb3.0.patch b/queue-5.10/cifs-set-server-cipher_type-to-aes-128-ccm-for-smb3.0.patch new file mode 100644 index 00000000000..29636f9be6e --- /dev/null +++ b/queue-5.10/cifs-set-server-cipher_type-to-aes-128-ccm-for-smb3.0.patch @@ -0,0 +1,48 @@ +From 6d2fcfe6b517fe7cbf2687adfb0a16cdcd5d9243 Mon Sep 17 00:00:00 2001 +From: Aurelien Aptel +Date: Fri, 21 May 2021 17:19:27 +0200 +Subject: cifs: set server->cipher_type to AES-128-CCM for SMB3.0 + +From: Aurelien Aptel + +commit 6d2fcfe6b517fe7cbf2687adfb0a16cdcd5d9243 upstream. + +SMB3.0 doesn't have encryption negotiate context but simply uses +the SMB2_GLOBAL_CAP_ENCRYPTION flag. + +When that flag is present in the neg response cifs.ko uses AES-128-CCM +which is the only cipher available in this context. + +cipher_type was set to the server cipher only when parsing encryption +negotiate context (SMB3.1.1). + +For SMB3.0 it was set to 0. This means cipher_type value can be 0 or 1 +for AES-128-CCM. + +Fix this by checking for SMB3.0 and encryption capability and setting +cipher_type appropriately. + +Signed-off-by: Aurelien Aptel +Cc: +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman +--- + fs/cifs/smb2pdu.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/fs/cifs/smb2pdu.c ++++ b/fs/cifs/smb2pdu.c +@@ -951,6 +951,13 @@ SMB2_negotiate(const unsigned int xid, s + /* Internal types */ + server->capabilities |= SMB2_NT_FIND | SMB2_LARGE_FILES; + ++ /* ++ * SMB3.0 supports only 1 cipher and doesn't have a encryption neg context ++ * Set the cipher type manually. ++ */ ++ if (server->dialect == SMB30_PROT_ID && (server->capabilities & SMB2_GLOBAL_CAP_ENCRYPTION)) ++ server->cipher_type = SMB2_ENCRYPTION_AES128_CCM; ++ + security_blob = smb2_get_data_area_len(&blob_offset, &blob_length, + (struct smb2_sync_hdr *)rsp); + /* diff --git a/queue-5.10/iommu-vt-d-fix-sysfs-leak-in-alloc_iommu.patch b/queue-5.10/iommu-vt-d-fix-sysfs-leak-in-alloc_iommu.patch new file mode 100644 index 00000000000..8b5fb263138 --- /dev/null +++ b/queue-5.10/iommu-vt-d-fix-sysfs-leak-in-alloc_iommu.patch @@ -0,0 +1,44 @@ +From 0ee74d5a48635c848c20f152d0d488bf84641304 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer +Date: Tue, 25 May 2021 15:08:02 +0800 +Subject: iommu/vt-d: Fix sysfs leak in alloc_iommu() + +From: Rolf Eike Beer + +commit 0ee74d5a48635c848c20f152d0d488bf84641304 upstream. + +iommu_device_sysfs_add() is called before, so is has to be cleaned on subsequent +errors. + +Fixes: 39ab9555c2411 ("iommu: Add sysfs bindings for struct iommu_device") +Cc: stable@vger.kernel.org # 4.11.x +Signed-off-by: Rolf Eike Beer +Acked-by: Lu Baolu +Link: https://lore.kernel.org/r/17411490.HIIP88n32C@mobilepool36.emlix.com +Link: https://lore.kernel.org/r/20210525070802.361755-2-baolu.lu@linux.intel.com +Signed-off-by: Joerg Roedel +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iommu/intel/dmar.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/iommu/intel/dmar.c ++++ b/drivers/iommu/intel/dmar.c +@@ -1137,7 +1137,7 @@ static int alloc_iommu(struct dmar_drhd_ + + err = iommu_device_register(&iommu->iommu); + if (err) +- goto err_unmap; ++ goto err_sysfs; + } + + drhd->iommu = iommu; +@@ -1145,6 +1145,8 @@ static int alloc_iommu(struct dmar_drhd_ + + return 0; + ++err_sysfs: ++ iommu_device_sysfs_remove(&iommu->iommu); + err_unmap: + unmap_iommu(iommu); + error_free_seq_id: diff --git a/queue-5.10/nfsv4-fix-a-null-pointer-dereference-in-pnfs_mark_matching_lsegs_return.patch b/queue-5.10/nfsv4-fix-a-null-pointer-dereference-in-pnfs_mark_matching_lsegs_return.patch new file mode 100644 index 00000000000..6c35712a03b --- /dev/null +++ b/queue-5.10/nfsv4-fix-a-null-pointer-dereference-in-pnfs_mark_matching_lsegs_return.patch @@ -0,0 +1,60 @@ +From a421d218603ffa822a0b8045055c03eae394a7eb Mon Sep 17 00:00:00 2001 +From: Anna Schumaker +Date: Wed, 19 May 2021 12:54:51 -0400 +Subject: NFSv4: Fix a NULL pointer dereference in pnfs_mark_matching_lsegs_return() + +From: Anna Schumaker + +commit a421d218603ffa822a0b8045055c03eae394a7eb upstream. + +Commit de144ff4234f changes _pnfs_return_layout() to call +pnfs_mark_matching_lsegs_return() passing NULL as the struct +pnfs_layout_range argument. Unfortunately, +pnfs_mark_matching_lsegs_return() doesn't check if we have a value here +before dereferencing it, causing an oops. + +I'm able to hit this crash consistently when running connectathon basic +tests on NFS v4.1/v4.2 against Ontap. + +Fixes: de144ff4234f ("NFSv4: Don't discard segments marked for return in _pnfs_return_layout()") +Cc: stable@vger.kernel.org +Signed-off-by: Anna Schumaker +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman +--- + fs/nfs/pnfs.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +--- a/fs/nfs/pnfs.c ++++ b/fs/nfs/pnfs.c +@@ -1317,6 +1317,11 @@ _pnfs_return_layout(struct inode *ino) + { + struct pnfs_layout_hdr *lo = NULL; + struct nfs_inode *nfsi = NFS_I(ino); ++ struct pnfs_layout_range range = { ++ .iomode = IOMODE_ANY, ++ .offset = 0, ++ .length = NFS4_MAX_UINT64, ++ }; + LIST_HEAD(tmp_list); + const struct cred *cred; + nfs4_stateid stateid; +@@ -1344,16 +1349,10 @@ _pnfs_return_layout(struct inode *ino) + } + valid_layout = pnfs_layout_is_valid(lo); + pnfs_clear_layoutcommit(ino, &tmp_list); +- pnfs_mark_matching_lsegs_return(lo, &tmp_list, NULL, 0); ++ pnfs_mark_matching_lsegs_return(lo, &tmp_list, &range, 0); + +- if (NFS_SERVER(ino)->pnfs_curr_ld->return_range) { +- struct pnfs_layout_range range = { +- .iomode = IOMODE_ANY, +- .offset = 0, +- .length = NFS4_MAX_UINT64, +- }; ++ if (NFS_SERVER(ino)->pnfs_curr_ld->return_range) + NFS_SERVER(ino)->pnfs_curr_ld->return_range(lo, &range); +- } + + /* Don't send a LAYOUTRETURN if list was initially empty */ + if (!test_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags) || diff --git a/queue-5.10/series b/queue-5.10/series index 26cc816f71d..c5428777711 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -1,3 +1,15 @@ +alsa-hda-realtek-the-bass-speaker-can-t-output-sound-on-yoga-9i.patch +alsa-hda-realtek-headphone-volume-is-controlled-by-front-mixer.patch +alsa-hda-realtek-chain-in-pop-reduction-fixup-for-thinkstation-p340.patch +alsa-hda-realtek-fix-mute-micmute-leds-for-hp-855-g8.patch +alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-g8.patch +alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-15-g8.patch +alsa-hda-realtek-fix-mute-micmute-leds-and-speaker-for-hp-zbook-fury-17-g8.patch +alsa-usb-audio-scarlett2-fix-device-hang-with-ehci-pci.patch +alsa-usb-audio-scarlett2-improve-driver-startup-messages.patch +cifs-set-server-cipher_type-to-aes-128-ccm-for-smb3.0.patch +nfsv4-fix-a-null-pointer-dereference-in-pnfs_mark_matching_lsegs_return.patch +iommu-vt-d-fix-sysfs-leak-in-alloc_iommu.patch selftests-gpio-use-test_gen_progs_extended.patch selftests-gpio-move-include-of-lib.mk-up.patch selftests-gpio-fix-build-when-source-tree-is-read-on.patch -- 2.47.3