From: Artem Shimko <artyom.shimko@gmail.com>
To: Sudeep Holla <sudeep.holla@arm.com>,
Cristian Marussi <cristian.marussi@arm.com>
Cc: a.shimko.dev@gmail.com, arm-scmi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/1] rivers: scmi: Add completion timeout handling for raw mode transfers
Date: Mon, 29 Sep 2025 16:14:21 +0300 [thread overview]
Message-ID: <20250929131422.525315-2-a.shimko.dev@gmail.com> (raw)
In-Reply-To: <20250929131422.525315-1-a.shimko.dev@gmail.com>
Fix race conditions in SCMI raw mode implementation by adding proper
completion timeout handling. Multiple tests in the SCMI test suite
were failing due to early clearing of SCMI_XFER_FLAG_IS_RAW flag in
scmi_xfer_raw_put() function.
The root cause:
Tests were failing on poll() system calls with this condition:
if (!raw || (idx == SCMI_RAW_REPLY_QUEUE && !SCMI_XFER_IS_RAW(xfer)))
return;
The SCMI_XFER_FLAG_IS_RAW flag was being cleared prematurely before
the transfer completion was properly acknowledged, causing the poll
to return on timeout and tests to fail.
Сhanges implemented:
1. Add completion wait with timeout in scmi_xfer_raw_worker()
2. Signal completion in scmi_raw_message_report()
This ensures:
- Proper synchronization between transfer completion and flag clearing
- Prevention of indefinite blocking with timeout safety mechanism
- Stable test execution by maintaining correct flag states
arm scmi tests: https://gitlab.arm.com/tests/scmi-tests/-/releases
Signed-off-by: Artem Shimko <a.shimko.dev@gmail.com>
---
drivers/firmware/arm_scmi/raw_mode.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/firmware/arm_scmi/raw_mode.c b/drivers/firmware/arm_scmi/raw_mode.c
index 73db5492ab44..fb83beb42e7b 100644
--- a/drivers/firmware/arm_scmi/raw_mode.c
+++ b/drivers/firmware/arm_scmi/raw_mode.c
@@ -468,6 +468,12 @@ static void scmi_xfer_raw_worker(struct work_struct *work)
ret = scmi_xfer_raw_wait_for_message_response(cinfo, xfer,
timeout_ms);
+ if (!ret)
+ if (!wait_for_completion_timeout(&xfer->done, timeout_ms))
+ dev_err(dev,
+ "timed out in RAW resp - HDR:%08X\n",
+ pack_scmi_header(&xfer->hdr));
+
if (!ret && xfer->hdr.status)
ret = scmi_to_linux_errno(xfer->hdr.status);
@@ -1381,6 +1387,8 @@ void scmi_raw_message_report(void *r, struct scmi_xfer *xfer,
if (!raw || (idx == SCMI_RAW_REPLY_QUEUE && !SCMI_XFER_IS_RAW(xfer)))
return;
+ complete(&xfer->done);
+
dev = raw->handle->dev;
q = scmi_raw_queue_select(raw, idx,
SCMI_XFER_IS_CHAN_SET(xfer) ? chan_id : 0);
--
2.43.0
next parent reply other threads:[~2025-09-29 13:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250929131422.525315-1-a.shimko.dev@gmail.com>
2025-09-29 13:14 ` Artem Shimko [this message]
2025-09-29 13:59 ` [PATCH 1/1] rivers: scmi: Add completion timeout handling for raw mode transfers Artem Shimko
[not found] <20250929131011.524842-1-a.shimko.dev@gmail.com>
2025-09-29 13:10 ` Artem Shimko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250929131422.525315-2-a.shimko.dev@gmail.com \
--to=artyom.shimko@gmail.com \
--cc=a.shimko.dev@gmail.com \
--cc=arm-scmi@vger.kernel.org \
--cc=cristian.marussi@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sudeep.holla@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.