crypto: ccp - Avoid discarding errors in psp_send_platform_access_msg()

Errors can potentially occur in the "processing" of PSP commands or
commands can be processed successfully but still return an error code in
the header.

This second case was being discarded because PSP communication worked but
the command returned an error code in the payload header.

Capture both cases and return them to the caller as -EIO for the caller
to investigate. The caller can detect the latter by looking at
`req->header->status`.

Reported-and-tested-by: Tim Van Patten <timvp@google.com>
Fixes: 7ccc4f4e2e50 ("crypto: ccp - Add support for an interface for platform features")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/ccp/platform-access.c b/drivers/crypto/ccp/platform-access.c
index 94367bc49e35b869dc5093a918c21f325459fce6..1b8ed33897332efe3ff260607d477defedc3a4dc 100644 (file)
--- a/drivers/crypto/ccp/platform-access.c
+++ b/drivers/crypto/ccp/platform-access.c
@@ -118,9 +118,16 @@ int psp_send_platform_access_msg(enum psp_platform_access_msg msg,
                goto unlock;
        }
 
-       /* Store the status in request header for caller to investigate */
+       /*
+        * Read status from PSP. If status is non-zero, it indicates an error
+        * occurred during "processing" of the command.
+        * If status is zero, it indicates the command was "processed"
+        * successfully, but the result of the command is in the payload.
+        * Return both cases to the caller as -EIO to investigate.
+        */
        cmd_reg = ioread32(cmd);
-       req->header.status = FIELD_GET(PSP_CMDRESP_STS, cmd_reg);
+       if (FIELD_GET(PSP_CMDRESP_STS, cmd_reg))
+               req->header.status = FIELD_GET(PSP_CMDRESP_STS, cmd_reg);
        if (req->header.status) {
                ret = -EIO;
                goto unlock;