summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnnathi Chalicheemala <unnathi.chalicheemala@oss.qualcomm.com>2025-12-17 17:34:21 +0300
committerBjorn Andersson <andersson@kernel.org>2026-01-03 20:57:16 +0300
commit366f05e348b2ba454869ba7148ace6f25f229540 (patch)
tree4af9350456b524116abb7ddbbc3210afb0faab85
parentccd207ec848e768da41465352a0f52081eec6bb1 (diff)
downloadlinux-366f05e348b2ba454869ba7148ace6f25f229540.tar.xz
firmware: qcom_scm: Use TASK_IDLE state in wait_for_wq_completion()
When the kernel issues an SMC (Secure Monitor Call) and the firmware requests the kernel to wait, the waiting thread enters an uninterruptible (D) state. In case of an extended wait request by the firmware, any device suspend request, cannot proceed because of the thread stuck in D state. This blocks the device suspend. Replace wait_for_completion() with wait_for_completion_state(..., TASK_IDLE), so that the waiting thread, show up in TASK_IDLE state, instead of TASK_UNINTERRUPTIBLE (D state). This allows the thread to block until completion, without blocking the device suspend. Reviewed-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com> Reviewed-by: Bartosz Golaszewski <brgl@kernel.org> Signed-off-by: Unnathi Chalicheemala <unnathi.chalicheemala@oss.qualcomm.com> Signed-off-by: Shivendra Pratap <shivendra.pratap@oss.qualcomm.com> Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Link: https://lore.kernel.org/r/20251217-multi_waitq_scm-v11-3-f21e50e792b8@oss.qualcomm.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-rw-r--r--drivers/firmware/qcom/qcom_scm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index c10062430e29..3a78092b97f9 100644
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -2306,7 +2306,7 @@ int qcom_scm_wait_for_wq_completion(u32 wq_ctx)
if (IS_ERR(wq))
return PTR_ERR(wq);
- wait_for_completion(wq);
+ wait_for_completion_state(wq, TASK_IDLE);
return 0;
}