6.11-stable patches

added patches:
	asoc-amd-yc-fix-internal-mic-on-xiaomi-book-pro-14-2022.patch
	xtensa-emulate-one-byte-cmpxchg.patch

diff --git a/queue-6.11/asoc-amd-yc-fix-internal-mic-on-xiaomi-book-pro-14-2022.patch b/queue-6.11/asoc-amd-yc-fix-internal-mic-on-xiaomi-book-pro-14-2022.patch
new file mode 100644 (file)
index 0000000..665dc61
--- /dev/null
+++ b/queue-6.11/asoc-amd-yc-fix-internal-mic-on-xiaomi-book-pro-14-2022.patch
@@ -0,0 +1,48 @@
+From de156f3cf70e17dc6ff4c3c364bb97a6db961ffd Mon Sep 17 00:00:00 2001
+From: Mingcong Bai <jeffbai@aosc.io>
+Date: Wed, 6 Nov 2024 10:40:50 +0800
+Subject: ASoC: amd: yc: fix internal mic on Xiaomi Book Pro 14 2022
+
+From: Mingcong Bai <jeffbai@aosc.io>
+
+commit de156f3cf70e17dc6ff4c3c364bb97a6db961ffd upstream.
+
+Xiaomi Book Pro 14 2022 (MIA2210-AD) requires a quirk entry for its
+internal microphone to be enabled.
+
+This is likely due to similar reasons as seen previously on Redmi Book
+14/15 Pro 2022 models (since they likely came with similar firmware):
+
+- commit dcff8b7ca92d ("ASoC: amd: yc: Add Xiaomi Redmi Book Pro 15 2022
+  into DMI table")
+- commit c1dd6bf61997 ("ASoC: amd: yc: Add Xiaomi Redmi Book Pro 14 2022
+  into DMI table")
+
+A quirk would likely be needed for Xiaomi Book Pro 15 2022 models, too.
+However, I do not have such device on hand so I will leave it for now.
+
+Signed-off-by: Mingcong Bai <jeffbai@aosc.io>
+Link: https://patch.msgid.link/20241106024052.15748-1-jeffbai@aosc.io
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: WangYuli <wangyuli@uniontech.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/amd/yc/acp6x-mach.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/sound/soc/amd/yc/acp6x-mach.c
++++ b/sound/soc/amd/yc/acp6x-mach.c
+@@ -384,6 +384,13 @@ static const struct dmi_system_id yc_acp
+       {
+               .driver_data = &acp6x_card,
+               .matches = {
++                      DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"),
++                      DMI_MATCH(DMI_PRODUCT_NAME, "Xiaomi Book Pro 14 2022"),
++              }
++      },
++      {
++              .driver_data = &acp6x_card,
++              .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Razer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Blade 14 (2022) - RZ09-0427"),
+               }

diff --git a/queue-6.11/series b/queue-6.11/series
index c1657b1ccd183536e72b4d78c265de7c6176d158..3c9457c7c9fb8ff5c6cb69ebee688eb1355d2cdb 100644 (file)
--- a/queue-6.11/series
+++ b/queue-6.11/series
@@ -178,3 +178,5 @@ drm-xe-guc-ct-flush-g2h-worker-in-case-of-g2h-respon.patch
 drm-xe-move-lnl-scheduling-wa-to-xe_device.h.patch
 drm-xe-ufence-flush-xe-ordered_wq-in-case-of-ufence-.patch
 drm-xe-guc-tlb-flush-g2h-worker-in-case-of-tlb-timeo.patch
+asoc-amd-yc-fix-internal-mic-on-xiaomi-book-pro-14-2022.patch
+xtensa-emulate-one-byte-cmpxchg.patch

diff --git a/queue-6.11/xtensa-emulate-one-byte-cmpxchg.patch b/queue-6.11/xtensa-emulate-one-byte-cmpxchg.patch
new file mode 100644 (file)
index 0000000..16b05db
--- /dev/null
+++ b/queue-6.11/xtensa-emulate-one-byte-cmpxchg.patch
@@ -0,0 +1,56 @@
+From e799bef0d9c85b963938d8f31806a898385a5b09 Mon Sep 17 00:00:00 2001
+From: "Paul E. McKenney" <paulmck@kernel.org>
+Date: Wed, 27 Mar 2024 15:28:04 -0700
+Subject: xtensa: Emulate one-byte cmpxchg
+
+From: Paul E. McKenney <paulmck@kernel.org>
+
+commit e799bef0d9c85b963938d8f31806a898385a5b09 upstream.
+
+Use the new cmpxchg_emu_u8() to emulate one-byte cmpxchg() on xtensa.
+
+[ paulmck: Apply kernel test robot feedback. ]
+[ paulmck: Drop two-byte support per Arnd Bergmann feedback. ]
+[ Apply Geert Uytterhoeven feedback. ]
+
+Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
+Tested-by: Yujie Liu <yujie.liu@intel.com>
+Cc: Andi Shyti <andi.shyti@linux.intel.com>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/xtensa/Kconfig               |    1 +
+ arch/xtensa/include/asm/cmpxchg.h |    2 ++
+ 2 files changed, 3 insertions(+)
+
+--- a/arch/xtensa/Kconfig
++++ b/arch/xtensa/Kconfig
+@@ -14,6 +14,7 @@ config XTENSA
+       select ARCH_HAS_DMA_SET_UNCACHED if MMU
+       select ARCH_HAS_STRNCPY_FROM_USER if !KASAN
+       select ARCH_HAS_STRNLEN_USER
++      select ARCH_NEED_CMPXCHG_1_EMU
+       select ARCH_USE_MEMTEST
+       select ARCH_USE_QUEUED_RWLOCKS
+       select ARCH_USE_QUEUED_SPINLOCKS
+--- a/arch/xtensa/include/asm/cmpxchg.h
++++ b/arch/xtensa/include/asm/cmpxchg.h
+@@ -15,6 +15,7 @@
+ 
+ #include <linux/bits.h>
+ #include <linux/stringify.h>
++#include <linux/cmpxchg-emu.h>
+ 
+ /*
+  * cmpxchg
+@@ -74,6 +75,7 @@ static __inline__ unsigned long
+ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
+ {
+       switch (size) {
++      case 1:  return cmpxchg_emu_u8(ptr, old, new);
+       case 4:  return __cmpxchg_u32(ptr, old, new);
+       default: __cmpxchg_called_with_bad_pointer();
+                return old;