]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Sep 2020 13:33:34 +0000 (15:33 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Sep 2020 13:33:34 +0000 (15:33 +0200)
added patches:
alsa-hda-realtek-couldn-t-detect-mic-if-booting-with-headset-plugged.patch
alsa-usb-audio-add-delay-quirk-for-h570e-usb-headsets.patch
arch-x86-lib-usercopy_64.c-fix-__copy_user_flushcache-cache-writeback.patch
x86-ioapic-unbreak-check_timer.patch

queue-4.14/alsa-hda-realtek-couldn-t-detect-mic-if-booting-with-headset-plugged.patch [new file with mode: 0644]
queue-4.14/alsa-usb-audio-add-delay-quirk-for-h570e-usb-headsets.patch [new file with mode: 0644]
queue-4.14/arch-x86-lib-usercopy_64.c-fix-__copy_user_flushcache-cache-writeback.patch [new file with mode: 0644]
queue-4.14/series
queue-4.14/x86-ioapic-unbreak-check_timer.patch [new file with mode: 0644]

diff --git a/queue-4.14/alsa-hda-realtek-couldn-t-detect-mic-if-booting-with-headset-plugged.patch b/queue-4.14/alsa-hda-realtek-couldn-t-detect-mic-if-booting-with-headset-plugged.patch
new file mode 100644 (file)
index 0000000..687e44a
--- /dev/null
@@ -0,0 +1,48 @@
+From 3f74249057827c5f6676c41c18f6be12ce1469ce Mon Sep 17 00:00:00 2001
+From: Hui Wang <hui.wang@canonical.com>
+Date: Mon, 14 Sep 2020 14:51:18 +0800
+Subject: ALSA: hda/realtek - Couldn't detect Mic if booting with headset plugged
+
+From: Hui Wang <hui.wang@canonical.com>
+
+commit 3f74249057827c5f6676c41c18f6be12ce1469ce upstream.
+
+We found a Mic detection issue on many Lenovo laptops, those laptops
+belong to differnt models and they have different audio design like
+internal mic connects to the codec or PCH, they all have this problem,
+the problem is if plugging a headset before powerup/reboot the
+machine, after booting up, the headphone could be detected but Mic
+couldn't. If we plug out and plug in the headset, both headphone and
+Mic could be detected then.
+
+Through debugging we found the codec on those laptops are same, it is
+alc257, and if we don't disable the 3k pulldown in alc256_shutup(),
+the issue will be fixed. So far there is no pop noise or power
+consumption regression on those laptops after this change.
+
+Cc: Kailang Yang <kailang@realtek.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Hui Wang <hui.wang@canonical.com>
+Link: https://lore.kernel.org/r/20200914065118.19238-1-hui.wang@canonical.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -3154,7 +3154,11 @@ static void alc256_shutup(struct hda_cod
+       /* 3k pull low control for Headset jack. */
+       /* NOTE: call this before clearing the pin, otherwise codec stalls */
+-      alc_update_coef_idx(codec, 0x46, 0, 3 << 12);
++      /* If disable 3k pulldown control for alc257, the Mic detection will not work correctly
++       * when booting with headset plugged. So skip setting it for the codec alc257
++       */
++      if (codec->core.vendor_id != 0x10ec0257)
++              alc_update_coef_idx(codec, 0x46, 0, 3 << 12);
+       snd_hda_codec_write(codec, hp_pin, 0,
+                           AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
diff --git a/queue-4.14/alsa-usb-audio-add-delay-quirk-for-h570e-usb-headsets.patch b/queue-4.14/alsa-usb-audio-add-delay-quirk-for-h570e-usb-headsets.patch
new file mode 100644 (file)
index 0000000..36333df
--- /dev/null
@@ -0,0 +1,40 @@
+From 315c7ad7a701baba28c628c4c5426b3d9617ceed Mon Sep 17 00:00:00 2001
+From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
+Date: Thu, 10 Sep 2020 10:53:28 +0200
+Subject: ALSA: usb-audio: Add delay quirk for H570e USB headsets
+
+From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
+
+commit 315c7ad7a701baba28c628c4c5426b3d9617ceed upstream.
+
+Needs the same delay as H650e
+
+Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20200910085328.19188-1-joakim.tjernlund@infinera.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/usb/quirks.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/sound/usb/quirks.c
++++ b/sound/usb/quirks.c
+@@ -1322,12 +1322,13 @@ void snd_usb_ctl_msg_quirk(struct usb_de
+           && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
+               mdelay(20);
+-      /* Zoom R16/24, Logitech H650e, Jabra 550a, Kingston HyperX needs a tiny
+-       * delay here, otherwise requests like get/set frequency return as
+-       * failed despite actually succeeding.
++      /* Zoom R16/24, Logitech H650e/H570e, Jabra 550a, Kingston HyperX
++       *  needs a tiny delay here, otherwise requests like get/set
++       *  frequency return as failed despite actually succeeding.
+        */
+       if ((chip->usb_id == USB_ID(0x1686, 0x00dd) ||
+            chip->usb_id == USB_ID(0x046d, 0x0a46) ||
++           chip->usb_id == USB_ID(0x046d, 0x0a56) ||
+            chip->usb_id == USB_ID(0x0b0e, 0x0349) ||
+            chip->usb_id == USB_ID(0x0951, 0x16ad)) &&
+           (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
diff --git a/queue-4.14/arch-x86-lib-usercopy_64.c-fix-__copy_user_flushcache-cache-writeback.patch b/queue-4.14/arch-x86-lib-usercopy_64.c-fix-__copy_user_flushcache-cache-writeback.patch
new file mode 100644 (file)
index 0000000..9ab431a
--- /dev/null
@@ -0,0 +1,49 @@
+From a1cd6c2ae47ee10ff21e62475685d5b399e2ed4a Mon Sep 17 00:00:00 2001
+From: Mikulas Patocka <mpatocka@redhat.com>
+Date: Fri, 25 Sep 2020 21:19:24 -0700
+Subject: arch/x86/lib/usercopy_64.c: fix __copy_user_flushcache() cache writeback
+
+From: Mikulas Patocka <mpatocka@redhat.com>
+
+commit a1cd6c2ae47ee10ff21e62475685d5b399e2ed4a upstream.
+
+If we copy less than 8 bytes and if the destination crosses a cache
+line, __copy_user_flushcache would invalidate only the first cache line.
+
+This patch makes it invalidate the second cache line as well.
+
+Fixes: 0aed55af88345b ("x86, uaccess: introduce copy_from_iter_flushcache for pmem / cache-bypass operations")
+Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Reviewed-by: Dan Williams <dan.j.wiilliams@intel.com>
+Cc: Jan Kara <jack@suse.cz>
+Cc: Jeff Moyer <jmoyer@redhat.com>
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: Christoph Hellwig <hch@lst.de>
+Cc: Toshi Kani <toshi.kani@hpe.com>
+Cc: "H. Peter Anvin" <hpa@zytor.com>
+Cc: Al Viro <viro@zeniv.linux.org.uk>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Matthew Wilcox <mawilcox@microsoft.com>
+Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
+Cc: Ingo Molnar <mingo@elte.hu>
+Cc: <stable@vger.kernel.org>
+Link: https://lkml.kernel.org/r/alpine.LRH.2.02.2009161451140.21915@file01.intranet.prod.int.rdu2.redhat.com
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/lib/usercopy_64.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/lib/usercopy_64.c
++++ b/arch/x86/lib/usercopy_64.c
+@@ -118,7 +118,7 @@ long __copy_user_flushcache(void *dst, c
+        */
+       if (size < 8) {
+               if (!IS_ALIGNED(dest, 4) || size != 4)
+-                      clean_cache_range(dst, 1);
++                      clean_cache_range(dst, size);
+       } else {
+               if (!IS_ALIGNED(dest, 8)) {
+                       dest = ALIGN(dest, boot_cpu_data.x86_clflush_size);
index 41b4e1b7e5697093d1848b5568d6f5c5614e3e30..ff5e26cf81fcddf590a118d9de3fa7781ad7dc48 100644 (file)
@@ -21,6 +21,10 @@ m68k-q40-fix-info-leak-in-rtc_ioctl.patch
 gma-gma500-fix-a-memory-disclosure-bug-due-to-uninit.patch
 asoc-kirkwood-fix-irq-error-handling.patch
 media-smiapp-fix-error-handling-at-nvm-reading.patch
+arch-x86-lib-usercopy_64.c-fix-__copy_user_flushcache-cache-writeback.patch
+x86-ioapic-unbreak-check_timer.patch
+alsa-usb-audio-add-delay-quirk-for-h570e-usb-headsets.patch
+alsa-hda-realtek-couldn-t-detect-mic-if-booting-with-headset-plugged.patch
 pm-devfreq-tegra30-fix-integer-overflow-on-cpu-s-fre.patch
 scsi-fnic-fix-use-after-free.patch
 clk-ti-adpll-allocate-room-for-terminating-null.patch
diff --git a/queue-4.14/x86-ioapic-unbreak-check_timer.patch b/queue-4.14/x86-ioapic-unbreak-check_timer.patch
new file mode 100644 (file)
index 0000000..b4a002b
--- /dev/null
@@ -0,0 +1,72 @@
+From 86a82ae0b5095ea24c55898a3f025791e7958b21 Mon Sep 17 00:00:00 2001
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 23 Sep 2020 17:46:20 +0200
+Subject: x86/ioapic: Unbreak check_timer()
+
+From: Thomas Gleixner <tglx@linutronix.de>
+
+commit 86a82ae0b5095ea24c55898a3f025791e7958b21 upstream.
+
+Several people reported in the kernel bugzilla that between v4.12 and v4.13
+the magic which works around broken hardware and BIOSes to find the proper
+timer interrupt delivery mode stopped working for some older affected
+platforms which need to fall back to ExtINT delivery mode.
+
+The reason is that the core code changed to keep track of the masked and
+disabled state of an interrupt line more accurately to avoid the expensive
+hardware operations.
+
+That broke an assumption in i8259_make_irq() which invokes
+
+     disable_irq_nosync();
+     irq_set_chip_and_handler();
+     enable_irq();
+
+Up to v4.12 this worked because enable_irq() unconditionally unmasked the
+interrupt line, but after the state tracking improvements this is not
+longer the case because the IO/APIC uses lazy disabling. So the line state
+is unmasked which means that enable_irq() does not call into the new irq
+chip to unmask it.
+
+In principle this is a shortcoming of the core code, but it's more than
+unclear whether the core code should try to reset state. At least this
+cannot be done unconditionally as that would break other existing use cases
+where the chip type is changed, e.g. when changing the trigger type, but
+the callers expect the state to be preserved.
+
+As the way how check_timer() is switching the delivery modes is truly
+unique, the obvious fix is to simply unmask the i8259 manually after
+changing the mode to ExtINT delivery and switching the irq chip to the
+legacy PIC.
+
+Note, that the fixes tag is not really precise, but identifies the commit
+which broke the assumptions in the IO/APIC and i8259 code and that's the
+kernel version to which this needs to be backported.
+
+Fixes: bf22ff45bed6 ("genirq: Avoid unnecessary low level irq function calls")
+Reported-by: p_c_chan@hotmail.com
+Reported-by: ecm4@mail.com
+Reported-by: perdigao1@yahoo.com
+Reported-by: matzes@users.sourceforge.net
+Reported-by: rvelascog@gmail.com
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: p_c_chan@hotmail.com
+Tested-by: matzes@users.sourceforge.net
+Cc: stable@vger.kernel.org
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=197769
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/apic/io_apic.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -2160,6 +2160,7 @@ static inline void __init check_timer(vo
+       legacy_pic->init(0);
+       legacy_pic->make_irq(0);
+       apic_write(APIC_LVT0, APIC_DM_EXTINT);
++      legacy_pic->unmask(0);
+       unlock_ExtINT_logic();