diff mbox series

firmware: arm_scmi: Add delayed response status check

Message ID 20210608103056.3388-1-cristian.marussi@arm.com (mailing list archive)
State New, archived
Headers show
Series firmware: arm_scmi: Add delayed response status check | expand

Commit Message

Cristian Marussi June 8, 2021, 10:30 a.m. UTC
A successfully received delayed response could anyway report a failure at
the protocol layer in the message status field.

Add a check also for this error condition.

Fixes: 58ecdf03dbb9 ("firmware: arm_scmi: Add support for asynchronous commands and delayed response")
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
---
 drivers/firmware/arm_scmi/driver.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Sudeep Holla June 9, 2021, 8:46 p.m. UTC | #1
On Tue, 8 Jun 2021 11:30:56 +0100, Cristian Marussi wrote:
> A successfully received delayed response could anyway report a failure at
> the protocol layer in the message status field.
> 
> Add a check also for this error condition.

Applied to sudeep.holla/linux (master), thanks!

[1/1] firmware: arm_scmi: Add delayed response status check
      https://git.kernel.org/sudeep.holla/c/f1748b1ee1

--
Regards,
Sudeep
diff mbox series

Patch

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 759ae4a23e74..6826d516e4eb 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -519,8 +519,12 @@  static int do_xfer_with_response(const struct scmi_protocol_handle *ph,
 	xfer->async_done = &async_response;
 
 	ret = do_xfer(ph, xfer);
-	if (!ret && !wait_for_completion_timeout(xfer->async_done, timeout))
-		ret = -ETIMEDOUT;
+	if (!ret) {
+		if (!wait_for_completion_timeout(xfer->async_done, timeout))
+			ret = -ETIMEDOUT;
+		else if (xfer->hdr.status)
+			ret = scmi_to_linux_errno(xfer->hdr.status);
+	}
 
 	xfer->async_done = NULL;
 	return ret;