]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 May 2022 14:30:31 +0000 (16:30 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 May 2022 14:30:31 +0000 (16:30 +0200)
added patches:
alsa-hda-realtek-add-quirk-for-tongfang-devices-with-pop-noise.patch
alsa-usb-audio-restore-rane-sl-1-quirk.patch
alsa-wavefront-proper-check-of-get_user-error.patch

queue-5.15/alsa-hda-realtek-add-quirk-for-tongfang-devices-with-pop-noise.patch [new file with mode: 0644]
queue-5.15/alsa-usb-audio-restore-rane-sl-1-quirk.patch [new file with mode: 0644]
queue-5.15/alsa-wavefront-proper-check-of-get_user-error.patch [new file with mode: 0644]
queue-5.15/series

diff --git a/queue-5.15/alsa-hda-realtek-add-quirk-for-tongfang-devices-with-pop-noise.patch b/queue-5.15/alsa-hda-realtek-add-quirk-for-tongfang-devices-with-pop-noise.patch
new file mode 100644 (file)
index 0000000..6c7c373
--- /dev/null
@@ -0,0 +1,40 @@
+From 8b3b2392ed68bcd17c7eb84ca615ce1e5f115b99 Mon Sep 17 00:00:00 2001
+From: Werner Sembach <wse@tuxedocomputers.com>
+Date: Thu, 12 May 2022 20:09:56 +0200
+Subject: ALSA: hda/realtek: Add quirk for TongFang devices with pop noise
+
+From: Werner Sembach <wse@tuxedocomputers.com>
+
+commit 8b3b2392ed68bcd17c7eb84ca615ce1e5f115b99 upstream.
+
+When audio stops playing there is an audible "pop"-noise when using
+headphones on the TongFang GMxMRxx, GKxNRxx, GMxZGxx, GMxTGxx and GMxAGxx.
+
+This quirk fixes this mostly.
+
+Signed-off-by: Werner Sembach <wse@tuxedocomputers.com>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20220512180956.281804-1-wse@tuxedocomputers.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/hda/patch_realtek.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -9076,6 +9076,14 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x1c06, 0x2013, "Lemote A1802", ALC269_FIXUP_LEMOTE_A1802),
+       SND_PCI_QUIRK(0x1c06, 0x2015, "Lemote A190X", ALC269_FIXUP_LEMOTE_A190X),
+       SND_PCI_QUIRK(0x1d05, 0x1132, "TongFang PHxTxX1", ALC256_FIXUP_SET_COEF_DEFAULTS),
++      SND_PCI_QUIRK(0x1d05, 0x1096, "TongFang GMxMRxx", ALC269_FIXUP_NO_SHUTUP),
++      SND_PCI_QUIRK(0x1d05, 0x1100, "TongFang GKxNRxx", ALC269_FIXUP_NO_SHUTUP),
++      SND_PCI_QUIRK(0x1d05, 0x1111, "TongFang GMxZGxx", ALC269_FIXUP_NO_SHUTUP),
++      SND_PCI_QUIRK(0x1d05, 0x1119, "TongFang GMxZGxx", ALC269_FIXUP_NO_SHUTUP),
++      SND_PCI_QUIRK(0x1d05, 0x1129, "TongFang GMxZGxx", ALC269_FIXUP_NO_SHUTUP),
++      SND_PCI_QUIRK(0x1d05, 0x1147, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP),
++      SND_PCI_QUIRK(0x1d05, 0x115c, "TongFang GMxTGxx", ALC269_FIXUP_NO_SHUTUP),
++      SND_PCI_QUIRK(0x1d05, 0x121b, "TongFang GMxAGxx", ALC269_FIXUP_NO_SHUTUP),
+       SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),
diff --git a/queue-5.15/alsa-usb-audio-restore-rane-sl-1-quirk.patch b/queue-5.15/alsa-usb-audio-restore-rane-sl-1-quirk.patch
new file mode 100644 (file)
index 0000000..b7af9c9
--- /dev/null
@@ -0,0 +1,45 @@
+From 5c62383c06837b5719cd5447a5758b791279e653 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 16 May 2022 12:31:12 +0200
+Subject: ALSA: usb-audio: Restore Rane SL-1 quirk
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 5c62383c06837b5719cd5447a5758b791279e653 upstream.
+
+At cleaning up and moving the device rename from the quirk table to
+its own table, we removed the entry for Rane SL-1 as we thought it's
+only for renaming.  It turned out, however, that the quirk is required
+for matching with the device that declares itself as no standard
+audio but only as vendor-specific.
+
+Restore the quirk entry for Rane SL-1 to fix the regression.
+
+BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=215887
+Fixes: 5436f59bc5bc ("ALSA: usb-audio: Move device rename and profile quirks to an internal table")
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20220516103112.12950-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/quirks-table.h |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/sound/usb/quirks-table.h
++++ b/sound/usb/quirks-table.h
+@@ -3235,6 +3235,15 @@ YAMAHA_DEVICE(0x7010, "UB99"),
+       }
+ },
++/* Rane SL-1 */
++{
++      USB_DEVICE(0x13e5, 0x0001),
++      .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
++              .ifnum = QUIRK_ANY_INTERFACE,
++              .type = QUIRK_AUDIO_STANDARD_INTERFACE
++        }
++},
++
+ /* disabled due to regression for other devices;
+  * see https://bugzilla.kernel.org/show_bug.cgi?id=199905
+  */
diff --git a/queue-5.15/alsa-wavefront-proper-check-of-get_user-error.patch b/queue-5.15/alsa-wavefront-proper-check-of-get_user-error.patch
new file mode 100644 (file)
index 0000000..ee1df54
--- /dev/null
@@ -0,0 +1,36 @@
+From a34ae6c0660d3b96b0055f68ef74dc9478852245 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 10 May 2022 12:36:26 +0200
+Subject: ALSA: wavefront: Proper check of get_user() error
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit a34ae6c0660d3b96b0055f68ef74dc9478852245 upstream.
+
+The antient ISA wavefront driver reads its sample patch data (uploaded
+over an ioctl) via __get_user() with no good reason; likely just for
+some performance optimizations in the past.  Let's change this to the
+standard get_user() and the error check for handling the fault case
+properly.
+
+Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20220510103626.16635-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/isa/wavefront/wavefront_synth.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sound/isa/wavefront/wavefront_synth.c
++++ b/sound/isa/wavefront/wavefront_synth.c
+@@ -1094,7 +1094,8 @@ wavefront_send_sample (snd_wavefront_t *
+                       if (dataptr < data_end) {
+               
+-                              __get_user (sample_short, dataptr);
++                              if (get_user(sample_short, dataptr))
++                                      return -EFAULT;
+                               dataptr += skip;
+               
+                               if (data_is_unsigned) { /* GUS ? */
index 47d93a5ea38097a3cf0cfe77c3a5aeac89cdc076..2be865f24620e57a60490dd71915992e030d5977 100644 (file)
@@ -42,3 +42,6 @@ platform-chrome-cros_ec_debugfs-detach-log-reader-wq.patch
 arm-9191-1-arm-stacktrace-kasan-silence-kasan-warnin.patch
 nilfs2-fix-lockdep-warnings-in-page-operations-for-b.patch
 nilfs2-fix-lockdep-warnings-during-disk-space-reclam.patch
+alsa-usb-audio-restore-rane-sl-1-quirk.patch
+alsa-wavefront-proper-check-of-get_user-error.patch
+alsa-hda-realtek-add-quirk-for-tongfang-devices-with-pop-noise.patch