The i2c-designware-amdpsp driver communicates with a platform
features mailbox provided by the PSP. The address used for
communication is discovered via a non-architecturally
guaranteed mechanism.
To better scale, export a feature for communication with platform
features directly from the ccp driver.
v1->v2:
* Pick up tags
* Fix dependencies
* Add support for Skyrim (3 new patches in series)
Mario Limonciello (9):
crypto: ccp: Drop TEE support for IRQ handler
crypto: ccp: Add a header for multiple drivers to use `__psp_pa`
crypto: ccp: Move some PSP mailbox bit definitions into common header
crypto: ccp: Add support for an interface for platform features
crypto: ccp: Enable platform access interface on client PSP parts
i2c: designware: Use PCI PSP driver for communication
crypto: ccp: Add support for ringing a platform doorbell
i2c: designware: Add doorbell support for Skyrim
crypto: ccp: Add doorbell register offset
arch/x86/kvm/svm/sev.c | 1 +
drivers/crypto/ccp/Makefile | 3 +-
drivers/crypto/ccp/platform-access.c | 216 ++++++++++++++++++++
drivers/crypto/ccp/platform-access.h | 34 +++
drivers/crypto/ccp/psp-dev.c | 32 +--
drivers/crypto/ccp/psp-dev.h | 11 +-
drivers/crypto/ccp/sev-dev.c | 16 +-
drivers/crypto/ccp/sev-dev.h | 2 +-
drivers/crypto/ccp/sp-dev.h | 8 +
drivers/crypto/ccp/sp-pci.c | 8 +
drivers/crypto/ccp/tee-dev.c | 17 +-
drivers/i2c/busses/Kconfig | 2 +-
drivers/i2c/busses/i2c-designware-amdpsp.c | 179 +++-------------
drivers/i2c/busses/i2c-designware-core.h | 1 -
drivers/i2c/busses/i2c-designware-platdrv.c | 2 +-
drivers/tee/amdtee/call.c | 2 +-
drivers/tee/amdtee/shm_pool.c | 2 +-
include/linux/psp-platform-access.h | 65 ++++++
include/linux/psp-sev.h | 8 -
include/linux/psp.h | 29 +++
20 files changed, 432 insertions(+), 206 deletions(-)
create mode 100644 drivers/crypto/ccp/platform-access.c
create mode 100644 drivers/crypto/ccp/platform-access.h
create mode 100644 include/linux/psp-platform-access.h
create mode 100644 include/linux/psp.h
--
2.34.1
The only PSP mailbox that currently supports interrupt on completion
is the SEV mailbox. Drop the dead code for the TEE subdriver to
potentially call it.
Signed-off-by: Mario Limonciello <[email protected]>
---
drivers/crypto/ccp/psp-dev.c | 15 ---------------
drivers/crypto/ccp/psp-dev.h | 7 -------
2 files changed, 22 deletions(-)
diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
index c9c741ac8442..cd8d1974726a 100644
--- a/drivers/crypto/ccp/psp-dev.c
+++ b/drivers/crypto/ccp/psp-dev.c
@@ -46,9 +46,6 @@ static irqreturn_t psp_irq_handler(int irq, void *data)
if (status) {
if (psp->sev_irq_handler)
psp->sev_irq_handler(irq, psp->sev_irq_data, status);
-
- if (psp->tee_irq_handler)
- psp->tee_irq_handler(irq, psp->tee_irq_data, status);
}
/* Clear the interrupt status by writing the same value we read. */
@@ -219,18 +216,6 @@ void psp_clear_sev_irq_handler(struct psp_device *psp)
psp_set_sev_irq_handler(psp, NULL, NULL);
}
-void psp_set_tee_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
- void *data)
-{
- psp->tee_irq_data = data;
- psp->tee_irq_handler = handler;
-}
-
-void psp_clear_tee_irq_handler(struct psp_device *psp)
-{
- psp_set_tee_irq_handler(psp, NULL, NULL);
-}
-
struct psp_device *psp_get_master_device(void)
{
struct sp_device *sp = sp_get_psp_master_device();
diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/psp-dev.h
index d528eb04c3ef..06e1f317216d 100644
--- a/drivers/crypto/ccp/psp-dev.h
+++ b/drivers/crypto/ccp/psp-dev.h
@@ -40,9 +40,6 @@ struct psp_device {
psp_irq_handler_t sev_irq_handler;
void *sev_irq_data;
- psp_irq_handler_t tee_irq_handler;
- void *tee_irq_data;
-
void *sev_data;
void *tee_data;
@@ -53,10 +50,6 @@ void psp_set_sev_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
void *data);
void psp_clear_sev_irq_handler(struct psp_device *psp);
-void psp_set_tee_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
- void *data);
-void psp_clear_tee_irq_handler(struct psp_device *psp);
-
struct psp_device *psp_get_master_device(void);
#define PSP_CAPABILITY_SEV BIT(0)
--
2.34.1
The TEE subdriver for CCP, the amdtee driver and the i2c-designware-amdpsp
drivers all include `psp-sev.h` even though they don't use SEV
functionality.
Move the definition of `__psp_pa` into a common header to be included
by all of these drivers.
Reviewed-by: Jan Dabros <[email protected]>
Acked-by: Jarkko Nikula <[email protected]> # For the drivers/i2c/busses/i2c-designware-amdpsp.c
Acked-by: Sumit Garg <[email protected]> # For TEE subsystem bits
Signed-off-by: Mario Limonciello <[email protected]>
---
v1->v2:
* Add tags
---
arch/x86/kvm/svm/sev.c | 1 +
drivers/crypto/ccp/sev-dev.c | 1 +
drivers/crypto/ccp/tee-dev.c | 2 +-
drivers/i2c/busses/i2c-designware-amdpsp.c | 2 +-
drivers/tee/amdtee/call.c | 2 +-
drivers/tee/amdtee/shm_pool.c | 2 +-
include/linux/psp-sev.h | 8 --------
include/linux/psp.h | 14 ++++++++++++++
8 files changed, 20 insertions(+), 12 deletions(-)
create mode 100644 include/linux/psp.h
diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index c25aeb550cd9..ec18a756b7c9 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -12,6 +12,7 @@
#include <linux/kvm_host.h>
#include <linux/kernel.h>
#include <linux/highmem.h>
+#include <linux/psp.h>
#include <linux/psp-sev.h>
#include <linux/pagemap.h>
#include <linux/swap.h>
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index e2f25926eb51..28945ca7c856 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -24,6 +24,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>
diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c
index 5c9d47f3be37..f24fc953718a 100644
--- a/drivers/crypto/ccp/tee-dev.c
+++ b/drivers/crypto/ccp/tee-dev.c
@@ -13,7 +13,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/gfp.h>
-#include <linux/psp-sev.h>
+#include <linux/psp.h>
#include <linux/psp-tee.h>
#include "psp-dev.h"
diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c b/drivers/i2c/busses/i2c-designware-amdpsp.c
index 8f36167bce62..80f28a1bbbef 100644
--- a/drivers/i2c/busses/i2c-designware-amdpsp.c
+++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
@@ -4,7 +4,7 @@
#include <linux/bits.h>
#include <linux/i2c.h>
#include <linux/io-64-nonatomic-lo-hi.h>
-#include <linux/psp-sev.h>
+#include <linux/psp.h>
#include <linux/types.h>
#include <linux/workqueue.h>
diff --git a/drivers/tee/amdtee/call.c b/drivers/tee/amdtee/call.c
index cec6e70f0ac9..e8cd9aaa3467 100644
--- a/drivers/tee/amdtee/call.c
+++ b/drivers/tee/amdtee/call.c
@@ -8,7 +8,7 @@
#include <linux/tee_drv.h>
#include <linux/psp-tee.h>
#include <linux/slab.h>
-#include <linux/psp-sev.h>
+#include <linux/psp.h>
#include "amdtee_if.h"
#include "amdtee_private.h"
diff --git a/drivers/tee/amdtee/shm_pool.c b/drivers/tee/amdtee/shm_pool.c
index f87f96a291c9..f0303126f199 100644
--- a/drivers/tee/amdtee/shm_pool.c
+++ b/drivers/tee/amdtee/shm_pool.c
@@ -5,7 +5,7 @@
#include <linux/slab.h>
#include <linux/tee_drv.h>
-#include <linux/psp-sev.h>
+#include <linux/psp.h>
#include "amdtee_private.h"
static int pool_op_alloc(struct tee_shm_pool *pool, struct tee_shm *shm,
diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h
index 1595088c428b..7fd17e82bab4 100644
--- a/include/linux/psp-sev.h
+++ b/include/linux/psp-sev.h
@@ -14,14 +14,6 @@
#include <uapi/linux/psp-sev.h>
-#ifdef CONFIG_X86
-#include <linux/mem_encrypt.h>
-
-#define __psp_pa(x) __sme_pa(x)
-#else
-#define __psp_pa(x) __pa(x)
-#endif
-
#define SEV_FW_BLOB_MAX_SIZE 0x4000 /* 16KB */
/**
diff --git a/include/linux/psp.h b/include/linux/psp.h
new file mode 100644
index 000000000000..202162487ec3
--- /dev/null
+++ b/include/linux/psp.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __PSP_H
+#define __PSP_H
+
+#ifdef CONFIG_X86
+#include <linux/mem_encrypt.h>
+
+#define __psp_pa(x) __sme_pa(x)
+#else
+#define __psp_pa(x) __pa(x)
+#endif
+
+#endif /* __PSP_H */
--
2.34.1
Client PSP parts support the platform access interface. Add
the register offsets so that client parts will initialize this
interface.
Signed-off-by: Mario Limonciello <[email protected]>
---
drivers/crypto/ccp/sp-pci.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
index cde33b2ac71b..18aa902eb5ce 100644
--- a/drivers/crypto/ccp/sp-pci.c
+++ b/drivers/crypto/ccp/sp-pci.c
@@ -361,6 +361,12 @@ static const struct tee_vdata teev1 = {
.ring_rptr_reg = 0x10554, /* C2PMSG_21 */
};
+static const struct platform_access_vdata pa_v1 = {
+ .cmdresp_reg = 0x10570, /* C2PMSG_28 */
+ .cmdbuff_addr_lo_reg = 0x10574, /* C2PMSG_29 */
+ .cmdbuff_addr_hi_reg = 0x10578, /* C2PMSG_30 */
+};
+
static const struct psp_vdata pspv1 = {
.sev = &sevv1,
.feature_reg = 0x105fc, /* C2PMSG_63 */
@@ -377,6 +383,7 @@ static const struct psp_vdata pspv2 = {
static const struct psp_vdata pspv3 = {
.tee = &teev1,
+ .platform_access = &pa_v1,
.feature_reg = 0x109fc, /* C2PMSG_63 */
.inten_reg = 0x10690, /* P2CMSG_INTEN */
.intsts_reg = 0x10694, /* P2CMSG_INTSTS */
--
2.34.1
Some of the bits and fields used for mailboxes communicating with the
PSP are common across all mailbox implementations (SEV, TEE, etc).
Move these bits into the common `linux/psp.h` so they don't need to
be re-defined for each implementation.
Signed-off-by: Mario Limonciello <[email protected]>
---
v1->v2:
* Update comment to indicate it's PSP response not PSP ready
---
drivers/crypto/ccp/psp-dev.h | 3 ---
drivers/crypto/ccp/sev-dev.c | 15 +++++++--------
drivers/crypto/ccp/sev-dev.h | 2 +-
drivers/crypto/ccp/tee-dev.c | 15 ++++++++-------
drivers/i2c/busses/i2c-designware-amdpsp.c | 16 +++++-----------
include/linux/psp.h | 12 ++++++++++++
6 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/psp-dev.h
index 06e1f317216d..55f54bb2b3fb 100644
--- a/drivers/crypto/ccp/psp-dev.h
+++ b/drivers/crypto/ccp/psp-dev.h
@@ -17,9 +17,6 @@
#include "sp-dev.h"
-#define PSP_CMDRESP_RESP BIT(31)
-#define PSP_CMDRESP_ERR_MASK 0xffff
-
#define MAX_PSP_NAME_LEN 16
extern struct psp_device *psp_master;
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index 28945ca7c856..6440d35dfa4e 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -7,6 +7,7 @@
* Author: Brijesh Singh <[email protected]>
*/
+#include <linux/bitfield.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/kthread.h>
@@ -103,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);
}
@@ -347,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 */
@@ -367,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);
diff --git a/drivers/crypto/ccp/sev-dev.h b/drivers/crypto/ccp/sev-dev.h
index 666c21eb81ab..778c95155e74 100644
--- a/drivers/crypto/ccp/sev-dev.h
+++ b/drivers/crypto/ccp/sev-dev.h
@@ -25,8 +25,8 @@
#include <linux/miscdevice.h>
#include <linux/capability.h>
+#define SEV_CMDRESP_CMD GENMASK(26, 16)
#define SEV_CMD_COMPLETE BIT(1)
-#define SEV_CMDRESP_CMD_SHIFT 16
#define SEV_CMDRESP_IOC BIT(0)
struct sev_misc_dev {
diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c
index f24fc953718a..5560bf8329a1 100644
--- a/drivers/crypto/ccp/tee-dev.c
+++ b/drivers/crypto/ccp/tee-dev.c
@@ -8,6 +8,7 @@
* Copyright (C) 2019,2021 Advanced Micro Devices, Inc.
*/
+#include <linux/bitfield.h>
#include <linux/types.h>
#include <linux/mutex.h>
#include <linux/delay.h>
@@ -69,7 +70,7 @@ static int tee_wait_cmd_poll(struct psp_tee_device *tee, unsigned int timeout,
while (--nloop) {
*reg = ioread32(tee->io_regs + tee->vdata->cmdresp_reg);
- if (*reg & PSP_CMDRESP_RESP)
+ if (FIELD_GET(PSP_CMDRESP_RESP, *reg))
return 0;
usleep_range(10000, 10100);
@@ -149,9 +150,9 @@ static int tee_init_ring(struct psp_tee_device *tee)
goto free_buf;
}
- if (reg & PSP_CMDRESP_ERR_MASK) {
- dev_err(tee->dev, "tee: ring init command failed (%#010x)\n",
- reg & PSP_CMDRESP_ERR_MASK);
+ if (FIELD_GET(PSP_CMDRESP_STS, reg)) {
+ dev_err(tee->dev, "tee: ring init command failed (%#010lx)\n",
+ FIELD_GET(PSP_CMDRESP_STS, reg));
tee_free_ring(tee);
ret = -EIO;
}
@@ -179,9 +180,9 @@ static void tee_destroy_ring(struct psp_tee_device *tee)
ret = tee_wait_cmd_poll(tee, TEE_DEFAULT_TIMEOUT, ®);
if (ret) {
dev_err(tee->dev, "tee: ring destroy command timed out\n");
- } else if (reg & PSP_CMDRESP_ERR_MASK) {
- dev_err(tee->dev, "tee: ring destroy command failed (%#010x)\n",
- reg & PSP_CMDRESP_ERR_MASK);
+ } else if (FIELD_GET(PSP_CMDRESP_STS, reg)) {
+ dev_err(tee->dev, "tee: ring destroy command failed (%#010lx)\n",
+ FIELD_GET(PSP_CMDRESP_STS, reg));
}
free_ring:
diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c b/drivers/i2c/busses/i2c-designware-amdpsp.c
index 80f28a1bbbef..652e6b64bd5f 100644
--- a/drivers/i2c/busses/i2c-designware-amdpsp.c
+++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
@@ -25,12 +25,6 @@
#define PSP_I2C_REQ_STS_BUS_BUSY 0x1
#define PSP_I2C_REQ_STS_INV_PARAM 0x3
-#define PSP_MBOX_FIELDS_STS GENMASK(15, 0)
-#define PSP_MBOX_FIELDS_CMD GENMASK(23, 16)
-#define PSP_MBOX_FIELDS_RESERVED GENMASK(29, 24)
-#define PSP_MBOX_FIELDS_RECOVERY BIT(30)
-#define PSP_MBOX_FIELDS_READY BIT(31)
-
struct psp_req_buffer_hdr {
u32 total_size;
u32 status;
@@ -99,15 +93,15 @@ static int psp_check_mbox_recovery(struct psp_mbox __iomem *mbox)
tmp = readl(&mbox->cmd_fields);
- return FIELD_GET(PSP_MBOX_FIELDS_RECOVERY, tmp);
+ return FIELD_GET(PSP_CMDRESP_RECOVERY, tmp);
}
static int psp_wait_cmd(struct psp_mbox __iomem *mbox)
{
u32 tmp, expected;
- /* Expect mbox_cmd to be cleared and ready bit to be set by PSP */
- expected = FIELD_PREP(PSP_MBOX_FIELDS_READY, 1);
+ /* Expect mbox_cmd to be cleared and the response bit to be set by PSP */
+ expected = FIELD_PREP(PSP_CMDRESP_RESP, 1);
/*
* Check for readiness of PSP mailbox in a tight loop in order to
@@ -124,7 +118,7 @@ static u32 psp_check_mbox_sts(struct psp_mbox __iomem *mbox)
cmd_reg = readl(&mbox->cmd_fields);
- return FIELD_GET(PSP_MBOX_FIELDS_STS, cmd_reg);
+ return FIELD_GET(PSP_CMDRESP_STS, cmd_reg);
}
static int psp_send_cmd(struct psp_i2c_req *req)
@@ -148,7 +142,7 @@ static int psp_send_cmd(struct psp_i2c_req *req)
writeq(req_addr, &mbox->i2c_req_addr);
/* Write command register to trigger processing */
- cmd_reg = FIELD_PREP(PSP_MBOX_FIELDS_CMD, PSP_I2C_REQ_BUS_CMD);
+ cmd_reg = FIELD_PREP(PSP_CMDRESP_CMD, PSP_I2C_REQ_BUS_CMD);
writel(cmd_reg, &mbox->cmd_fields);
if (psp_wait_cmd(mbox))
diff --git a/include/linux/psp.h b/include/linux/psp.h
index 202162487ec3..d3424790a70e 100644
--- a/include/linux/psp.h
+++ b/include/linux/psp.h
@@ -11,4 +11,16 @@
#define __psp_pa(x) __pa(x)
#endif
+/*
+ * Fields and bits used by most PSP mailboxes
+ *
+ * Note: Some mailboxes (such as SEV) have extra bits or different meanings
+ * and should include an appropriate local definition in their source file.
+ */
+#define PSP_CMDRESP_STS GENMASK(15, 0)
+#define PSP_CMDRESP_CMD GENMASK(23, 16)
+#define PSP_CMDRESP_RESERVED GENMASK(29, 24)
+#define PSP_CMDRESP_RECOVERY BIT(30)
+#define PSP_CMDRESP_RESP BIT(31)
+
#endif /* __PSP_H */
--
2.34.1
Some platforms with a PSP support an interface for features that
interact directly with the PSP instead of through a SEV or TEE
environment.
Initialize this interface so that other drivers can consume it.
These drivers may either be subdrivers for the ccp module or
external modules. For external modules, export a symbol for them
to utilize.
Signed-off-by: Mario Limonciello <[email protected]>
---
v1->v2:
* Fix comment text
* Add safety check that register values were populated
---
drivers/crypto/ccp/Makefile | 3 +-
drivers/crypto/ccp/platform-access.c | 169 +++++++++++++++++++++++++++
drivers/crypto/ccp/platform-access.h | 34 ++++++
drivers/crypto/ccp/psp-dev.c | 17 +++
drivers/crypto/ccp/psp-dev.h | 1 +
drivers/crypto/ccp/sp-dev.h | 7 ++
include/linux/psp-platform-access.h | 49 ++++++++
7 files changed, 279 insertions(+), 1 deletion(-)
create mode 100644 drivers/crypto/ccp/platform-access.c
create mode 100644 drivers/crypto/ccp/platform-access.h
create mode 100644 include/linux/psp-platform-access.h
diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile
index db362fe472ea..f6196495e862 100644
--- a/drivers/crypto/ccp/Makefile
+++ b/drivers/crypto/ccp/Makefile
@@ -10,7 +10,8 @@ ccp-$(CONFIG_CRYPTO_DEV_CCP_DEBUGFS) += ccp-debugfs.o
ccp-$(CONFIG_PCI) += sp-pci.o
ccp-$(CONFIG_CRYPTO_DEV_SP_PSP) += psp-dev.o \
sev-dev.o \
- tee-dev.o
+ tee-dev.o \
+ platform-access.o
obj-$(CONFIG_CRYPTO_DEV_CCP_CRYPTO) += ccp-crypto.o
ccp-crypto-objs := ccp-crypto-main.o \
diff --git a/drivers/crypto/ccp/platform-access.c b/drivers/crypto/ccp/platform-access.c
new file mode 100644
index 000000000000..af3a1e97abfe
--- /dev/null
+++ b/drivers/crypto/ccp/platform-access.c
@@ -0,0 +1,169 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * AMD Platform Security Processor (PSP) Platform Access interface
+ *
+ * Copyright (C) 2023 Advanced Micro Devices, Inc.
+ *
+ * Author: Mario Limonciello <[email protected]>
+ *
+ * Some of this code is adapted from drivers/i2c/busses/i2c-designware-amdpsp.c
+ * developed by Jan Dabros <[email protected]> and Copyright (C) 2022 Google Inc.
+ *
+ */
+
+#include <linux/bitfield.h>
+#include <linux/errno.h>
+#include <linux/iopoll.h>
+#include <linux/mutex.h>
+
+#include "platform-access.h"
+
+#define PSP_CMD_TIMEOUT_US (500 * USEC_PER_MSEC)
+
+/* Recovery field should be equal 0 to start sending commands */
+static int check_recovery(u32 __iomem *cmd)
+{
+ return FIELD_GET(PSP_CMDRESP_RECOVERY, ioread32(cmd));
+}
+
+static int wait_cmd(u32 __iomem *cmd)
+{
+ u32 tmp, expected;
+
+ /* Expect mbox_cmd to be cleared and ready bit to be set by PSP */
+ expected = FIELD_PREP(PSP_CMDRESP_RESP, 1);
+
+ /*
+ * Check for readiness of PSP mailbox in a tight loop in order to
+ * process further as soon as command was consumed.
+ */
+ return readl_poll_timeout(cmd, tmp, (tmp & expected), 0,
+ PSP_CMD_TIMEOUT_US);
+}
+
+int psp_check_platform_access_status(void)
+{
+ struct psp_device *psp = psp_get_master_device();
+
+ if (!psp || !psp->platform_access_data)
+ return -ENODEV;
+
+ return 0;
+}
+EXPORT_SYMBOL(psp_check_platform_access_status);
+
+int psp_send_platform_access_msg(enum psp_platform_access_msg msg,
+ struct psp_request *req)
+{
+ struct psp_device *psp = psp_get_master_device();
+ u32 __iomem *cmd, __iomem *lo, __iomem *hi;
+ struct psp_platform_access_device *pa_dev;
+ phys_addr_t req_addr;
+ u32 cmd_reg;
+ int ret;
+
+ if (!psp || !psp->platform_access_data)
+ return -ENODEV;
+
+ pa_dev = psp->platform_access_data;
+ cmd = psp->io_regs + pa_dev->vdata->cmdresp_reg;
+ lo = psp->io_regs + pa_dev->vdata->cmdbuff_addr_lo_reg;
+ hi = psp->io_regs + pa_dev->vdata->cmdbuff_addr_hi_reg;
+
+ if (!cmd || !lo || !hi)
+ return -ENODEV;
+
+ mutex_lock(&pa_dev->mutex);
+
+ if (check_recovery(cmd)) {
+ dev_dbg(psp->dev, "in recovery\n");
+ ret = -EBUSY;
+ goto unlock;
+ }
+
+ if (wait_cmd(cmd)) {
+ dev_dbg(psp->dev, "not done processing command\n");
+ ret = -EBUSY;
+ goto unlock;
+ }
+
+ /*
+ * Fill mailbox with address of command-response buffer, which will be
+ * used for sending i2c requests as well as reading status returned by
+ * PSP. Use physical address of buffer, since PSP will map this region.
+ */
+ req_addr = __psp_pa(req);
+ iowrite32(lower_32_bits(req_addr), lo);
+ iowrite32(upper_32_bits(req_addr), hi);
+
+ print_hex_dump_debug("->psp ", DUMP_PREFIX_OFFSET, 16, 2, req,
+ req->header.payload_size, false);
+
+ /* Write command register to trigger processing */
+ cmd_reg = FIELD_PREP(PSP_CMDRESP_CMD, msg);
+ iowrite32(cmd_reg, cmd);
+
+ if (wait_cmd(cmd)) {
+ ret = -ETIMEDOUT;
+ goto unlock;
+ }
+
+ /* Ensure it was triggered by this driver */
+ if (ioread32(lo) != lower_32_bits(req_addr) ||
+ ioread32(hi) != upper_32_bits(req_addr)) {
+ ret = -EBUSY;
+ goto unlock;
+ }
+
+ /* Store the status in request header for caller to investigate */
+ cmd_reg = ioread32(cmd);
+ req->header.status = FIELD_GET(PSP_CMDRESP_STS, cmd_reg);
+ if (req->header.status) {
+ ret = -EIO;
+ goto unlock;
+ }
+
+ print_hex_dump_debug("<-psp ", DUMP_PREFIX_OFFSET, 16, 2, req,
+ req->header.payload_size, false);
+
+ ret = 0;
+
+unlock:
+ mutex_unlock(&pa_dev->mutex);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(psp_send_platform_access_msg);
+
+void platform_access_dev_destroy(struct psp_device *psp)
+{
+ struct psp_platform_access_device *pa_dev = psp->platform_access_data;
+
+ if (!pa_dev)
+ return;
+
+ mutex_destroy(&pa_dev->mutex);
+ psp->platform_access_data = NULL;
+}
+
+int platform_access_dev_init(struct psp_device *psp)
+{
+ struct device *dev = psp->dev;
+ struct psp_platform_access_device *pa_dev;
+
+ pa_dev = devm_kzalloc(dev, sizeof(*pa_dev), GFP_KERNEL);
+ if (!pa_dev)
+ return -ENOMEM;
+
+ psp->platform_access_data = pa_dev;
+ pa_dev->psp = psp;
+ pa_dev->dev = dev;
+
+ pa_dev->vdata = (struct platform_access_vdata *)psp->vdata->platform_access;
+
+ mutex_init(&pa_dev->mutex);
+
+ dev_dbg(dev, "platform access enabled\n");
+
+ return 0;
+}
diff --git a/drivers/crypto/ccp/platform-access.h b/drivers/crypto/ccp/platform-access.h
new file mode 100644
index 000000000000..56bc8eabeacc
--- /dev/null
+++ b/drivers/crypto/ccp/platform-access.h
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * AMD Platform Security Processor (PSP) Platform Access interface
+ *
+ * Copyright (C) 2023 Advanced Micro Devices, Inc.
+ *
+ * Author: Mario Limonciello <[email protected]>
+ */
+
+#ifndef __PSP_PLATFORM_ACCESS_H__
+#define __PSP_PLATFORM_ACCESS_H__
+
+#include <linux/device.h>
+#include <linux/miscdevice.h>
+#include <linux/mutex.h>
+#include <linux/psp-platform-access.h>
+
+#include "psp-dev.h"
+
+struct psp_platform_access_device {
+ struct device *dev;
+ struct psp_device *psp;
+
+ struct platform_access_vdata *vdata;
+
+ struct mutex mutex;
+
+ void *platform_access_data;
+};
+
+void platform_access_dev_destroy(struct psp_device *psp);
+int platform_access_dev_init(struct psp_device *psp);
+
+#endif /* __PSP_PLATFORM_ACCESS_H__ */
diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
index cd8d1974726a..ec98f19800de 100644
--- a/drivers/crypto/ccp/psp-dev.c
+++ b/drivers/crypto/ccp/psp-dev.c
@@ -14,6 +14,7 @@
#include "psp-dev.h"
#include "sev-dev.h"
#include "tee-dev.h"
+#include "platform-access.h"
struct psp_device *psp_master;
@@ -102,6 +103,17 @@ static int psp_check_tee_support(struct psp_device *psp)
return 0;
}
+static void psp_init_platform_access(struct psp_device *psp)
+{
+ int ret;
+
+ ret = platform_access_dev_init(psp);
+ if (ret) {
+ dev_warn(psp->dev, "platform access init failed: %d\n", ret);
+ return;
+ }
+}
+
static int psp_init(struct psp_device *psp)
{
int ret;
@@ -118,6 +130,9 @@ static int psp_init(struct psp_device *psp)
return ret;
}
+ if (psp->vdata->platform_access)
+ psp_init_platform_access(psp);
+
return 0;
}
@@ -198,6 +213,8 @@ void psp_dev_destroy(struct sp_device *sp)
tee_dev_destroy(psp);
+ platform_access_dev_destroy(psp);
+
sp_free_psp_irq(sp, psp);
if (sp->clear_psp_master_device)
diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/psp-dev.h
index 55f54bb2b3fb..505e4bdeaca8 100644
--- a/drivers/crypto/ccp/psp-dev.h
+++ b/drivers/crypto/ccp/psp-dev.h
@@ -39,6 +39,7 @@ struct psp_device {
void *sev_data;
void *tee_data;
+ void *platform_access_data;
unsigned int capability;
};
diff --git a/drivers/crypto/ccp/sp-dev.h b/drivers/crypto/ccp/sp-dev.h
index 20377e67f65d..5ec6c219a731 100644
--- a/drivers/crypto/ccp/sp-dev.h
+++ b/drivers/crypto/ccp/sp-dev.h
@@ -53,9 +53,16 @@ struct tee_vdata {
const unsigned int ring_rptr_reg;
};
+struct platform_access_vdata {
+ const unsigned int cmdresp_reg;
+ const unsigned int cmdbuff_addr_lo_reg;
+ const unsigned int cmdbuff_addr_hi_reg;
+};
+
struct psp_vdata {
const struct sev_vdata *sev;
const struct tee_vdata *tee;
+ const struct platform_access_vdata *platform_access;
const unsigned int feature_reg;
const unsigned int inten_reg;
const unsigned int intsts_reg;
diff --git a/include/linux/psp-platform-access.h b/include/linux/psp-platform-access.h
new file mode 100644
index 000000000000..977df5cfd494
--- /dev/null
+++ b/include/linux/psp-platform-access.h
@@ -0,0 +1,49 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __PSP_PLATFORM_ACCESS_H
+#define __PSP_PLATFORM_ACCESS_H
+
+#include <linux/psp.h>
+
+enum psp_platform_access_msg {
+ PSP_CMD_NONE = 0x0,
+};
+
+struct psp_req_buffer_hdr {
+ u32 payload_size;
+ u32 status;
+} __packed;
+
+struct psp_request {
+ struct psp_req_buffer_hdr header;
+ void *buf;
+} __packed;
+
+/**
+ * psp_send_platform_access_msg() - Send a message to control platform features
+ *
+ * This function is intended to be used by drivers outside of ccp to communicate
+ * with the platform.
+ *
+ * Returns:
+ * 0: success
+ * -%EBUSY: mailbox in recovery or in use
+ * -%ENODEV: driver not bound with PSP device
+ * -%ETIMEDOUT: request timed out
+ * -%EIO: unknown error (see kernel log)
+ */
+int psp_send_platform_access_msg(enum psp_platform_access_msg, struct psp_request *req);
+
+/**
+ * psp_check_platform_access_status() - Checks whether platform features is ready
+ *
+ * This function is intended to be used by drivers outside of ccp to determine
+ * if platform features has initialized.
+ *
+ * Returns:
+ * 0 platform features is ready
+ * -%ENODEV platform features is not ready or present
+ */
+int psp_check_platform_access_status(void);
+
+#endif /* __PSP_PLATFORM_ACCESS_H */
--
2.34.1
The PSP in Skyrim uses i2c arbitration with a doorbell.
Add this offset so that the communication can work.
Link: Link: https://lore.kernel.org/linux-i2c/[email protected]/
Signed-off-by: Mario Limonciello <[email protected]>
---
v1->v2:
* New patch
---
drivers/crypto/ccp/sp-pci.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
index 18aa902eb5ce..a4efcaee43d8 100644
--- a/drivers/crypto/ccp/sp-pci.c
+++ b/drivers/crypto/ccp/sp-pci.c
@@ -365,6 +365,7 @@ static const struct platform_access_vdata pa_v1 = {
.cmdresp_reg = 0x10570, /* C2PMSG_28 */
.cmdbuff_addr_lo_reg = 0x10574, /* C2PMSG_29 */
.cmdbuff_addr_hi_reg = 0x10578, /* C2PMSG_30 */
+ .doorbell_reg = 0x10a40, /* C2PMSG_80 */
};
static const struct psp_vdata pspv1 = {
--
2.34.1
Some platforms support using a doorbell to communicate. Export
this feature for other drivers to utilize as well.
Link: https://lore.kernel.org/linux-i2c/[email protected]/
Suggested-by: Jan Dabros <[email protected]>
Signed-off-by: Mario Limonciello <[email protected]>
---
v1->v2:
* New patch
---
drivers/crypto/ccp/platform-access.c | 47 ++++++++++++++++++++++++++++
drivers/crypto/ccp/sp-dev.h | 1 +
include/linux/psp-platform-access.h | 15 +++++++++
include/linux/psp.h | 3 ++
4 files changed, 66 insertions(+)
diff --git a/drivers/crypto/ccp/platform-access.c b/drivers/crypto/ccp/platform-access.c
index af3a1e97abfe..0763389a2814 100644
--- a/drivers/crypto/ccp/platform-access.c
+++ b/drivers/crypto/ccp/platform-access.c
@@ -135,6 +135,53 @@ int psp_send_platform_access_msg(enum psp_platform_access_msg msg,
}
EXPORT_SYMBOL_GPL(psp_send_platform_access_msg);
+int psp_ring_platform_doorbell(enum psp_platform_access_msg msg)
+{
+ struct psp_device *psp = psp_get_master_device();
+ struct psp_platform_access_device *pa_dev;
+ u32 __iomem *drbl;
+ u32 drbl_reg;
+ int ret;
+
+ if (!psp || !psp->platform_access_data)
+ return -ENODEV;
+
+ pa_dev = psp->platform_access_data;
+ drbl = psp->io_regs + pa_dev->vdata->doorbell_reg;
+
+ if (!drbl)
+ return -ENODEV;
+
+ mutex_lock(&pa_dev->mutex);
+
+ if (check_recovery(drbl)) {
+ dev_dbg(psp->dev, "in recovery\n");
+ ret = -EBUSY;
+ goto unlock;
+ }
+
+ if (wait_cmd(drbl)) {
+ dev_dbg(psp->dev, "not done processing command\n");
+ ret = -EBUSY;
+ goto unlock;
+ }
+
+ drbl_reg = FIELD_PREP(PSP_DRBL_MSG, msg) | PSP_DRBL_RING;
+ iowrite32(drbl_reg, drbl);
+
+ if (wait_cmd(drbl)) {
+ ret = -ETIMEDOUT;
+ goto unlock;
+ }
+
+ ret = 0;
+unlock:
+ mutex_unlock(&pa_dev->mutex);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(psp_ring_platform_doorbell);
+
void platform_access_dev_destroy(struct psp_device *psp)
{
struct psp_platform_access_device *pa_dev = psp->platform_access_data;
diff --git a/drivers/crypto/ccp/sp-dev.h b/drivers/crypto/ccp/sp-dev.h
index 5ec6c219a731..87c0b9350bc2 100644
--- a/drivers/crypto/ccp/sp-dev.h
+++ b/drivers/crypto/ccp/sp-dev.h
@@ -54,6 +54,7 @@ struct tee_vdata {
};
struct platform_access_vdata {
+ const unsigned int doorbell_reg;
const unsigned int cmdresp_reg;
const unsigned int cmdbuff_addr_lo_reg;
const unsigned int cmdbuff_addr_hi_reg;
diff --git a/include/linux/psp-platform-access.h b/include/linux/psp-platform-access.h
index f5a03cd11f10..1e1d0e077cec 100644
--- a/include/linux/psp-platform-access.h
+++ b/include/linux/psp-platform-access.h
@@ -35,6 +35,21 @@ struct psp_request {
*/
int psp_send_platform_access_msg(enum psp_platform_access_msg, struct psp_request *req);
+/**
+ * psp_ring_platform_doorbell() - Ring platform doorbell
+ *
+ * This function is intended to be used by drivers outside of ccp to ring the
+ * platform doorbell with a message.
+ *
+ * Returns:
+ * 0: success
+ * -%EBUSY: mailbox in recovery or in use
+ * -%ENODEV: driver not bound with PSP device
+ * -%ETIMEDOUT: request timed out
+ * -%EIO: unknown error (see kernel log)
+ */
+int psp_ring_platform_doorbell(enum psp_platform_access_msg);
+
/**
* psp_check_platform_access_status() - Checks whether platform features is ready
*
diff --git a/include/linux/psp.h b/include/linux/psp.h
index d3424790a70e..92e60aeef21e 100644
--- a/include/linux/psp.h
+++ b/include/linux/psp.h
@@ -23,4 +23,7 @@
#define PSP_CMDRESP_RECOVERY BIT(30)
#define PSP_CMDRESP_RESP BIT(31)
+#define PSP_DRBL_MSG PSP_CMDRESP_CMD
+#define PSP_DRBL_RING BIT(0)
+
#endif /* __PSP_H */
--
2.34.1
On 3/2/23 13:42, Mario Limonciello wrote:
> Some platforms support using a doorbell to communicate. Export
> this feature for other drivers to utilize as well.
>
> Link: https://lore.kernel.org/linux-i2c/[email protected]/
> Suggested-by: Jan Dabros <[email protected]>
> Signed-off-by: Mario Limonciello <[email protected]>
> ---
> v1->v2:
> * New patch
> ---
> drivers/crypto/ccp/platform-access.c | 47 ++++++++++++++++++++++++++++
> drivers/crypto/ccp/sp-dev.h | 1 +
> include/linux/psp-platform-access.h | 15 +++++++++
> include/linux/psp.h | 3 ++
> 4 files changed, 66 insertions(+)
>
> diff --git a/drivers/crypto/ccp/platform-access.c b/drivers/crypto/ccp/platform-access.c
> index af3a1e97abfe..0763389a2814 100644
> --- a/drivers/crypto/ccp/platform-access.c
> +++ b/drivers/crypto/ccp/platform-access.c
> @@ -135,6 +135,53 @@ int psp_send_platform_access_msg(enum psp_platform_access_msg msg,
> }
> EXPORT_SYMBOL_GPL(psp_send_platform_access_msg);
>
> +int psp_ring_platform_doorbell(enum psp_platform_access_msg msg)
> +{
> + struct psp_device *psp = psp_get_master_device();
> + struct psp_platform_access_device *pa_dev;
> + u32 __iomem *drbl;
> + u32 drbl_reg;
Lets spell out doorbell for these two variable names.
> + int ret;
> +
> + if (!psp || !psp->platform_access_data)
> + return -ENODEV;
> +
> + pa_dev = psp->platform_access_data;
> + drbl = psp->io_regs + pa_dev->vdata->doorbell_reg;
> +
> + if (!drbl)
> + return -ENODEV;
This will be non-zero because psp->io_regs will always be non-zero. Maybe
you meant to check the actual pa_dev->vdata->doorbell_reg value?
I think you should squash this and patch #9 together so that patch #8 just
works right away.
> +
> + mutex_lock(&pa_dev->mutex);
Does the doorbell register operate independently from the other registers
(C2PMSG_28 - C2PMSG_30)? If it does, you could probably just introduce a
doorbell mutex.
> +
> + if (check_recovery(drbl)) {
> + dev_dbg(psp->dev, "in recovery\n");
Maybe a bit more info as to what is "in recovery" (that goes for patch #4,
too) or just prefix it with "doorbell" (and "platform" in #4) since you
now have duplicated messages.
> + ret = -EBUSY;
> + goto unlock;
> + }
> +
> + if (wait_cmd(drbl)) {
> + dev_dbg(psp->dev, "not done processing command\n");
Ditto.
Thanks,
Tom
> + ret = -EBUSY;
> + goto unlock;
> + }
> +
> + drbl_reg = FIELD_PREP(PSP_DRBL_MSG, msg) | PSP_DRBL_RING;
> + iowrite32(drbl_reg, drbl);
> +
> + if (wait_cmd(drbl)) {
> + ret = -ETIMEDOUT;
> + goto unlock;
> + }
> +
> + ret = 0;
> +unlock:
> + mutex_unlock(&pa_dev->mutex);
> +
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(psp_ring_platform_doorbell);
> +
> void platform_access_dev_destroy(struct psp_device *psp)
> {
> struct psp_platform_access_device *pa_dev = psp->platform_access_data;
> diff --git a/drivers/crypto/ccp/sp-dev.h b/drivers/crypto/ccp/sp-dev.h
> index 5ec6c219a731..87c0b9350bc2 100644
> --- a/drivers/crypto/ccp/sp-dev.h
> +++ b/drivers/crypto/ccp/sp-dev.h
> @@ -54,6 +54,7 @@ struct tee_vdata {
> };
>
> struct platform_access_vdata {
> + const unsigned int doorbell_reg;
> const unsigned int cmdresp_reg;
> const unsigned int cmdbuff_addr_lo_reg;
> const unsigned int cmdbuff_addr_hi_reg;
> diff --git a/include/linux/psp-platform-access.h b/include/linux/psp-platform-access.h
> index f5a03cd11f10..1e1d0e077cec 100644
> --- a/include/linux/psp-platform-access.h
> +++ b/include/linux/psp-platform-access.h
> @@ -35,6 +35,21 @@ struct psp_request {
> */
> int psp_send_platform_access_msg(enum psp_platform_access_msg, struct psp_request *req);
>
> +/**
> + * psp_ring_platform_doorbell() - Ring platform doorbell
> + *
> + * This function is intended to be used by drivers outside of ccp to ring the
> + * platform doorbell with a message.
> + *
> + * Returns:
> + * 0: success
> + * -%EBUSY: mailbox in recovery or in use
> + * -%ENODEV: driver not bound with PSP device
> + * -%ETIMEDOUT: request timed out
> + * -%EIO: unknown error (see kernel log)
> + */
> +int psp_ring_platform_doorbell(enum psp_platform_access_msg);
> +
> /**
> * psp_check_platform_access_status() - Checks whether platform features is ready
> *
> diff --git a/include/linux/psp.h b/include/linux/psp.h
> index d3424790a70e..92e60aeef21e 100644
> --- a/include/linux/psp.h
> +++ b/include/linux/psp.h
> @@ -23,4 +23,7 @@
> #define PSP_CMDRESP_RECOVERY BIT(30)
> #define PSP_CMDRESP_RESP BIT(31)
>
> +#define PSP_DRBL_MSG PSP_CMDRESP_CMD
> +#define PSP_DRBL_RING BIT(0)
> +
> #endif /* __PSP_H */
[Public]
> -----Original Message-----
> From: Lendacky, Thomas <[email protected]>
> Sent: Thursday, March 2, 2023 15:52
> To: Limonciello, Mario <[email protected]>; Jan Dąbroś
> <[email protected]>; Grzegorz Bernacki <[email protected]>; Thomas, Rijo-
> john <[email protected]>; [email protected]; Allen,
> John <[email protected]>
> Cc: David S. Miller <[email protected]>; [email protected];
> [email protected]
> Subject: Re: [PATCH v2 7/9] crypto: ccp: Add support for ringing a platform
> doorbell
>
> On 3/2/23 13:42, Mario Limonciello wrote:
> > Some platforms support using a doorbell to communicate. Export
> > this feature for other drivers to utilize as well.
> >
> > Link: https://lore.kernel.org/linux-i2c/20220916131854.687371-3-
> [email protected]/
> > Suggested-by: Jan Dabros <[email protected]>
> > Signed-off-by: Mario Limonciello <[email protected]>
> > ---
> > v1->v2:
> > * New patch
> > ---
> > drivers/crypto/ccp/platform-access.c | 47
> ++++++++++++++++++++++++++++
> > drivers/crypto/ccp/sp-dev.h | 1 +
> > include/linux/psp-platform-access.h | 15 +++++++++
> > include/linux/psp.h | 3 ++
> > 4 files changed, 66 insertions(+)
> >
> > diff --git a/drivers/crypto/ccp/platform-access.c
> b/drivers/crypto/ccp/platform-access.c
> > index af3a1e97abfe..0763389a2814 100644
> > --- a/drivers/crypto/ccp/platform-access.c
> > +++ b/drivers/crypto/ccp/platform-access.c
> > @@ -135,6 +135,53 @@ int psp_send_platform_access_msg(enum
> psp_platform_access_msg msg,
> > }
> > EXPORT_SYMBOL_GPL(psp_send_platform_access_msg);
> >
> > +int psp_ring_platform_doorbell(enum psp_platform_access_msg msg)
> > +{
> > + struct psp_device *psp = psp_get_master_device();
> > + struct psp_platform_access_device *pa_dev;
> > + u32 __iomem *drbl;
> > + u32 drbl_reg;
>
> Lets spell out doorbell for these two variable names.
Ack. Given drbl_reg is only used one place, I might just drop it too.
>
> > + int ret;
> > +
> > + if (!psp || !psp->platform_access_data)
> > + return -ENODEV;
> > +
> > + pa_dev = psp->platform_access_data;
> > + drbl = psp->io_regs + pa_dev->vdata->doorbell_reg;
> > +
> > + if (!drbl)
> > + return -ENODEV;
>
> This will be non-zero because psp->io_regs will always be non-zero. Maybe
> you meant to check the actual pa_dev->vdata->doorbell_reg value?
>
> I think you should squash this and patch #9 together so that patch #8 just
> works right away.
Ack, I'll squash them together.
>
> > +
> > + mutex_lock(&pa_dev->mutex);
>
> Does the doorbell register operate independently from the other registers
> (C2PMSG_28 - C2PMSG_30)? If it does, you could probably just introduce a
> doorbell mutex.
It does work independently. I'll add a second mutex.
>
> > +
> > + if (check_recovery(drbl)) {
> > + dev_dbg(psp->dev, "in recovery\n");
>
> Maybe a bit more info as to what is "in recovery" (that goes for patch #4,
> too) or just prefix it with "doorbell" (and "platform" in #4) since you
> now have duplicated messages.
Will add prefixes to make unique messages.
>
> > + ret = -EBUSY;
> > + goto unlock;
> > + }
> > +
> > + if (wait_cmd(drbl)) {
> > + dev_dbg(psp->dev, "not done processing command\n");
>
> Ditto.
>
> Thanks,
> Tom
Thanks for the new comments.
I'll wait on Jan and Grzegorz to confirm whether the new doorbell stuff works
on Skyrim or not to spin a v3.
>
> > + ret = -EBUSY;
> > + goto unlock;
> > + }
> > +
> > + drbl_reg = FIELD_PREP(PSP_DRBL_MSG, msg) | PSP_DRBL_RING;
> > + iowrite32(drbl_reg, drbl);
> > +
> > + if (wait_cmd(drbl)) {
> > + ret = -ETIMEDOUT;
> > + goto unlock;
> > + }
> > +
> > + ret = 0;
> > +unlock:
> > + mutex_unlock(&pa_dev->mutex);
> > +
> > + return ret;
> > +}
> > +EXPORT_SYMBOL_GPL(psp_ring_platform_doorbell);
> > +
> > void platform_access_dev_destroy(struct psp_device *psp)
> > {
> > struct psp_platform_access_device *pa_dev = psp-
> >platform_access_data;
> > diff --git a/drivers/crypto/ccp/sp-dev.h b/drivers/crypto/ccp/sp-dev.h
> > index 5ec6c219a731..87c0b9350bc2 100644
> > --- a/drivers/crypto/ccp/sp-dev.h
> > +++ b/drivers/crypto/ccp/sp-dev.h
> > @@ -54,6 +54,7 @@ struct tee_vdata {
> > };
> >
> > struct platform_access_vdata {
> > + const unsigned int doorbell_reg;
> > const unsigned int cmdresp_reg;
> > const unsigned int cmdbuff_addr_lo_reg;
> > const unsigned int cmdbuff_addr_hi_reg;
> > diff --git a/include/linux/psp-platform-access.h b/include/linux/psp-
> platform-access.h
> > index f5a03cd11f10..1e1d0e077cec 100644
> > --- a/include/linux/psp-platform-access.h
> > +++ b/include/linux/psp-platform-access.h
> > @@ -35,6 +35,21 @@ struct psp_request {
> > */
> > int psp_send_platform_access_msg(enum psp_platform_access_msg,
> struct psp_request *req);
> >
> > +/**
> > + * psp_ring_platform_doorbell() - Ring platform doorbell
> > + *
> > + * This function is intended to be used by drivers outside of ccp to ring the
> > + * platform doorbell with a message.
> > + *
> > + * Returns:
> > + * 0: success
> > + * -%EBUSY: mailbox in recovery or in use
> > + * -%ENODEV: driver not bound with PSP device
> > + * -%ETIMEDOUT: request timed out
> > + * -%EIO: unknown error (see kernel log)
> > + */
> > +int psp_ring_platform_doorbell(enum psp_platform_access_msg);
> > +
> > /**
> > * psp_check_platform_access_status() - Checks whether platform
> features is ready
> > *
> > diff --git a/include/linux/psp.h b/include/linux/psp.h
> > index d3424790a70e..92e60aeef21e 100644
> > --- a/include/linux/psp.h
> > +++ b/include/linux/psp.h
> > @@ -23,4 +23,7 @@
> > #define PSP_CMDRESP_RECOVERY BIT(30)
> > #define PSP_CMDRESP_RESP BIT(31)
> >
> > +#define PSP_DRBL_MSG PSP_CMDRESP_CMD
> > +#define PSP_DRBL_RING BIT(0)
> > +
> > #endif /* __PSP_H */
On 3/3/2023 1:12 AM, Mario Limonciello wrote:
> The only PSP mailbox that currently supports interrupt on completion
> is the SEV mailbox. Drop the dead code for the TEE subdriver to
> potentially call it.
>
> Signed-off-by: Mario Limonciello <[email protected]>
Looks good.
Acked-by: Rijo Thomas <[email protected]>
Thanks,
Rijo
> ---
> drivers/crypto/ccp/psp-dev.c | 15 ---------------
> drivers/crypto/ccp/psp-dev.h | 7 -------
> 2 files changed, 22 deletions(-)
>
> diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
> index c9c741ac8442..cd8d1974726a 100644
> --- a/drivers/crypto/ccp/psp-dev.c
> +++ b/drivers/crypto/ccp/psp-dev.c
> @@ -46,9 +46,6 @@ static irqreturn_t psp_irq_handler(int irq, void *data)
> if (status) {
> if (psp->sev_irq_handler)
> psp->sev_irq_handler(irq, psp->sev_irq_data, status);
> -
> - if (psp->tee_irq_handler)
> - psp->tee_irq_handler(irq, psp->tee_irq_data, status);
> }
>
> /* Clear the interrupt status by writing the same value we read. */
> @@ -219,18 +216,6 @@ void psp_clear_sev_irq_handler(struct psp_device *psp)
> psp_set_sev_irq_handler(psp, NULL, NULL);
> }
>
> -void psp_set_tee_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
> - void *data)
> -{
> - psp->tee_irq_data = data;
> - psp->tee_irq_handler = handler;
> -}
> -
> -void psp_clear_tee_irq_handler(struct psp_device *psp)
> -{
> - psp_set_tee_irq_handler(psp, NULL, NULL);
> -}
> -
> struct psp_device *psp_get_master_device(void)
> {
> struct sp_device *sp = sp_get_psp_master_device();
> diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/psp-dev.h
> index d528eb04c3ef..06e1f317216d 100644
> --- a/drivers/crypto/ccp/psp-dev.h
> +++ b/drivers/crypto/ccp/psp-dev.h
> @@ -40,9 +40,6 @@ struct psp_device {
> psp_irq_handler_t sev_irq_handler;
> void *sev_irq_data;
>
> - psp_irq_handler_t tee_irq_handler;
> - void *tee_irq_data;
> -
> void *sev_data;
> void *tee_data;
>
> @@ -53,10 +50,6 @@ void psp_set_sev_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
> void *data);
> void psp_clear_sev_irq_handler(struct psp_device *psp);
>
> -void psp_set_tee_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,
> - void *data);
> -void psp_clear_tee_irq_handler(struct psp_device *psp);
> -
> struct psp_device *psp_get_master_device(void);
>
> #define PSP_CAPABILITY_SEV BIT(0)
On 3/3/2023 1:12 AM, Mario Limonciello wrote:
> Some of the bits and fields used for mailboxes communicating with the
> PSP are common across all mailbox implementations (SEV, TEE, etc).
>
> Move these bits into the common `linux/psp.h` so they don't need to
> be re-defined for each implementation.
>
TEE related changes look fine.
Acked-by: Rijo Thomas <[email protected]>
Thanks,
Rijo
> Signed-off-by: Mario Limonciello <[email protected]>
> ---
> v1->v2:
> * Update comment to indicate it's PSP response not PSP ready
> ---
> drivers/crypto/ccp/psp-dev.h | 3 ---
> drivers/crypto/ccp/sev-dev.c | 15 +++++++--------
> drivers/crypto/ccp/sev-dev.h | 2 +-
> drivers/crypto/ccp/tee-dev.c | 15 ++++++++-------
> drivers/i2c/busses/i2c-designware-amdpsp.c | 16 +++++-----------
> include/linux/psp.h | 12 ++++++++++++
> 6 files changed, 33 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/crypto/ccp/psp-dev.h b/drivers/crypto/ccp/psp-dev.h
> index 06e1f317216d..55f54bb2b3fb 100644
> --- a/drivers/crypto/ccp/psp-dev.h
> +++ b/drivers/crypto/ccp/psp-dev.h
> @@ -17,9 +17,6 @@
>
> #include "sp-dev.h"
>
> -#define PSP_CMDRESP_RESP BIT(31)
> -#define PSP_CMDRESP_ERR_MASK 0xffff
> -
> #define MAX_PSP_NAME_LEN 16
>
> extern struct psp_device *psp_master;
> diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
> index 28945ca7c856..6440d35dfa4e 100644
> --- a/drivers/crypto/ccp/sev-dev.c
> +++ b/drivers/crypto/ccp/sev-dev.c
> @@ -7,6 +7,7 @@
> * Author: Brijesh Singh <[email protected]>
> */
>
> +#include <linux/bitfield.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/kthread.h>
> @@ -103,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);
> }
> @@ -347,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 */
> @@ -367,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);
> diff --git a/drivers/crypto/ccp/sev-dev.h b/drivers/crypto/ccp/sev-dev.h
> index 666c21eb81ab..778c95155e74 100644
> --- a/drivers/crypto/ccp/sev-dev.h
> +++ b/drivers/crypto/ccp/sev-dev.h
> @@ -25,8 +25,8 @@
> #include <linux/miscdevice.h>
> #include <linux/capability.h>
>
> +#define SEV_CMDRESP_CMD GENMASK(26, 16)
> #define SEV_CMD_COMPLETE BIT(1)
> -#define SEV_CMDRESP_CMD_SHIFT 16
> #define SEV_CMDRESP_IOC BIT(0)
>
> struct sev_misc_dev {
> diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c
> index f24fc953718a..5560bf8329a1 100644
> --- a/drivers/crypto/ccp/tee-dev.c
> +++ b/drivers/crypto/ccp/tee-dev.c
> @@ -8,6 +8,7 @@
> * Copyright (C) 2019,2021 Advanced Micro Devices, Inc.
> */
>
> +#include <linux/bitfield.h>
> #include <linux/types.h>
> #include <linux/mutex.h>
> #include <linux/delay.h>
> @@ -69,7 +70,7 @@ static int tee_wait_cmd_poll(struct psp_tee_device *tee, unsigned int timeout,
>
> while (--nloop) {
> *reg = ioread32(tee->io_regs + tee->vdata->cmdresp_reg);
> - if (*reg & PSP_CMDRESP_RESP)
> + if (FIELD_GET(PSP_CMDRESP_RESP, *reg))
> return 0;
>
> usleep_range(10000, 10100);
> @@ -149,9 +150,9 @@ static int tee_init_ring(struct psp_tee_device *tee)
> goto free_buf;
> }
>
> - if (reg & PSP_CMDRESP_ERR_MASK) {
> - dev_err(tee->dev, "tee: ring init command failed (%#010x)\n",
> - reg & PSP_CMDRESP_ERR_MASK);
> + if (FIELD_GET(PSP_CMDRESP_STS, reg)) {
> + dev_err(tee->dev, "tee: ring init command failed (%#010lx)\n",
> + FIELD_GET(PSP_CMDRESP_STS, reg));
> tee_free_ring(tee);
> ret = -EIO;
> }
> @@ -179,9 +180,9 @@ static void tee_destroy_ring(struct psp_tee_device *tee)
> ret = tee_wait_cmd_poll(tee, TEE_DEFAULT_TIMEOUT, ®);
> if (ret) {
> dev_err(tee->dev, "tee: ring destroy command timed out\n");
> - } else if (reg & PSP_CMDRESP_ERR_MASK) {
> - dev_err(tee->dev, "tee: ring destroy command failed (%#010x)\n",
> - reg & PSP_CMDRESP_ERR_MASK);
> + } else if (FIELD_GET(PSP_CMDRESP_STS, reg)) {
> + dev_err(tee->dev, "tee: ring destroy command failed (%#010lx)\n",
> + FIELD_GET(PSP_CMDRESP_STS, reg));
> }
>
> free_ring:
> diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c b/drivers/i2c/busses/i2c-designware-amdpsp.c
> index 80f28a1bbbef..652e6b64bd5f 100644
> --- a/drivers/i2c/busses/i2c-designware-amdpsp.c
> +++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
> @@ -25,12 +25,6 @@
> #define PSP_I2C_REQ_STS_BUS_BUSY 0x1
> #define PSP_I2C_REQ_STS_INV_PARAM 0x3
>
> -#define PSP_MBOX_FIELDS_STS GENMASK(15, 0)
> -#define PSP_MBOX_FIELDS_CMD GENMASK(23, 16)
> -#define PSP_MBOX_FIELDS_RESERVED GENMASK(29, 24)
> -#define PSP_MBOX_FIELDS_RECOVERY BIT(30)
> -#define PSP_MBOX_FIELDS_READY BIT(31)
> -
> struct psp_req_buffer_hdr {
> u32 total_size;
> u32 status;
> @@ -99,15 +93,15 @@ static int psp_check_mbox_recovery(struct psp_mbox __iomem *mbox)
>
> tmp = readl(&mbox->cmd_fields);
>
> - return FIELD_GET(PSP_MBOX_FIELDS_RECOVERY, tmp);
> + return FIELD_GET(PSP_CMDRESP_RECOVERY, tmp);
> }
>
> static int psp_wait_cmd(struct psp_mbox __iomem *mbox)
> {
> u32 tmp, expected;
>
> - /* Expect mbox_cmd to be cleared and ready bit to be set by PSP */
> - expected = FIELD_PREP(PSP_MBOX_FIELDS_READY, 1);
> + /* Expect mbox_cmd to be cleared and the response bit to be set by PSP */
> + expected = FIELD_PREP(PSP_CMDRESP_RESP, 1);
>
> /*
> * Check for readiness of PSP mailbox in a tight loop in order to
> @@ -124,7 +118,7 @@ static u32 psp_check_mbox_sts(struct psp_mbox __iomem *mbox)
>
> cmd_reg = readl(&mbox->cmd_fields);
>
> - return FIELD_GET(PSP_MBOX_FIELDS_STS, cmd_reg);
> + return FIELD_GET(PSP_CMDRESP_STS, cmd_reg);
> }
>
> static int psp_send_cmd(struct psp_i2c_req *req)
> @@ -148,7 +142,7 @@ static int psp_send_cmd(struct psp_i2c_req *req)
> writeq(req_addr, &mbox->i2c_req_addr);
>
> /* Write command register to trigger processing */
> - cmd_reg = FIELD_PREP(PSP_MBOX_FIELDS_CMD, PSP_I2C_REQ_BUS_CMD);
> + cmd_reg = FIELD_PREP(PSP_CMDRESP_CMD, PSP_I2C_REQ_BUS_CMD);
> writel(cmd_reg, &mbox->cmd_fields);
>
> if (psp_wait_cmd(mbox))
> diff --git a/include/linux/psp.h b/include/linux/psp.h
> index 202162487ec3..d3424790a70e 100644
> --- a/include/linux/psp.h
> +++ b/include/linux/psp.h
> @@ -11,4 +11,16 @@
> #define __psp_pa(x) __pa(x)
> #endif
>
> +/*
> + * Fields and bits used by most PSP mailboxes
> + *
> + * Note: Some mailboxes (such as SEV) have extra bits or different meanings
> + * and should include an appropriate local definition in their source file.
> + */
> +#define PSP_CMDRESP_STS GENMASK(15, 0)
> +#define PSP_CMDRESP_CMD GENMASK(23, 16)
> +#define PSP_CMDRESP_RESERVED GENMASK(29, 24)
> +#define PSP_CMDRESP_RECOVERY BIT(30)
> +#define PSP_CMDRESP_RESP BIT(31)
> +
> #endif /* __PSP_H */
Hi Mario,
It won't work as expected since the Skyrim device has a different
offset of cmdresp_reg, which is 0x10a40 and doorbell is actually
0x10a24. I apologize for giving you the wrong values.
thanks,
greg
czw., 2 mar 2023 o 20:43 Mario Limonciello <[email protected]>
napisał(a):
>
> The PSP in Skyrim uses i2c arbitration with a doorbell.
> Add this offset so that the communication can work.
>
> Link: Link: https://lore.kernel.org/linux-i2c/[email protected]/
> Signed-off-by: Mario Limonciello <[email protected]>
> ---
> v1->v2:
> * New patch
> ---
> drivers/crypto/ccp/sp-pci.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
> index 18aa902eb5ce..a4efcaee43d8 100644
> --- a/drivers/crypto/ccp/sp-pci.c
> +++ b/drivers/crypto/ccp/sp-pci.c
> @@ -365,6 +365,7 @@ static const struct platform_access_vdata pa_v1 = {
> .cmdresp_reg = 0x10570, /* C2PMSG_28 */
> .cmdbuff_addr_lo_reg = 0x10574, /* C2PMSG_29 */
> .cmdbuff_addr_hi_reg = 0x10578, /* C2PMSG_30 */
> + .doorbell_reg = 0x10a40, /* C2PMSG_80 */
> };
>
> static const struct psp_vdata pspv1 = {
> --
> 2.34.1
>