From: Greg Kroah-Hartman Date: Mon, 19 Jan 2026 11:49:52 +0000 (+0100) Subject: 6.6-stable patches X-Git-Tag: v5.15.198~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7083db91e8d1df112587f4dc8956e9df7f23d7d;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: asoc-codecs-wsa884x-fix-codec-initialisation.patch revert-gfs2-fix-use-of-bio_chain.patch --- diff --git a/queue-6.6/asoc-codecs-wsa884x-fix-codec-initialisation.patch b/queue-6.6/asoc-codecs-wsa884x-fix-codec-initialisation.patch new file mode 100644 index 0000000000..06296cee1d --- /dev/null +++ b/queue-6.6/asoc-codecs-wsa884x-fix-codec-initialisation.patch @@ -0,0 +1,54 @@ +From 120f3e6ff76209ee2f62a64e5e7e9d70274df42b Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Fri, 2 Jan 2026 12:14:12 +0100 +Subject: ASoC: codecs: wsa884x: fix codec initialisation + +From: Johan Hovold + +commit 120f3e6ff76209ee2f62a64e5e7e9d70274df42b upstream. + +The soundwire update_status() callback may be called multiple times with +the same ATTACHED status but initialisation should only be done when +transitioning from UNATTACHED to ATTACHED. + +Fix the inverted hw_init flag which was set to false instead of true +after initialisation which defeats its purpose and may result in +repeated unnecessary initialisation. + +Similarly, the initial state of the flag was also inverted so that the +codec would only be initialised and brought out of regmap cache only +mode if its status first transitions to UNATTACHED. + +Fixes: aa21a7d4f68a ("ASoC: codecs: wsa884x: Add WSA884x family of speakers") +Cc: stable@vger.kernel.org # 6.5 +Cc: Krzysztof Kozlowski +Signed-off-by: Johan Hovold +Reviewed-by: Krzysztof Kozlowski +Tested-by: Krzysztof Kozlowski +Reviewed-by: Srinivas Kandagatla +Link: https://patch.msgid.link/20260102111413.9605-4-johan@kernel.org +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/codecs/wsa884x.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/sound/soc/codecs/wsa884x.c ++++ b/sound/soc/codecs/wsa884x.c +@@ -1482,7 +1482,7 @@ static void wsa884x_init(struct wsa884x_ + + wsa884x_set_gain_parameters(wsa884x); + +- wsa884x->hw_init = false; ++ wsa884x->hw_init = true; + } + + static int wsa884x_update_status(struct sdw_slave *slave, +@@ -1884,7 +1884,6 @@ static int wsa884x_probe(struct sdw_slav + + /* Start in cache-only until device is enumerated */ + regcache_cache_only(wsa884x->regmap, true); +- wsa884x->hw_init = true; + + pm_runtime_set_autosuspend_delay(dev, 3000); + pm_runtime_use_autosuspend(dev); diff --git a/queue-6.6/revert-gfs2-fix-use-of-bio_chain.patch b/queue-6.6/revert-gfs2-fix-use-of-bio_chain.patch new file mode 100644 index 0000000000..03e2489233 --- /dev/null +++ b/queue-6.6/revert-gfs2-fix-use-of-bio_chain.patch @@ -0,0 +1,36 @@ +From 469d71512d135907bf5ea0972dfab8c420f57848 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Mon, 12 Jan 2026 11:47:35 +0100 +Subject: Revert "gfs2: Fix use of bio_chain" + +From: Andreas Gruenbacher + +commit 469d71512d135907bf5ea0972dfab8c420f57848 upstream. + +This reverts commit 8a157e0a0aa5143b5d94201508c0ca1bb8cfb941. + +That commit incorrectly assumed that the bio_chain() arguments were +swapped in gfs2. However, gfs2 intentionally constructs bio chains so +that the first bio's bi_end_io callback is invoked when all bios in the +chain have completed, unlike bio chains where the last bio's callback is +invoked. + +Fixes: 8a157e0a0aa5 ("gfs2: Fix use of bio_chain") +Cc: stable@vger.kernel.org +Signed-off-by: Andreas Gruenbacher +Signed-off-by: Greg Kroah-Hartman +--- + fs/gfs2/lops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/gfs2/lops.c ++++ b/fs/gfs2/lops.c +@@ -492,7 +492,7 @@ static struct bio *gfs2_chain_bio(struct + new = bio_alloc(prev->bi_bdev, nr_iovecs, prev->bi_opf, GFP_NOIO); + bio_clone_blkg_association(new, prev); + new->bi_iter.bi_sector = bio_end_sector(prev); +- bio_chain(prev, new); ++ bio_chain(new, prev); + submit_bio(prev); + return new; + } diff --git a/queue-6.6/series b/queue-6.6/series index 25be01389a..ef480c19aa 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -1,2 +1,4 @@ firmware-imx-scu-irq-set-mu_resource_id-before-get-handle.patch efi-cper-fix-cper_bits_to_str-buffer-handling-and-return-value.patch +revert-gfs2-fix-use-of-bio_chain.patch +asoc-codecs-wsa884x-fix-codec-initialisation.patch