From: Greg Kroah-Hartman Date: Mon, 13 Jun 2022 07:10:32 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v4.9.318~61 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c25e20d59425e7c858f427c198820b83f360e71;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: alsa-hda-conexant-fix-loopback-issue-with-cx20632.patch alsa-hda-realtek-fix-for-quirk-to-enable-speaker-output-on-the-lenovo-yoga-duetitl-2021.patch cifs-fix-reconnect-on-smb3-mount-types.patch cifs-return-errors-during-session-setup-during-reconnects.patch --- diff --git a/queue-5.10/alsa-hda-conexant-fix-loopback-issue-with-cx20632.patch b/queue-5.10/alsa-hda-conexant-fix-loopback-issue-with-cx20632.patch new file mode 100644 index 00000000000..98006a48ed4 --- /dev/null +++ b/queue-5.10/alsa-hda-conexant-fix-loopback-issue-with-cx20632.patch @@ -0,0 +1,37 @@ +From d5ea7544c32ba27c2c5826248e4ff58bd50a2518 Mon Sep 17 00:00:00 2001 +From: huangwenhui +Date: Tue, 7 Jun 2022 14:56:31 +0800 +Subject: ALSA: hda/conexant - Fix loopback issue with CX20632 + +From: huangwenhui + +commit d5ea7544c32ba27c2c5826248e4ff58bd50a2518 upstream. + +On a machine with CX20632, Alsamixer doesn't have 'Loopback +Mixing' and 'Line'. + +Signed-off-by: huangwenhui +Cc: +Link: https://lore.kernel.org/r/20220607065631.10708-1-huangwenhuia@uniontech.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_conexant.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/sound/pci/hda/patch_conexant.c ++++ b/sound/pci/hda/patch_conexant.c +@@ -1045,6 +1045,13 @@ static int patch_conexant_auto(struct hd + snd_hda_pick_fixup(codec, cxt5051_fixup_models, + cxt5051_fixups, cxt_fixups); + break; ++ case 0x14f15098: ++ codec->pin_amp_workaround = 1; ++ spec->gen.mixer_nid = 0x22; ++ spec->gen.add_stereo_mix_input = HDA_HINT_STEREO_MIX_AUTO; ++ snd_hda_pick_fixup(codec, cxt5066_fixup_models, ++ cxt5066_fixups, cxt_fixups); ++ break; + case 0x14f150f2: + codec->power_save_node = 1; + fallthrough; diff --git a/queue-5.10/alsa-hda-realtek-fix-for-quirk-to-enable-speaker-output-on-the-lenovo-yoga-duetitl-2021.patch b/queue-5.10/alsa-hda-realtek-fix-for-quirk-to-enable-speaker-output-on-the-lenovo-yoga-duetitl-2021.patch new file mode 100644 index 00000000000..ae817858577 --- /dev/null +++ b/queue-5.10/alsa-hda-realtek-fix-for-quirk-to-enable-speaker-output-on-the-lenovo-yoga-duetitl-2021.patch @@ -0,0 +1,35 @@ +From 85743a847caeab696dafc4ce1a7e1e2b7e29a0f6 Mon Sep 17 00:00:00 2001 +From: Cameron Berkenpas +Date: Sun, 5 Jun 2022 17:23:30 -0700 +Subject: ALSA: hda/realtek: Fix for quirk to enable speaker output on the Lenovo Yoga DuetITL 2021 + +From: Cameron Berkenpas + +commit 85743a847caeab696dafc4ce1a7e1e2b7e29a0f6 upstream. + +Enables the ALC287_FIXUP_YOGA7_14ITL_SPEAKERS quirk for the Lenovo +Yoga DuetITL 2021 laptop to fix speaker output. + +[ re-sorted in the SSID order by tiwai ] + +BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=208555 +Signed-off-by: Cameron Berkenpas +Co-authored-by: Songine +Cc: stable@vger.kernel.org> +Link: https://lore.kernel.org/r/20220606002329.215330-1-cam@neo-zeon.de +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 +@@ -8977,6 +8977,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x17aa, 0x3176, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC), + SND_PCI_QUIRK(0x17aa, 0x3178, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC), + SND_PCI_QUIRK(0x17aa, 0x31af, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340), ++ SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo Yoga DuetITL 2021", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940", ALC298_FIXUP_LENOVO_SPK_VOLUME), + SND_PCI_QUIRK(0x17aa, 0x3819, "Lenovo 13s Gen2 ITL", ALC287_FIXUP_13S_GEN2_SPEAKERS), diff --git a/queue-5.10/cifs-fix-reconnect-on-smb3-mount-types.patch b/queue-5.10/cifs-fix-reconnect-on-smb3-mount-types.patch new file mode 100644 index 00000000000..61c430f5f4d --- /dev/null +++ b/queue-5.10/cifs-fix-reconnect-on-smb3-mount-types.patch @@ -0,0 +1,88 @@ +From c36ee7dab7749f7be21f7a72392744490b2a9a2b Mon Sep 17 00:00:00 2001 +From: Paulo Alcantara +Date: Sun, 5 Jun 2022 19:54:26 -0300 +Subject: cifs: fix reconnect on smb3 mount types + +From: Paulo Alcantara + +commit c36ee7dab7749f7be21f7a72392744490b2a9a2b upstream. + +cifs.ko defines two file system types: cifs & smb3, and +__cifs_get_super() was not including smb3 file system type when +looking up superblocks, therefore failing to reconnect tcons in +cifs_tree_connect(). + +Fix this by calling iterate_supers_type() on both file system types. + +Link: https://lore.kernel.org/r/CAFrh3J9soC36+BVuwHB=g9z_KB5Og2+p2_W+BBoBOZveErz14w@mail.gmail.com +Cc: stable@vger.kernel.org +Tested-by: Satadru Pramanik +Reported-by: Satadru Pramanik +Signed-off-by: Paulo Alcantara (SUSE) +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman +--- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/misc.c | 27 ++++++++++++++++----------- + 3 files changed, 18 insertions(+), 13 deletions(-) + +--- a/fs/cifs/cifsfs.c ++++ b/fs/cifs/cifsfs.c +@@ -1033,7 +1033,7 @@ struct file_system_type cifs_fs_type = { + }; + MODULE_ALIAS_FS("cifs"); + +-static struct file_system_type smb3_fs_type = { ++struct file_system_type smb3_fs_type = { + .owner = THIS_MODULE, + .name = "smb3", + .mount = smb3_do_mount, +--- a/fs/cifs/cifsfs.h ++++ b/fs/cifs/cifsfs.h +@@ -51,7 +51,7 @@ static inline unsigned long cifs_get_tim + return (unsigned long) dentry->d_fsdata; + } + +-extern struct file_system_type cifs_fs_type; ++extern struct file_system_type cifs_fs_type, smb3_fs_type; + extern const struct address_space_operations cifs_addr_ops; + extern const struct address_space_operations cifs_addr_ops_smallbuf; + +--- a/fs/cifs/misc.c ++++ b/fs/cifs/misc.c +@@ -1053,18 +1053,23 @@ static struct super_block *__cifs_get_su + .data = data, + .sb = NULL, + }; ++ struct file_system_type **fs_type = (struct file_system_type *[]) { ++ &cifs_fs_type, &smb3_fs_type, NULL, ++ }; + +- iterate_supers_type(&cifs_fs_type, f, &sd); +- +- if (!sd.sb) +- return ERR_PTR(-EINVAL); +- /* +- * Grab an active reference in order to prevent automounts (DFS links) +- * of expiring and then freeing up our cifs superblock pointer while +- * we're doing failover. +- */ +- cifs_sb_active(sd.sb); +- return sd.sb; ++ for (; *fs_type; fs_type++) { ++ iterate_supers_type(*fs_type, f, &sd); ++ if (sd.sb) { ++ /* ++ * Grab an active reference in order to prevent automounts (DFS links) ++ * of expiring and then freeing up our cifs superblock pointer while ++ * we're doing failover. ++ */ ++ cifs_sb_active(sd.sb); ++ return sd.sb; ++ } ++ } ++ return ERR_PTR(-EINVAL); + } + + static void __cifs_put_super(struct super_block *sb) diff --git a/queue-5.10/cifs-return-errors-during-session-setup-during-reconnects.patch b/queue-5.10/cifs-return-errors-during-session-setup-during-reconnects.patch new file mode 100644 index 00000000000..60f5c1385f3 --- /dev/null +++ b/queue-5.10/cifs-return-errors-during-session-setup-during-reconnects.patch @@ -0,0 +1,37 @@ +From 8ea21823aa584b55ba4b861307093b78054b0c1b Mon Sep 17 00:00:00 2001 +From: Shyam Prasad N +Date: Tue, 31 May 2022 12:31:05 +0000 +Subject: cifs: return errors during session setup during reconnects + +From: Shyam Prasad N + +commit 8ea21823aa584b55ba4b861307093b78054b0c1b upstream. + +During reconnects, we check the return value from +cifs_negotiate_protocol, and have handlers for both success +and failures. But if that passes, and cifs_setup_session +returns any errors other than -EACCES, we do not handle +that. This fix adds a handler for that, so that we don't +go ahead and try a tree_connect on a failed session. + +Signed-off-by: Shyam Prasad N +Reviewed-by: Enzo Matsumiya +Cc: stable@vger.kernel.org +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman +--- + fs/cifs/smb2pdu.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/fs/cifs/smb2pdu.c ++++ b/fs/cifs/smb2pdu.c +@@ -281,6 +281,9 @@ smb2_reconnect(__le16 smb2_command, stru + ses->binding_chan = NULL; + mutex_unlock(&tcon->ses->session_mutex); + goto failed; ++ } else if (rc) { ++ mutex_unlock(&ses->session_mutex); ++ goto out; + } + } + /* diff --git a/queue-5.10/series b/queue-5.10/series index 579ead4edf8..58c47dc1565 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -149,3 +149,7 @@ cifs-version-operations-for-smb20-unneeded-when-lega.patch nodemask-fix-return-values-to-be-unsigned.patch vringh-fix-loop-descriptors-check-in-the-indirect-ca.patch scripts-gdb-change-kernel-config-dumping-method.patch +alsa-hda-conexant-fix-loopback-issue-with-cx20632.patch +alsa-hda-realtek-fix-for-quirk-to-enable-speaker-output-on-the-lenovo-yoga-duetitl-2021.patch +cifs-return-errors-during-session-setup-during-reconnects.patch +cifs-fix-reconnect-on-smb3-mount-types.patch