lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 312/351] firmware: arm_scmi: Add delayed response status check
    Date
    From: Cristian Marussi <cristian.marussi@arm.com>

    [ Upstream commit f1748b1ee1fa0fd1a074504045b530b62f949188 ]

    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.

    Link: https://lore.kernel.org/r/20210608103056.3388-1-cristian.marussi@arm.com
    Fixes: 58ecdf03dbb9 ("firmware: arm_scmi: Add support for asynchronous commands and delayed response")
    Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
    Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/firmware/arm_scmi/driver.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
    index 5e8e9337adc7..c2983ed53494 100644
    --- a/drivers/firmware/arm_scmi/driver.c
    +++ b/drivers/firmware/arm_scmi/driver.c
    @@ -517,8 +517,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;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-19 19:55    [W:3.042 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site