]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.12-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jun 2025 11:36:49 +0000 (13:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jun 2025 11:36:49 +0000 (13:36 +0200)
added patches:
alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch
objtool-rust-relax-slice-condition-to-cover-more-noreturn-rust-functions.patch
revert-wifi-mwifiex-fix-ht40-bandwidth-issue.patch
tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch

queue-6.12/alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch [new file with mode: 0644]
queue-6.12/objtool-rust-relax-slice-condition-to-cover-more-noreturn-rust-functions.patch [new file with mode: 0644]
queue-6.12/revert-wifi-mwifiex-fix-ht40-bandwidth-issue.patch [new file with mode: 0644]
queue-6.12/series
queue-6.12/tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch [new file with mode: 0644]

diff --git a/queue-6.12/alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch b/queue-6.12/alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch
new file mode 100644 (file)
index 0000000..614c1c9
--- /dev/null
@@ -0,0 +1,34 @@
+From 6a3439a417b910e662c666993798e0691bc81147 Mon Sep 17 00:00:00 2001
+From: David Heimann <d@dmeh.net>
+Date: Sun, 1 Jun 2025 12:41:16 -0400
+Subject: ALSA: usb-audio: Add implicit feedback quirk for RODE AI-1
+
+From: David Heimann <d@dmeh.net>
+
+commit 6a3439a417b910e662c666993798e0691bc81147 upstream.
+
+The RODE AI-1 audio interface requires implicit feedback sync between
+playback endpoint 0x03 and feedback endpoint 0x84 on interface 3, but
+doesn't advertise this in its USB descriptors.
+
+Without this quirk, the device receives audio data but produces no output.
+
+Signed-off-by: David Heimann <d@dmeh.net>
+Cc: <stable@vger.kernel.org>
+Link: https://patch.msgid.link/084dc88c-1193-4a94-a002-5599adff936c@app.fastmail.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/implicit.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/usb/implicit.c
++++ b/sound/usb/implicit.c
+@@ -57,6 +57,7 @@ static const struct snd_usb_implicit_fb_
+       IMPLICIT_FB_FIXED_DEV(0x31e9, 0x0002, 0x81, 2), /* Solid State Logic SSL2+ */
+       IMPLICIT_FB_FIXED_DEV(0x0499, 0x172f, 0x81, 2), /* Steinberg UR22C */
+       IMPLICIT_FB_FIXED_DEV(0x0d9a, 0x00df, 0x81, 2), /* RTX6001 */
++      IMPLICIT_FB_FIXED_DEV(0x19f7, 0x000a, 0x84, 3), /* RODE AI-1 */
+       IMPLICIT_FB_FIXED_DEV(0x22f0, 0x0006, 0x81, 3), /* Allen&Heath Qu-16 */
+       IMPLICIT_FB_FIXED_DEV(0x1686, 0xf029, 0x82, 2), /* Zoom UAC-2 */
+       IMPLICIT_FB_FIXED_DEV(0x2466, 0x8003, 0x86, 2), /* Fractal Audio Axe-Fx II */
diff --git a/queue-6.12/objtool-rust-relax-slice-condition-to-cover-more-noreturn-rust-functions.patch b/queue-6.12/objtool-rust-relax-slice-condition-to-cover-more-noreturn-rust-functions.patch
new file mode 100644 (file)
index 0000000..79a273e
--- /dev/null
@@ -0,0 +1,53 @@
+From cbeaa41dfe26b72639141e87183cb23e00d4b0dd Mon Sep 17 00:00:00 2001
+From: Miguel Ojeda <ojeda@kernel.org>
+Date: Tue, 20 May 2025 20:55:55 +0200
+Subject: objtool/rust: relax slice condition to cover more `noreturn` Rust functions
+
+From: Miguel Ojeda <ojeda@kernel.org>
+
+commit cbeaa41dfe26b72639141e87183cb23e00d4b0dd upstream.
+
+Developers are indeed hitting other of the `noreturn` slice symbols in
+Nova [1], thus relax the last check in the list so that we catch all of
+them, i.e.
+
+    *_4core5slice5index22slice_index_order_fail
+    *_4core5slice5index24slice_end_index_len_fail
+    *_4core5slice5index26slice_start_index_len_fail
+    *_4core5slice5index29slice_end_index_overflow_fail
+    *_4core5slice5index31slice_start_index_overflow_fail
+
+These all exist since at least Rust 1.78.0, thus backport it too.
+
+See commit 56d680dd23c3 ("objtool/rust: list `noreturn` Rust functions")
+for more details.
+
+Cc: stable@vger.kernel.org # Needed in 6.12.y and later.
+Cc: John Hubbard <jhubbard@nvidia.com>
+Cc: Timur Tabi <ttabi@nvidia.com>
+Cc: Kane York <kanepyork@gmail.com>
+Cc: Josh Poimboeuf <jpoimboe@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Reported-by: Joel Fernandes <joelagnelf@nvidia.com>
+Fixes: 56d680dd23c3 ("objtool/rust: list `noreturn` Rust functions")
+Closes: https://lore.kernel.org/rust-for-linux/20250513180757.GA1295002@joelnvbox/ [1]
+Tested-by: Joel Fernandes <joelagnelf@nvidia.com>
+Link: https://lore.kernel.org/r/20250520185555.825242-1-ojeda@kernel.org
+Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/objtool/check.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/tools/objtool/check.c
++++ b/tools/objtool/check.c
+@@ -222,7 +222,8 @@ static bool is_rust_noreturn(const struc
+              str_ends_with(func->name, "_7___rustc17rust_begin_unwind")                               ||
+              strstr(func->name, "_4core9panicking13assert_failed")                                    ||
+              strstr(func->name, "_4core9panicking11panic_const24panic_const_")                        ||
+-             (strstr(func->name, "_4core5slice5index24slice_") &&
++             (strstr(func->name, "_4core5slice5index") &&
++              strstr(func->name, "slice_") &&
+               str_ends_with(func->name, "_fail"));
+ }
diff --git a/queue-6.12/revert-wifi-mwifiex-fix-ht40-bandwidth-issue.patch b/queue-6.12/revert-wifi-mwifiex-fix-ht40-bandwidth-issue.patch
new file mode 100644 (file)
index 0000000..963a086
--- /dev/null
@@ -0,0 +1,52 @@
+From 570896604f47d44d4ff6882d2a588428d2a6ef17 Mon Sep 17 00:00:00 2001
+From: Francesco Dolcini <francesco.dolcini@toradex.com>
+Date: Thu, 5 Jun 2025 15:03:02 +0200
+Subject: Revert "wifi: mwifiex: Fix HT40 bandwidth issue."
+
+From: Francesco Dolcini <francesco.dolcini@toradex.com>
+
+commit 570896604f47d44d4ff6882d2a588428d2a6ef17 upstream.
+
+This reverts commit 4fcfcbe45734 ("wifi: mwifiex: Fix HT40 bandwidth
+issue.")
+
+That commit introduces a regression, when HT40 mode is enabled,
+received packets are lost, this was experience with W8997 with both
+SDIO-UART and SDIO-SDIO variants. From an initial investigation the
+issue solves on its own after some time, but it's not clear what is
+the reason. Given that this was just a performance optimization, let's
+revert it till we have a better understanding of the issue and a proper
+fix.
+
+Cc: Jeff Chen <jeff.chen_1@nxp.com>
+Cc: stable@vger.kernel.org
+Fixes: 4fcfcbe45734 ("wifi: mwifiex: Fix HT40 bandwidth issue.")
+Closes: https://lore.kernel.org/all/20250603203337.GA109929@francesco-nb/
+Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
+Link: https://patch.msgid.link/20250605130302.55555-1-francesco@dolcini.it
+[fix commit reference format]
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/wireless/marvell/mwifiex/11n.c |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/wireless/marvell/mwifiex/11n.c
++++ b/drivers/net/wireless/marvell/mwifiex/11n.c
+@@ -403,14 +403,12 @@ mwifiex_cmd_append_11n_tlv(struct mwifie
+               if (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 &&
+                   bss_desc->bcn_ht_oper->ht_param &
+-                  IEEE80211_HT_PARAM_CHAN_WIDTH_ANY) {
+-                      chan_list->chan_scan_param[0].radio_type |=
+-                              CHAN_BW_40MHZ << 2;
++                  IEEE80211_HT_PARAM_CHAN_WIDTH_ANY)
+                       SET_SECONDARYCHAN(chan_list->chan_scan_param[0].
+                                         radio_type,
+                                         (bss_desc->bcn_ht_oper->ht_param &
+                                         IEEE80211_HT_PARAM_CHA_SEC_OFFSET));
+-              }
++
+               *buffer += struct_size(chan_list, chan_scan_param, 1);
+               ret_len += struct_size(chan_list, chan_scan_param, 1);
+       }
index 3a881782828459bc15c0cdf30329c7f62d4112ec..ec6b54f0f0a80db72e6c0ec5dd2c441ef88be88e 100644 (file)
@@ -483,3 +483,7 @@ block-don-t-use-submit_bio_noacct_nocheck-in-blk_zon.patch
 io_uring-consistently-use-rcu-semantics-with-sqpoll-.patch
 bio-fix-bio_first_folio-for-sparsemem-without-vmemma.patch
 block-fix-bvec_set_folio-for-very-large-folios.patch
+objtool-rust-relax-slice-condition-to-cover-more-noreturn-rust-functions.patch
+tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch
+revert-wifi-mwifiex-fix-ht40-bandwidth-issue.patch
+alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch
diff --git a/queue-6.12/tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch b/queue-6.12/tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch
new file mode 100644 (file)
index 0000000..1bd0621
--- /dev/null
@@ -0,0 +1,39 @@
+From a298bbab903e3fb4cbe16d36d6195e68fad1b776 Mon Sep 17 00:00:00 2001
+From: Suleiman Souhlal <suleiman@google.com>
+Date: Fri, 6 Jun 2025 16:45:38 +0900
+Subject: tools/resolve_btfids: Fix build when cross compiling kernel with clang.
+
+From: Suleiman Souhlal <suleiman@google.com>
+
+commit a298bbab903e3fb4cbe16d36d6195e68fad1b776 upstream.
+
+When cross compiling the kernel with clang, we need to override
+CLANG_CROSS_FLAGS when preparing the step libraries.
+
+Prior to commit d1d096312176 ("tools: fix annoying "mkdir -p ..." logs
+when building tools in parallel"), MAKEFLAGS would have been set to a
+value that wouldn't set a value for CLANG_CROSS_FLAGS, hiding the
+fact that we weren't properly overriding it.
+
+Fixes: 56a2df7615fa ("tools/resolve_btfids: Compile resolve_btfids as host program")
+Signed-off-by: Suleiman Souhlal <suleiman@google.com>
+Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
+Acked-by: Jiri Olsa <jolsa@kernel.org>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/bpf/20250606074538.1608546-1-suleiman@google.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/bpf/resolve_btfids/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/bpf/resolve_btfids/Makefile
++++ b/tools/bpf/resolve_btfids/Makefile
+@@ -19,7 +19,7 @@ endif
+ # Overrides for the prepare step libraries.
+ HOST_OVERRIDES := AR="$(HOSTAR)" CC="$(HOSTCC)" LD="$(HOSTLD)" ARCH="$(HOSTARCH)" \
+-                CROSS_COMPILE="" EXTRA_CFLAGS="$(HOSTCFLAGS)"
++                CROSS_COMPILE="" CLANG_CROSS_FLAGS="" EXTRA_CFLAGS="$(HOSTCFLAGS)"
+ RM      ?= rm
+ HOSTCC  ?= gcc