From: Greg Kroah-Hartman Date: Mon, 3 Nov 2025 01:01:34 +0000 (+0900) Subject: 5.4-stable patches X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b2c0f6c7f2c056d67b9343496d484dbeaacb98b;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: regmap-slimbus-fix-bus_context-pointer-in-regmap-init-calls.patch --- diff --git a/queue-5.4/drm-etnaviv-fix-flush-sequence-logic.patch b/queue-5.4/drm-etnaviv-fix-flush-sequence-logic.patch index 92f05e1900..5437dd0ba2 100644 --- a/queue-5.4/drm-etnaviv-fix-flush-sequence-logic.patch +++ b/queue-5.4/drm-etnaviv-fix-flush-sequence-logic.patch @@ -25,14 +25,12 @@ Reviewed-by: Christian Gmeiner Link: https://lore.kernel.org/r/20251021093723.3887980-1-l.stach@pengutronix.de Signed-off-by: Sasha Levin --- - drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c -index 194af3979679d..9991150c8201a 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c -@@ -346,7 +346,7 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, +@@ -346,7 +346,7 @@ void etnaviv_buffer_queue(struct etnaviv u32 link_target, link_dwords; bool switch_context = gpu->exec_state != exec_state; bool switch_mmu_context = gpu->mmu_context != mmu_context; @@ -41,6 +39,3 @@ index 194af3979679d..9991150c8201a 100644 bool need_flush = switch_mmu_context || gpu->flush_seq != new_flush_seq; bool has_blt = !!(gpu->identity.minor_features5 & chipMinorFeatures5_BLT_ENGINE); --- -2.51.0 - diff --git a/queue-5.4/regmap-slimbus-fix-bus_context-pointer-in-regmap-init-calls.patch b/queue-5.4/regmap-slimbus-fix-bus_context-pointer-in-regmap-init-calls.patch new file mode 100644 index 0000000000..d7c56186bf --- /dev/null +++ b/queue-5.4/regmap-slimbus-fix-bus_context-pointer-in-regmap-init-calls.patch @@ -0,0 +1,98 @@ +From 434f7349a1f00618a620b316f091bd13a12bc8d2 Mon Sep 17 00:00:00 2001 +From: Alexey Klimov +Date: Wed, 22 Oct 2025 21:10:12 +0100 +Subject: regmap: slimbus: fix bus_context pointer in regmap init calls + +From: Alexey Klimov + +commit 434f7349a1f00618a620b316f091bd13a12bc8d2 upstream. + +Commit 4e65bda8273c ("ASoC: wcd934x: fix error handling in +wcd934x_codec_parse_data()") revealed the problem in the slimbus regmap. +That commit breaks audio playback, for instance, on sdm845 Thundercomm +Dragonboard 845c board: + + Unable to handle kernel paging request at virtual address ffff8000847cbad4 + ... + CPU: 5 UID: 0 PID: 776 Comm: aplay Not tainted 6.18.0-rc1-00028-g7ea30958b305 #11 PREEMPT + Hardware name: Thundercomm Dragonboard 845c (DT) + ... + Call trace: + slim_xfer_msg+0x24/0x1ac [slimbus] (P) + slim_read+0x48/0x74 [slimbus] + regmap_slimbus_read+0x18/0x24 [regmap_slimbus] + _regmap_raw_read+0xe8/0x174 + _regmap_bus_read+0x44/0x80 + _regmap_read+0x60/0xd8 + _regmap_update_bits+0xf4/0x140 + _regmap_select_page+0xa8/0x124 + _regmap_raw_write_impl+0x3b8/0x65c + _regmap_bus_raw_write+0x60/0x80 + _regmap_write+0x58/0xc0 + regmap_write+0x4c/0x80 + wcd934x_hw_params+0x494/0x8b8 [snd_soc_wcd934x] + snd_soc_dai_hw_params+0x3c/0x7c [snd_soc_core] + __soc_pcm_hw_params+0x22c/0x634 [snd_soc_core] + dpcm_be_dai_hw_params+0x1d4/0x38c [snd_soc_core] + dpcm_fe_dai_hw_params+0x9c/0x17c [snd_soc_core] + snd_pcm_hw_params+0x124/0x464 [snd_pcm] + snd_pcm_common_ioctl+0x110c/0x1820 [snd_pcm] + snd_pcm_ioctl+0x34/0x4c [snd_pcm] + __arm64_sys_ioctl+0xac/0x104 + invoke_syscall+0x48/0x104 + el0_svc_common.constprop.0+0x40/0xe0 + do_el0_svc+0x1c/0x28 + el0_svc+0x34/0xec + el0t_64_sync_handler+0xa0/0xf0 + el0t_64_sync+0x198/0x19c + +The __devm_regmap_init_slimbus() started to be used instead of +__regmap_init_slimbus() after the commit mentioned above and turns out +the incorrect bus_context pointer (3rd argument) was used in +__devm_regmap_init_slimbus(). It should be just "slimbus" (which is equal +to &slimbus->dev). Correct it. The wcd934x codec seems to be the only or +the first user of devm_regmap_init_slimbus() but we should fix it till +the point where __devm_regmap_init_slimbus() was introduced therefore +two "Fixes" tags. + +While at this, also correct the same argument in __regmap_init_slimbus(). + +Fixes: 4e65bda8273c ("ASoC: wcd934x: fix error handling in wcd934x_codec_parse_data()") +Fixes: 7d6f7fb053ad ("regmap: add SLIMbus support") +Cc: stable@vger.kernel.org +Cc: Dmitry Baryshkov +Cc: Ma Ke +Cc: Steev Klimaszewski +Cc: Srinivas Kandagatla +Reviewed-by: Abel Vesa +Signed-off-by: Alexey Klimov +Reviewed-by: Dmitry Baryshkov +Link: https://patch.msgid.link/20251022201013.1740211-1-alexey.klimov@linaro.org +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + drivers/base/regmap/regmap-slimbus.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +--- a/drivers/base/regmap/regmap-slimbus.c ++++ b/drivers/base/regmap/regmap-slimbus.c +@@ -48,8 +48,7 @@ struct regmap *__regmap_init_slimbus(str + if (IS_ERR(bus)) + return ERR_CAST(bus); + +- return __regmap_init(&slimbus->dev, bus, &slimbus->dev, config, +- lock_key, lock_name); ++ return __regmap_init(&slimbus->dev, bus, slimbus, config, lock_key, lock_name); + } + EXPORT_SYMBOL_GPL(__regmap_init_slimbus); + +@@ -63,8 +62,7 @@ struct regmap *__devm_regmap_init_slimbu + if (IS_ERR(bus)) + return ERR_CAST(bus); + +- return __devm_regmap_init(&slimbus->dev, bus, &slimbus, config, +- lock_key, lock_name); ++ return __devm_regmap_init(&slimbus->dev, bus, slimbus, config, lock_key, lock_name); + } + EXPORT_SYMBOL_GPL(__devm_regmap_init_slimbus); + diff --git a/queue-5.4/series b/queue-5.4/series index f0de7bbc45..9abaafea15 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -11,3 +11,4 @@ asoc-qdsp6-q6asm-do-not-sleep-while-atomic.patch wifi-ath10k-fix-memory-leak-on-unsupported-wmi-comma.patch usbnet-prevents-free-active-kevent.patch drm-etnaviv-fix-flush-sequence-logic.patch +regmap-slimbus-fix-bus_context-pointer-in-regmap-init-calls.patch