* [PATCH v4 0/3] Misc. SCM driver fixes
@ 2026-07-24 9:49 Mukesh Ojha
2026-07-24 9:49 ` [PATCH v4 1/3] firmware: qcom: scm: Fix NULL dereference in IRQ handler before __scm is published Mukesh Ojha
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Mukesh Ojha @ 2026-07-24 9:49 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Bartosz Golaszewski,
Guru Das Srinagesh, Sibi Sankar, Elliot Berman, Andrew Halaney
Cc: linux-arm-msm, linux-kernel, Mukesh Ojha
Some of the existing issue reported by Sasiko mentioned here
https://lore.kernel.org/all/20260624192213.C82691F000E9@smtp.kernel.org/
https://lore.kernel.org/all/20260624192418.92B761F000E9@smtp.kernel.org/
and the series is about addressing them.
Changes in v4:
- Rebased it on next-20260723
Changes in v3: https://lore.kernel.org/lkml/20260629141750.996853-1-mukesh.ojha@oss.qualcomm.com/
- Added R-b tag.
- Address review comment on ret = dev_err_probe(..);
- will follow up devm_of_reserved_mem_device_init_by_idx()
as a separate series.
Changes in v2: https://lore.kernel.org/lkml/20260625093644.3918184-1-mukesh.ojha@oss.qualcomm.com/
- Separated the fixes(2/3, 3/3) as per review.
- Added 1/3 as new patch.
Mukesh Ojha (3):
firmware: qcom: scm: Fix NULL dereference in IRQ handler before __scm
is published
firmware: qcom: scm: Fix reserved memory cleanup on probe failure
firmware: qcom: scm: Fix tzmem state on probe retry
drivers/firmware/qcom/qcom_scm-smc.c | 2 +-
drivers/firmware/qcom/qcom_scm.c | 42 ++++++++++++++++------------
drivers/firmware/qcom/qcom_scm.h | 2 +-
drivers/firmware/qcom/qcom_tzmem.c | 13 ++++++---
4 files changed, 35 insertions(+), 24 deletions(-)
--
2.53.0
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v4 1/3] firmware: qcom: scm: Fix NULL dereference in IRQ handler before __scm is published 2026-07-24 9:49 [PATCH v4 0/3] Misc. SCM driver fixes Mukesh Ojha @ 2026-07-24 9:49 ` Mukesh Ojha 2026-07-24 9:49 ` [PATCH v4 2/3] firmware: qcom: scm: Fix reserved memory cleanup on probe failure Mukesh Ojha ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Mukesh Ojha @ 2026-07-24 9:49 UTC (permalink / raw) To: Bjorn Andersson, Konrad Dybcio, Bartosz Golaszewski, Guru Das Srinagesh, Sibi Sankar, Elliot Berman, Andrew Halaney Cc: linux-arm-msm, linux-kernel, Mukesh Ojha, Bartosz Golaszewski, Konrad Dybcio In qcom_scm_probe(), devm_request_threaded_irq() is called before smp_store_release(&__scm, scm). Two paths can dereference __scm before it is published, both causing a NULL pointer dereference. The IRQ handler receives scm via its data argument but passes only wq_ctx to qcom_scm_waitq_wakeup() and qcom_scm_get_completion(), which then dereference __scm directly. Thread scm through both functions so the IRQ handler path never touches __scm. Non-atomic SMC calls made during probe (e.g. from qcom_tzmem_init via qcom_scm_shm_bridge_enable) can return WAITQ_SLEEP, causing qcom_scm_wait_for_wq_completion() to run before __scm is published and dereference it. Add platform_set_drvdata(pdev, scm) early in probe and change qcom_scm_wait_for_wq_completion() to take the device pointer and use dev_get_drvdata() to reach scm, removing any dependency on __scm. Fixes: 6bf325992236 ("firmware: qcom: scm: Add wait-queue handling logic") Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com> --- drivers/firmware/qcom/qcom_scm-smc.c | 2 +- drivers/firmware/qcom/qcom_scm.c | 22 ++++++++++------------ drivers/firmware/qcom/qcom_scm.h | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm-smc.c b/drivers/firmware/qcom/qcom_scm-smc.c index 01999c22659c..127365ab11fc 100644 --- a/drivers/firmware/qcom/qcom_scm-smc.c +++ b/drivers/firmware/qcom/qcom_scm-smc.c @@ -111,7 +111,7 @@ static int __scm_smc_do_quirk_handle_waitq(struct device *dev, struct arm_smccc_ smc_call_ctx = res->a2; trace_scm_waitq_sleep(wq_ctx, smc_call_ctx); - ret = qcom_scm_wait_for_wq_completion(wq_ctx); + ret = qcom_scm_wait_for_wq_completion(dev, wq_ctx); if (ret) return ret; diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index f35f2ee39130..3b271948d326 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -2644,23 +2644,20 @@ static int qcom_scm_get_waitq_irq(struct qcom_scm *scm) return irq_create_fwspec_mapping(&fwspec); } -static struct completion *qcom_scm_get_completion(u32 wq_ctx) +static struct completion *qcom_scm_get_completion(struct qcom_scm *scm, u32 wq_ctx) { - struct completion *wq; - - if (WARN_ON_ONCE(wq_ctx >= __scm->wq_cnt)) + if (WARN_ON_ONCE(wq_ctx >= scm->wq_cnt)) return ERR_PTR(-EINVAL); - wq = &__scm->waitq_comps[wq_ctx]; - - return wq; + return &scm->waitq_comps[wq_ctx]; } -int qcom_scm_wait_for_wq_completion(u32 wq_ctx) +int qcom_scm_wait_for_wq_completion(struct device *dev, u32 wq_ctx) { + struct qcom_scm *scm = dev_get_drvdata(dev); struct completion *wq; - wq = qcom_scm_get_completion(wq_ctx); + wq = qcom_scm_get_completion(scm, wq_ctx); if (IS_ERR(wq)) return PTR_ERR(wq); @@ -2669,11 +2666,11 @@ int qcom_scm_wait_for_wq_completion(u32 wq_ctx) return 0; } -static int qcom_scm_waitq_wakeup(unsigned int wq_ctx) +static int qcom_scm_waitq_wakeup(struct qcom_scm *scm, unsigned int wq_ctx) { struct completion *wq; - wq = qcom_scm_get_completion(wq_ctx); + wq = qcom_scm_get_completion(scm, wq_ctx); if (IS_ERR(wq)) return PTR_ERR(wq); @@ -2700,7 +2697,7 @@ static irqreturn_t qcom_scm_irq_handler(int irq, void *data) goto out; } - ret = qcom_scm_waitq_wakeup(wq_ctx); + ret = qcom_scm_waitq_wakeup(scm, wq_ctx); if (ret) goto out; } while (more_pending); @@ -2804,6 +2801,7 @@ static int qcom_scm_probe(struct platform_device *pdev) return -ENOMEM; scm->dev = &pdev->dev; + platform_set_drvdata(pdev, scm); ret = qcom_scm_find_dload_address(&pdev->dev, &scm->dload_mode_addr); if (ret < 0) return dev_err_probe(&pdev->dev, ret, diff --git a/drivers/firmware/qcom/qcom_scm.h b/drivers/firmware/qcom/qcom_scm.h index caab80a73e17..cf90a565fdfb 100644 --- a/drivers/firmware/qcom/qcom_scm.h +++ b/drivers/firmware/qcom/qcom_scm.h @@ -66,7 +66,7 @@ struct qcom_scm_res { u64 result[MAX_QCOM_SCM_RETS]; }; -int qcom_scm_wait_for_wq_completion(u32 wq_ctx); +int qcom_scm_wait_for_wq_completion(struct device *dev, u32 wq_ctx); int scm_get_wq_ctx(u32 *wq_ctx, u32 *flags, u32 *more_pending); #define SCM_SMC_FNID(s, c) ((((s) & 0xFF) << 8) | ((c) & 0xFF)) -- 2.53.0 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 2/3] firmware: qcom: scm: Fix reserved memory cleanup on probe failure 2026-07-24 9:49 [PATCH v4 0/3] Misc. SCM driver fixes Mukesh Ojha 2026-07-24 9:49 ` [PATCH v4 1/3] firmware: qcom: scm: Fix NULL dereference in IRQ handler before __scm is published Mukesh Ojha @ 2026-07-24 9:49 ` Mukesh Ojha 2026-07-24 9:49 ` [PATCH v4 3/3] firmware: qcom: scm: Fix tzmem state on probe retry Mukesh Ojha 2026-07-31 3:23 ` [PATCH v4 0/3] Misc. SCM driver fixes Bjorn Andersson 3 siblings, 0 replies; 8+ messages in thread From: Mukesh Ojha @ 2026-07-24 9:49 UTC (permalink / raw) To: Bjorn Andersson, Konrad Dybcio, Bartosz Golaszewski, Guru Das Srinagesh, Sibi Sankar, Elliot Berman, Andrew Halaney Cc: linux-arm-msm, linux-kernel, Mukesh Ojha, Bartosz Golaszewski, Konrad Dybcio of_reserved_mem_device_init() adds an entry to a global list with no devres counterpart. If qcom_scm_probe() fails after the call the assignment is never cleaned up. A probe retry would add a duplicate entry, leaking the original one permanently. Add an err_rmem label that calls of_reserved_mem_device_release() and route all error paths after of_reserved_mem_device_init() through it. of_reserved_mem_device_release() is safe to call unconditionally as it simply walks an empty list when nothing was assigned. Fixes: a33b2579c8d3 ("firmware: qcom: scm: add support for SHM bridge memory carveout") Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com> --- drivers/firmware/qcom/qcom_scm.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 3b271948d326..9db55240609c 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -2849,9 +2849,11 @@ static int qcom_scm_probe(struct platform_device *pdev) "Failed to setup the reserved memory region for TZ mem\n"); ret = qcom_tzmem_enable(scm->dev); - if (ret) - return dev_err_probe(scm->dev, ret, - "Failed to enable the TrustZone memory allocator\n"); + if (ret) { + ret = dev_err_probe(scm->dev, ret, + "Failed to enable the TrustZone memory allocator\n"); + goto err_rmem; + } memset(&pool_config, 0, sizeof(pool_config)); pool_config.initial_size = 0; @@ -2859,9 +2861,11 @@ static int qcom_scm_probe(struct platform_device *pdev) pool_config.max_size = SZ_256K; scm->mempool = devm_qcom_tzmem_pool_new(scm->dev, &pool_config); - if (IS_ERR(scm->mempool)) - return dev_err_probe(scm->dev, PTR_ERR(scm->mempool), - "Failed to create the SCM memory pool\n"); + if (IS_ERR(scm->mempool)) { + ret = dev_err_probe(scm->dev, PTR_ERR(scm->mempool), + "Failed to create the SCM memory pool\n"); + goto err_rmem; + } ret = qcom_scm_query_waitq_count(scm); scm->wq_cnt = ret < 0 ? QCOM_SCM_DEFAULT_WAITQ_COUNT : ret; @@ -2937,6 +2941,10 @@ static int qcom_scm_probe(struct platform_device *pdev) qcom_scm_gunyah_wdt_init(scm); return 0; + +err_rmem: + of_reserved_mem_device_release(scm->dev); + return ret; } static void qcom_scm_shutdown(struct platform_device *pdev) -- 2.53.0 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 3/3] firmware: qcom: scm: Fix tzmem state on probe retry 2026-07-24 9:49 [PATCH v4 0/3] Misc. SCM driver fixes Mukesh Ojha 2026-07-24 9:49 ` [PATCH v4 1/3] firmware: qcom: scm: Fix NULL dereference in IRQ handler before __scm is published Mukesh Ojha 2026-07-24 9:49 ` [PATCH v4 2/3] firmware: qcom: scm: Fix reserved memory cleanup on probe failure Mukesh Ojha @ 2026-07-24 9:49 ` Mukesh Ojha [not found] ` <CGME20260806092742eucas1p1b946452d9f0f714b27cad67cd5590c21@eucas1p1.samsung.com> 2026-07-31 3:23 ` [PATCH v4 0/3] Misc. SCM driver fixes Bjorn Andersson 3 siblings, 1 reply; 8+ messages in thread From: Mukesh Ojha @ 2026-07-24 9:49 UTC (permalink / raw) To: Bjorn Andersson, Konrad Dybcio, Bartosz Golaszewski, Guru Das Srinagesh, Sibi Sankar, Elliot Berman, Andrew Halaney Cc: linux-arm-msm, linux-kernel, Mukesh Ojha, Bartosz Golaszewski, Konrad Dybcio qcom_tzmem_enable() returns -EBUSY if called a second time, but this causes probe retries to fail permanently if a later step in qcom_scm_probe() defers after qcom_tzmem_enable() has already succeeded. Use DO_ONCE() to ensure qcom_tzmem_init() runs exactly once across all calls in a thread-safe manner. qcom_tzmem_dev is set on every call since probe retries use the same device pointer. The result of the first initialisation is cached and returned to every subsequent caller. Fixes: 40289e35ca52 ("firmware: qcom: scm: enable the TZ mem allocator") Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com> --- drivers/firmware/qcom/qcom_tzmem.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c index 0635cbeacfc8..0fd9581275f1 100644 --- a/drivers/firmware/qcom/qcom_tzmem.c +++ b/drivers/firmware/qcom/qcom_tzmem.c @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/list.h> #include <linux/mm.h> +#include <linux/once.h> #include <linux/radix-tree.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -507,14 +508,18 @@ phys_addr_t qcom_tzmem_to_phys(void *vaddr) } EXPORT_SYMBOL_GPL(qcom_tzmem_to_phys); +static void qcom_tzmem_do_init(int *result) +{ + *result = qcom_tzmem_init(); +} + int qcom_tzmem_enable(struct device *dev) { - if (qcom_tzmem_dev) - return -EBUSY; + static int result; qcom_tzmem_dev = dev; - - return qcom_tzmem_init(); + DO_ONCE(qcom_tzmem_do_init, &result); + return result; } EXPORT_SYMBOL_GPL(qcom_tzmem_enable); -- 2.53.0 ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <CGME20260806092742eucas1p1b946452d9f0f714b27cad67cd5590c21@eucas1p1.samsung.com>]
* Re: [PATCH v4 3/3] firmware: qcom: scm: Fix tzmem state on probe retry [not found] ` <CGME20260806092742eucas1p1b946452d9f0f714b27cad67cd5590c21@eucas1p1.samsung.com> @ 2026-08-06 9:27 ` Marek Szyprowski 2026-08-06 11:12 ` Mukesh Ojha 0 siblings, 1 reply; 8+ messages in thread From: Marek Szyprowski @ 2026-08-06 9:27 UTC (permalink / raw) To: Mukesh Ojha, Bjorn Andersson, Konrad Dybcio, Bartosz Golaszewski, Guru Das Srinagesh, Sibi Sankar, Elliot Berman, Andrew Halaney Cc: linux-arm-msm, linux-kernel, Bartosz Golaszewski, Konrad Dybcio On 24.07.2026 11:49, Mukesh Ojha wrote: > qcom_tzmem_enable() returns -EBUSY if called a second time, but this > causes probe retries to fail permanently if a later step in > qcom_scm_probe() defers after qcom_tzmem_enable() has already succeeded. > > Use DO_ONCE() to ensure qcom_tzmem_init() runs exactly once across all > calls in a thread-safe manner. qcom_tzmem_dev is set on every call since > probe retries use the same device pointer. The result of the first > initialisation is cached and returned to every subsequent caller. > > Fixes: 40289e35ca52 ("firmware: qcom: scm: enable the TZ mem allocator") > Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> > Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> > Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com> > --- > drivers/firmware/qcom/qcom_tzmem.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c > index 0635cbeacfc8..0fd9581275f1 100644 > --- a/drivers/firmware/qcom/qcom_tzmem.c > +++ b/drivers/firmware/qcom/qcom_tzmem.c > @@ -15,6 +15,7 @@ > #include <linux/kernel.h> > #include <linux/list.h> > #include <linux/mm.h> > +#include <linux/once.h> > #include <linux/radix-tree.h> > #include <linux/slab.h> > #include <linux/spinlock.h> > @@ -507,14 +508,18 @@ phys_addr_t qcom_tzmem_to_phys(void *vaddr) > } > EXPORT_SYMBOL_GPL(qcom_tzmem_to_phys); > > +static void qcom_tzmem_do_init(int *result) > +{ > + *result = qcom_tzmem_init(); > +} > + > int qcom_tzmem_enable(struct device *dev) > { > - if (qcom_tzmem_dev) > - return -EBUSY; > + static int result; > > qcom_tzmem_dev = dev; > - > - return qcom_tzmem_init(); > + DO_ONCE(qcom_tzmem_do_init, &result); One should use DO_ONCE_SLEEPABLE() here, otherwise it triggers a warning during boot on some on my test systems. Here is a log captured with CONFIG_DEBUG_ATOMIC_SLEEP=y on recent linux-next releases, where this patch is applied as commit 9941fe8a04f3 ("firmware: qcom: scm: Fix tzmem state on probe retry"): qcom_scm: convention: smc arm 64 BUG: sleeping function called from invalid context at drivers/firmware/qcom/qcom_scm.c:334 in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 49, name: kworker/u16:2 preempt_count: 1, expected: 0 RCU nest depth: 0, expected: 0 locks held by kworker/u16:2/49: 4, last CPU#3: #0: ffff000000032140 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_one_work+0x6b4/0x840 #1: ffff800080563d90 (deferred_probe_work){+.+.}-{0:0}, at: process_one_work+0x1fc/0x840 #2: ffff00000036f938 (&dev->mutex){....}-{4:4}, at: __device_attach+0x3c/0x190 #3: ffffa83e89fe4af0 (once_lock){....}-{3:3}, at: __do_once_start+0x2c/0x74 irq event stamp: 80794 hardirqs last enabled at (80793): [<ffffa83e87faa600>] _raw_spin_unlock_irqrestore+0x6c/0x70 hardirqs last disabled at (80794): [<ffffa83e87fa9a6c>] _raw_spin_lock_irqsave+0x84/0x88 softirqs last enabled at (80780): [<ffffa83e86ccc050>] handle_softirqs+0x5dc/0x5f4 softirqs last disabled at (80755): [<ffffa83e86c10700>] __do_softirq+0x14/0x20 CPU: 3 UID: 0 PID: 49 Comm: kworker/u16:2 Not tainted 7.2.0-rc6-next-20260805+ #13357 PREEMPT Hardware name: Arduino UnoQ (DT) Workqueue: events_unbound deferred_probe_work_func Call trace: show_stack+0x18/0x24 (C) dump_stack_lvl+0x8c/0xcc dump_stack+0x18/0x24 __might_resched+0x148/0x24c __might_sleep+0x48/0x7c qcom_scm_call+0x30/0xc0 __qcom_scm_is_call_available+0x98/0x100 qcom_scm_shm_bridge_enable+0x60/0xbc qcom_tzmem_enable+0xf8/0x118 qcom_scm_probe+0x2d0/0x680 platform_probe+0x5c/0x9c really_probe+0xbc/0x29c __driver_probe_device+0x16c/0x19c driver_probe_device+0xb8/0x118 __device_attach_driver+0xb8/0x118 bus_for_each_drv+0x88/0xe8 __device_attach+0xa0/0x190 device_initial_probe+0x50/0x54 bus_probe_device+0x38/0xa8 deferred_probe_work_func+0x8c/0xc8 process_one_work+0x24c/0x840 worker_thread+0x1bc/0x368 kthread+0x134/0x140 ret_from_fork+0x10/0x20 ============================= [ BUG: Invalid wait context ] 7.2.0-rc6-next-20260805+ #13357 Tainted: G W ----------------------------- kworker/u16:2/49 is trying to lock: ffffa83e8a485e38 (qcom_scm_lock){....}-{4:4}, at: __scm_smc_do+0x70/0x488 other info that might help us debug this: context-{5:5} locks held by kworker/u16:2/49: 4, last CPU#3: #0: ffff000000032140 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_one_work+0x6b4/0x840 #1: ffff800080563d90 (deferred_probe_work){+.+.}-{0:0}, at: process_one_work+0x1fc/0x840 #2: ffff00000036f938 (&dev->mutex){....}-{4:4}, at: __device_attach+0x3c/0x190 #3: ffffa83e89fe4af0 (once_lock){....}-{3:3}, at: __do_once_start+0x2c/0x74 stack backtrace: CPU: 3 UID: 0 PID: 49 Comm: kworker/u16:2 Tainted: G W 7.2.0-rc6-next-20260805+ #13357 PREEMPT Tainted: [W]=WARN Hardware name: Arduino UnoQ (DT) Workqueue: events_unbound deferred_probe_work_func Call trace: show_stack+0x18/0x24 (C) dump_stack_lvl+0x8c/0xcc dump_stack+0x18/0x24 __lock_acquire+0x928/0x1f90 lock_acquire+0x2b8/0x3ec __mutex_lock+0xbc/0x860 mutex_lock_nested+0x24/0x30 __scm_smc_do+0x70/0x488 __scm_smc_call+0xd4/0x444 qcom_scm_call+0x64/0xc0 __qcom_scm_is_call_available+0x98/0x100 qcom_scm_shm_bridge_enable+0x60/0xbc qcom_tzmem_enable+0xf8/0x118 qcom_scm_probe+0x2d0/0x680 platform_probe+0x5c/0x9c really_probe+0xbc/0x29c __driver_probe_device+0x16c/0x19c driver_probe_device+0xb8/0x118 __device_attach_driver+0xb8/0x118 bus_for_each_drv+0x88/0xe8 __device_attach+0xa0/0x190 device_initial_probe+0x50/0x54 bus_probe_device+0x38/0xa8 deferred_probe_work_func+0x8c/0xc8 process_one_work+0x24c/0x840 worker_thread+0x1bc/0x368 kthread+0x134/0x140 ret_from_fork+0x10/0x20 qcom_scm firmware:scm: qseecom: found qseecom with version 0x1402000 qcom_scm firmware:scm: qseecom: untested machine, skipping > + return result; > } > EXPORT_SYMBOL_GPL(qcom_tzmem_enable); > Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 3/3] firmware: qcom: scm: Fix tzmem state on probe retry 2026-08-06 9:27 ` Marek Szyprowski @ 2026-08-06 11:12 ` Mukesh Ojha 2026-08-06 11:30 ` Mukesh Ojha 0 siblings, 1 reply; 8+ messages in thread From: Mukesh Ojha @ 2026-08-06 11:12 UTC (permalink / raw) To: Marek Szyprowski Cc: Bjorn Andersson, Konrad Dybcio, Bartosz Golaszewski, Guru Das Srinagesh, Sibi Sankar, Andrew Halaney, linux-arm-msm, linux-kernel, Bartosz Golaszewski, Konrad Dybcio On Thu, Aug 06, 2026 at 11:27:39AM +0200, Marek Szyprowski wrote: > On 24.07.2026 11:49, Mukesh Ojha wrote: > > qcom_tzmem_enable() returns -EBUSY if called a second time, but this > > causes probe retries to fail permanently if a later step in > > qcom_scm_probe() defers after qcom_tzmem_enable() has already succeeded. > > > > Use DO_ONCE() to ensure qcom_tzmem_init() runs exactly once across all > > calls in a thread-safe manner. qcom_tzmem_dev is set on every call since > > probe retries use the same device pointer. The result of the first > > initialisation is cached and returned to every subsequent caller. > > > > Fixes: 40289e35ca52 ("firmware: qcom: scm: enable the TZ mem allocator") > > Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> > > Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> > > Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com> > > --- > > drivers/firmware/qcom/qcom_tzmem.c | 13 +++++++++---- > > 1 file changed, 9 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c > > index 0635cbeacfc8..0fd9581275f1 100644 > > --- a/drivers/firmware/qcom/qcom_tzmem.c > > +++ b/drivers/firmware/qcom/qcom_tzmem.c > > @@ -15,6 +15,7 @@ > > #include <linux/kernel.h> > > #include <linux/list.h> > > #include <linux/mm.h> > > +#include <linux/once.h> > > #include <linux/radix-tree.h> > > #include <linux/slab.h> > > #include <linux/spinlock.h> > > @@ -507,14 +508,18 @@ phys_addr_t qcom_tzmem_to_phys(void *vaddr) > > } > > EXPORT_SYMBOL_GPL(qcom_tzmem_to_phys); > > > > +static void qcom_tzmem_do_init(int *result) > > +{ > > + *result = qcom_tzmem_init(); > > +} > > + > > int qcom_tzmem_enable(struct device *dev) > > { > > - if (qcom_tzmem_dev) > > - return -EBUSY; > > + static int result; > > > > qcom_tzmem_dev = dev; > > - > > - return qcom_tzmem_init(); > > + DO_ONCE(qcom_tzmem_do_init, &result); > One should use DO_ONCE_SLEEPABLE() here, otherwise it triggers a warning during > boot on some on my test systems. Here is a log captured with > CONFIG_DEBUG_ATOMIC_SLEEP=y on recent linux-next releases, where this patch is > applied as commit 9941fe8a04f3 ("firmware: qcom: scm: Fix tzmem state on probe > retry"): Thanks for reporting; I will spin a fix..and yes DO_ONCE_SLEEPABLE() is the right one. > > qcom_scm: convention: smc arm 64 > BUG: sleeping function called from invalid context at drivers/firmware/qcom/qcom_scm.c:334 > in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 49, name: kworker/u16:2 > preempt_count: 1, expected: 0 > RCU nest depth: 0, expected: 0 > locks held by kworker/u16:2/49: 4, last CPU#3: > #0: ffff000000032140 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_one_work+0x6b4/0x840 > #1: ffff800080563d90 (deferred_probe_work){+.+.}-{0:0}, at: process_one_work+0x1fc/0x840 > #2: ffff00000036f938 (&dev->mutex){....}-{4:4}, at: __device_attach+0x3c/0x190 > #3: ffffa83e89fe4af0 (once_lock){....}-{3:3}, at: __do_once_start+0x2c/0x74 > irq event stamp: 80794 > hardirqs last enabled at (80793): [<ffffa83e87faa600>] _raw_spin_unlock_irqrestore+0x6c/0x70 > hardirqs last disabled at (80794): [<ffffa83e87fa9a6c>] _raw_spin_lock_irqsave+0x84/0x88 > softirqs last enabled at (80780): [<ffffa83e86ccc050>] handle_softirqs+0x5dc/0x5f4 > softirqs last disabled at (80755): [<ffffa83e86c10700>] __do_softirq+0x14/0x20 > CPU: 3 UID: 0 PID: 49 Comm: kworker/u16:2 Not tainted 7.2.0-rc6-next-20260805+ #13357 PREEMPT > Hardware name: Arduino UnoQ (DT) > Workqueue: events_unbound deferred_probe_work_func > Call trace: > show_stack+0x18/0x24 (C) > dump_stack_lvl+0x8c/0xcc > dump_stack+0x18/0x24 > __might_resched+0x148/0x24c > __might_sleep+0x48/0x7c > qcom_scm_call+0x30/0xc0 > __qcom_scm_is_call_available+0x98/0x100 > qcom_scm_shm_bridge_enable+0x60/0xbc > qcom_tzmem_enable+0xf8/0x118 > qcom_scm_probe+0x2d0/0x680 > platform_probe+0x5c/0x9c > really_probe+0xbc/0x29c > __driver_probe_device+0x16c/0x19c > driver_probe_device+0xb8/0x118 > __device_attach_driver+0xb8/0x118 > bus_for_each_drv+0x88/0xe8 > __device_attach+0xa0/0x190 > device_initial_probe+0x50/0x54 > bus_probe_device+0x38/0xa8 > deferred_probe_work_func+0x8c/0xc8 > process_one_work+0x24c/0x840 > worker_thread+0x1bc/0x368 > kthread+0x134/0x140 > ret_from_fork+0x10/0x20 > > ============================= > [ BUG: Invalid wait context ] > 7.2.0-rc6-next-20260805+ #13357 Tainted: G W > ----------------------------- > kworker/u16:2/49 is trying to lock: > ffffa83e8a485e38 (qcom_scm_lock){....}-{4:4}, at: __scm_smc_do+0x70/0x488 > other info that might help us debug this: > context-{5:5} > locks held by kworker/u16:2/49: 4, last CPU#3: > #0: ffff000000032140 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_one_work+0x6b4/0x840 > #1: ffff800080563d90 (deferred_probe_work){+.+.}-{0:0}, at: process_one_work+0x1fc/0x840 > #2: ffff00000036f938 (&dev->mutex){....}-{4:4}, at: __device_attach+0x3c/0x190 > #3: ffffa83e89fe4af0 (once_lock){....}-{3:3}, at: __do_once_start+0x2c/0x74 > stack backtrace: > CPU: 3 UID: 0 PID: 49 Comm: kworker/u16:2 Tainted: G W 7.2.0-rc6-next-20260805+ #13357 PREEMPT > Tainted: [W]=WARN > Hardware name: Arduino UnoQ (DT) > Workqueue: events_unbound deferred_probe_work_func > Call trace: > show_stack+0x18/0x24 (C) > dump_stack_lvl+0x8c/0xcc > dump_stack+0x18/0x24 > __lock_acquire+0x928/0x1f90 > lock_acquire+0x2b8/0x3ec > __mutex_lock+0xbc/0x860 > mutex_lock_nested+0x24/0x30 > __scm_smc_do+0x70/0x488 > __scm_smc_call+0xd4/0x444 > qcom_scm_call+0x64/0xc0 > __qcom_scm_is_call_available+0x98/0x100 > qcom_scm_shm_bridge_enable+0x60/0xbc > qcom_tzmem_enable+0xf8/0x118 > qcom_scm_probe+0x2d0/0x680 > platform_probe+0x5c/0x9c > really_probe+0xbc/0x29c > __driver_probe_device+0x16c/0x19c > driver_probe_device+0xb8/0x118 > __device_attach_driver+0xb8/0x118 > bus_for_each_drv+0x88/0xe8 > __device_attach+0xa0/0x190 > device_initial_probe+0x50/0x54 > bus_probe_device+0x38/0xa8 > deferred_probe_work_func+0x8c/0xc8 > process_one_work+0x24c/0x840 > worker_thread+0x1bc/0x368 > kthread+0x134/0x140 > ret_from_fork+0x10/0x20 > qcom_scm firmware:scm: qseecom: found qseecom with version 0x1402000 > qcom_scm firmware:scm: qseecom: untested machine, skipping > > > > + return result; > > } > > EXPORT_SYMBOL_GPL(qcom_tzmem_enable); > > > > Best regards > -- > Marek Szyprowski, PhD > Samsung R&D Institute Poland > -- -Mukesh Ojha ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 3/3] firmware: qcom: scm: Fix tzmem state on probe retry 2026-08-06 11:12 ` Mukesh Ojha @ 2026-08-06 11:30 ` Mukesh Ojha 0 siblings, 0 replies; 8+ messages in thread From: Mukesh Ojha @ 2026-08-06 11:30 UTC (permalink / raw) To: Marek Szyprowski Cc: Bjorn Andersson, Konrad Dybcio, Bartosz Golaszewski, Guru Das Srinagesh, Sibi Sankar, Andrew Halaney, linux-arm-msm, linux-kernel, Bartosz Golaszewski, Konrad Dybcio On Thu, Aug 06, 2026 at 04:42:09PM +0530, Mukesh Ojha wrote: > On Thu, Aug 06, 2026 at 11:27:39AM +0200, Marek Szyprowski wrote: > > On 24.07.2026 11:49, Mukesh Ojha wrote: > > > qcom_tzmem_enable() returns -EBUSY if called a second time, but this > > > causes probe retries to fail permanently if a later step in > > > qcom_scm_probe() defers after qcom_tzmem_enable() has already succeeded. > > > > > > Use DO_ONCE() to ensure qcom_tzmem_init() runs exactly once across all > > > calls in a thread-safe manner. qcom_tzmem_dev is set on every call since > > > probe retries use the same device pointer. The result of the first > > > initialisation is cached and returned to every subsequent caller. > > > > > > Fixes: 40289e35ca52 ("firmware: qcom: scm: enable the TZ mem allocator") > > > Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> > > > Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> > > > Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com> > > > --- > > > drivers/firmware/qcom/qcom_tzmem.c | 13 +++++++++---- > > > 1 file changed, 9 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c > > > index 0635cbeacfc8..0fd9581275f1 100644 > > > --- a/drivers/firmware/qcom/qcom_tzmem.c > > > +++ b/drivers/firmware/qcom/qcom_tzmem.c > > > @@ -15,6 +15,7 @@ > > > #include <linux/kernel.h> > > > #include <linux/list.h> > > > #include <linux/mm.h> > > > +#include <linux/once.h> > > > #include <linux/radix-tree.h> > > > #include <linux/slab.h> > > > #include <linux/spinlock.h> > > > @@ -507,14 +508,18 @@ phys_addr_t qcom_tzmem_to_phys(void *vaddr) > > > } > > > EXPORT_SYMBOL_GPL(qcom_tzmem_to_phys); > > > > > > +static void qcom_tzmem_do_init(int *result) > > > +{ > > > + *result = qcom_tzmem_init(); > > > +} > > > + > > > int qcom_tzmem_enable(struct device *dev) > > > { > > > - if (qcom_tzmem_dev) > > > - return -EBUSY; > > > + static int result; > > > > > > qcom_tzmem_dev = dev; > > > - > > > - return qcom_tzmem_init(); > > > + DO_ONCE(qcom_tzmem_do_init, &result); > > One should use DO_ONCE_SLEEPABLE() here, otherwise it triggers a warning during > > boot on some on my test systems. Here is a log captured with > > CONFIG_DEBUG_ATOMIC_SLEEP=y on recent linux-next releases, where this patch is > > applied as commit 9941fe8a04f3 ("firmware: qcom: scm: Fix tzmem state on probe > > retry"): > > Thanks for reporting; I will spin a fix..and yes DO_ONCE_SLEEPABLE() is the right one. > Sent the change here https://lore.kernel.org/lkml/20260806112709.4018596-1-mukesh.ojha@oss.qualcomm.com/ -Mukesh ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 0/3] Misc. SCM driver fixes 2026-07-24 9:49 [PATCH v4 0/3] Misc. SCM driver fixes Mukesh Ojha ` (2 preceding siblings ...) 2026-07-24 9:49 ` [PATCH v4 3/3] firmware: qcom: scm: Fix tzmem state on probe retry Mukesh Ojha @ 2026-07-31 3:23 ` Bjorn Andersson 3 siblings, 0 replies; 8+ messages in thread From: Bjorn Andersson @ 2026-07-31 3:23 UTC (permalink / raw) To: Konrad Dybcio, Bartosz Golaszewski, Guru Das Srinagesh, Sibi Sankar, Elliot Berman, Andrew Halaney, Mukesh Ojha Cc: linux-arm-msm, linux-kernel On Fri, 24 Jul 2026 15:19:36 +0530, Mukesh Ojha wrote: > Some of the existing issue reported by Sasiko mentioned here > > https://lore.kernel.org/all/20260624192213.C82691F000E9@smtp.kernel.org/ > > https://lore.kernel.org/all/20260624192418.92B761F000E9@smtp.kernel.org/ > > and the series is about addressing them. > > [...] Applied, thanks! [1/3] firmware: qcom: scm: Fix NULL dereference in IRQ handler before __scm is published commit: 966d23c7e68ea32679275a7e3d2383181002c868 [2/3] firmware: qcom: scm: Fix reserved memory cleanup on probe failure commit: b697b20cea4374d27e2134da4bb7b0ea39f36c8b [3/3] firmware: qcom: scm: Fix tzmem state on probe retry commit: 9941fe8a04f3d258e07eb5899db3027252a4190f Best regards, -- Bjorn Andersson <andersson@kernel.org> ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-08-06 11:30 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-24 9:49 [PATCH v4 0/3] Misc. SCM driver fixes Mukesh Ojha
2026-07-24 9:49 ` [PATCH v4 1/3] firmware: qcom: scm: Fix NULL dereference in IRQ handler before __scm is published Mukesh Ojha
2026-07-24 9:49 ` [PATCH v4 2/3] firmware: qcom: scm: Fix reserved memory cleanup on probe failure Mukesh Ojha
2026-07-24 9:49 ` [PATCH v4 3/3] firmware: qcom: scm: Fix tzmem state on probe retry Mukesh Ojha
[not found] ` <CGME20260806092742eucas1p1b946452d9f0f714b27cad67cd5590c21@eucas1p1.samsung.com>
2026-08-06 9:27 ` Marek Szyprowski
2026-08-06 11:12 ` Mukesh Ojha
2026-08-06 11:30 ` Mukesh Ojha
2026-07-31 3:23 ` [PATCH v4 0/3] Misc. SCM driver fixes Bjorn Andersson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®