Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel...

[thirdparty/linux.git] / drivers / crypto / ccp / sev-dev.c

diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index bf095baca244a1638310985c74fb9db92df7f763..f97166fba9d93061737f51766f7bb3d1e4f2757f 100644 (file)
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -7,6 +7,7 @@
  * Author: Brijesh Singh <brijesh.singh@amd.com>
  */
 
+#include <linux/bitfield.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
@@ -24,6 +25,7 @@
 #include <linux/cpufeature.h>
 #include <linux/fs.h>
 #include <linux/fs_struct.h>
+#include <linux/psp.h>
 
 #include <asm/smp.h>
 #include <asm/cacheflush.h>
@@ -102,7 +104,7 @@ static void sev_irq_handler(int irq, void *data, unsigned int status)
 
        /* Check if it is SEV command completion: */
        reg = ioread32(sev->io_regs + sev->vdata->cmdresp_reg);
-       if (reg & PSP_CMDRESP_RESP) {
+       if (FIELD_GET(PSP_CMDRESP_RESP, reg)) {
                sev->int_rcvd = 1;
                wake_up(&sev->int_queue);
        }
@@ -346,9 +348,7 @@ static int __sev_do_cmd_locked(int cmd, void *data, int *psp_ret)
 
        sev->int_rcvd = 0;
 
-       reg = cmd;
-       reg <<= SEV_CMDRESP_CMD_SHIFT;
-       reg |= SEV_CMDRESP_IOC;
+       reg = FIELD_PREP(SEV_CMDRESP_CMD, cmd) | SEV_CMDRESP_IOC;
        iowrite32(reg, sev->io_regs + sev->vdata->cmdresp_reg);
 
        /* wait for command completion */
@@ -366,11 +366,11 @@ static int __sev_do_cmd_locked(int cmd, void *data, int *psp_ret)
        psp_timeout = psp_cmd_timeout;
 
        if (psp_ret)
-               *psp_ret = reg & PSP_CMDRESP_ERR_MASK;
+               *psp_ret = FIELD_GET(PSP_CMDRESP_STS, reg);
 
-       if (reg & PSP_CMDRESP_ERR_MASK) {
-               dev_dbg(sev->dev, "sev command %#x failed (%#010x)\n",
-                       cmd, reg & PSP_CMDRESP_ERR_MASK);
+       if (FIELD_GET(PSP_CMDRESP_STS, reg)) {
+               dev_dbg(sev->dev, "sev command %#x failed (%#010lx)\n",
+                       cmd, FIELD_GET(PSP_CMDRESP_STS, reg));
                ret = -EIO;
        } else {
                ret = sev_write_init_ex_file_if_required(cmd);
@@ -442,12 +442,19 @@ static int __sev_init_ex_locked(int *error)
        return __sev_do_cmd_locked(SEV_CMD_INIT_EX, &data, error);
 }
 
+static inline int __sev_do_init_locked(int *psp_ret)
+{
+       if (sev_init_ex_buffer)
+               return __sev_init_ex_locked(psp_ret);
+       else
+               return __sev_init_locked(psp_ret);
+}
+
 static int __sev_platform_init_locked(int *error)
 {
+       int rc = 0, psp_ret = SEV_RET_NO_FW_CALL;
        struct psp_device *psp = psp_master;
        struct sev_device *sev;
-       int rc = 0, psp_ret = -1;
-       int (*init_function)(int *error);
 
        if (!psp || !psp->sev_data)
                return -ENODEV;
@@ -458,15 +465,12 @@ static int __sev_platform_init_locked(int *error)
                return 0;
 
        if (sev_init_ex_buffer) {
-               init_function = __sev_init_ex_locked;
                rc = sev_read_init_ex_file();
                if (rc)
                        return rc;
-       } else {
-               init_function = __sev_init_locked;
        }
 
-       rc = init_function(&psp_ret);
+       rc = __sev_do_init_locked(&psp_ret);
        if (rc && psp_ret == SEV_RET_SECURE_DATA_INVALID) {
                /*
                 * Initialization command returned an integrity check failure
@@ -475,9 +479,11 @@ static int __sev_platform_init_locked(int *error)
                 * initialization function should succeed by replacing the state
                 * with a reset state.
                 */
-               dev_err(sev->dev, "SEV: retrying INIT command because of SECURE_DATA_INVALID error. Retrying once to reset PSP SEV state.");
-               rc = init_function(&psp_ret);
+               dev_err(sev->dev,
+"SEV: retrying INIT command because of SECURE_DATA_INVALID error. Retrying once to reset PSP SEV state.");
+               rc = __sev_do_init_locked(&psp_ret);
        }
+
        if (error)
                *error = psp_ret;