* [PATCH v2 2/9] crypto: ccp: Add a header for multiple drivers to use `__psp_pa`
2023-03-02 19:42 [PATCH v2 0/9] Export platform features from ccp driver Mario Limonciello
@ 2023-03-02 19:42 ` Mario Limonciello
2023-03-02 19:42 ` [PATCH v2 3/9] crypto: ccp: Move some PSP mailbox bit definitions into common header Mario Limonciello
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Mario Limonciello @ 2023-03-02 19:42 UTC (permalink / raw)
To: Jan Dąbroś, Grzegorz Bernacki, Rijo-john.Thomas,
Thomas.Lendacky, herbert, Sean Christopherson, Paolo Bonzini,
Brijesh Singh, Tom Lendacky, John Allen, Jarkko Nikula,
Andy Shevchenko, Mika Westerberg
Cc: Mario Limonciello, Sumit Garg, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
David S. Miller, Jens Wiklander, kvm, linux-kernel, linux-crypto,
linux-i2c, op-tee
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 <jsd@semihalf.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> # For the drivers/i2c/busses/i2c-designware-amdpsp.c
Acked-by: Sumit Garg <sumit.garg@linaro.org> # For TEE subsystem bits
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
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
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/9] crypto: ccp: Move some PSP mailbox bit definitions into common header
2023-03-02 19:42 [PATCH v2 0/9] Export platform features from ccp driver Mario Limonciello
2023-03-02 19:42 ` [PATCH v2 2/9] crypto: ccp: Add a header for multiple drivers to use `__psp_pa` Mario Limonciello
@ 2023-03-02 19:42 ` Mario Limonciello
2023-03-03 10:36 ` Rijo Thomas
2023-03-02 19:42 ` [PATCH v2 6/9] i2c: designware: Use PCI PSP driver for communication Mario Limonciello
2023-03-02 19:42 ` [PATCH v2 8/9] i2c: designware: Add doorbell support for Skyrim Mario Limonciello
3 siblings, 1 reply; 9+ messages in thread
From: Mario Limonciello @ 2023-03-02 19:42 UTC (permalink / raw)
To: Jan Dąbroś, Grzegorz Bernacki, Rijo-john.Thomas,
Thomas.Lendacky, herbert, Tom Lendacky, John Allen, Brijesh Singh,
Jarkko Nikula, Andy Shevchenko, Mika Westerberg
Cc: Mario Limonciello, David S. Miller, linux-crypto, linux-kernel,
linux-i2c
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 <mario.limonciello@amd.com>
---
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 <brijesh.singh@amd.com>
*/
+#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
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 3/9] crypto: ccp: Move some PSP mailbox bit definitions into common header
2023-03-02 19:42 ` [PATCH v2 3/9] crypto: ccp: Move some PSP mailbox bit definitions into common header Mario Limonciello
@ 2023-03-03 10:36 ` Rijo Thomas
0 siblings, 0 replies; 9+ messages in thread
From: Rijo Thomas @ 2023-03-03 10:36 UTC (permalink / raw)
To: Mario Limonciello, Jan Dąbroś, Grzegorz Bernacki,
Thomas.Lendacky, herbert, John Allen, Brijesh Singh,
Jarkko Nikula, Andy Shevchenko, Mika Westerberg
Cc: David S. Miller, linux-crypto, linux-kernel, linux-i2c
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 <Rijo-john.Thomas@amd.com>
Thanks,
Rijo
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> 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 <brijesh.singh@amd.com>
> */
>
> +#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 */
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 6/9] i2c: designware: Use PCI PSP driver for communication
2023-03-02 19:42 [PATCH v2 0/9] Export platform features from ccp driver Mario Limonciello
2023-03-02 19:42 ` [PATCH v2 2/9] crypto: ccp: Add a header for multiple drivers to use `__psp_pa` Mario Limonciello
2023-03-02 19:42 ` [PATCH v2 3/9] crypto: ccp: Move some PSP mailbox bit definitions into common header Mario Limonciello
@ 2023-03-02 19:42 ` Mario Limonciello
2023-03-02 19:42 ` [PATCH v2 8/9] i2c: designware: Add doorbell support for Skyrim Mario Limonciello
3 siblings, 0 replies; 9+ messages in thread
From: Mario Limonciello @ 2023-03-02 19:42 UTC (permalink / raw)
To: Jan Dąbroś, Grzegorz Bernacki, Rijo-john.Thomas,
Thomas.Lendacky, herbert, Jarkko Nikula, Andy Shevchenko,
Mika Westerberg
Cc: Mario Limonciello, linux-i2c, linux-kernel
Currently the PSP semaphore communication base address is discovered
by using an MSR that is not architecturally guaranteed for future
platforms. Also the mailbox that is utilized for communication with
the PSP may have other consumers in the kernel, so it's better to
make all communication go through a single driver.
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
v1->v2:
* Fix Kconfig to use imply
* Use IS_REACHABLE
---
drivers/i2c/busses/Kconfig | 2 +-
drivers/i2c/busses/i2c-designware-amdpsp.c | 142 ++------------------
drivers/i2c/busses/i2c-designware-core.h | 1 -
drivers/i2c/busses/i2c-designware-platdrv.c | 1 -
include/linux/psp-platform-access.h | 1 +
5 files changed, 11 insertions(+), 136 deletions(-)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 9b8e84f20604..a24534d5877a 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -566,9 +566,9 @@ config I2C_DESIGNWARE_PLATFORM
config I2C_DESIGNWARE_AMDPSP
bool "AMD PSP I2C semaphore support"
- depends on X86_MSR
depends on ACPI
depends on I2C_DESIGNWARE_PLATFORM
+ imply CRYPTO_DEV_SP_PSP
help
This driver enables managed host access to the selected I2C bus shared
between AMD CPU and AMD PSP.
diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c b/drivers/i2c/busses/i2c-designware-amdpsp.c
index 652e6b64bd5f..105584abcf8f 100644
--- a/drivers/i2c/busses/i2c-designware-amdpsp.c
+++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
@@ -1,11 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
-#include <linux/bitfield.h>
-#include <linux/bits.h>
#include <linux/i2c.h>
-#include <linux/io-64-nonatomic-lo-hi.h>
+#include <linux/psp-platform-access.h>
#include <linux/psp.h>
-#include <linux/types.h>
#include <linux/workqueue.h>
#include <asm/msr.h>
@@ -13,23 +10,15 @@
#include "i2c-designware-core.h"
#define MSR_AMD_PSP_ADDR 0xc00110a2
-#define PSP_MBOX_OFFSET 0x10570
-#define PSP_CMD_TIMEOUT_US (500 * USEC_PER_MSEC)
#define PSP_I2C_RESERVATION_TIME_MS 100
-#define PSP_I2C_REQ_BUS_CMD 0x64
#define PSP_I2C_REQ_RETRY_CNT 400
#define PSP_I2C_REQ_RETRY_DELAY_US (25 * USEC_PER_MSEC)
#define PSP_I2C_REQ_STS_OK 0x0
#define PSP_I2C_REQ_STS_BUS_BUSY 0x1
#define PSP_I2C_REQ_STS_INV_PARAM 0x3
-struct psp_req_buffer_hdr {
- u32 total_size;
- u32 status;
-};
-
enum psp_i2c_req_type {
PSP_I2C_REQ_ACQUIRE,
PSP_I2C_REQ_RELEASE,
@@ -41,119 +30,12 @@ struct psp_i2c_req {
enum psp_i2c_req_type type;
};
-struct psp_mbox {
- u32 cmd_fields;
- u64 i2c_req_addr;
-} __packed;
-
static DEFINE_MUTEX(psp_i2c_access_mutex);
static unsigned long psp_i2c_sem_acquired;
-static void __iomem *mbox_iomem;
static u32 psp_i2c_access_count;
static bool psp_i2c_mbox_fail;
static struct device *psp_i2c_dev;
-/*
- * Implementation of PSP-x86 i2c-arbitration mailbox introduced for AMD Cezanne
- * family of SoCs.
- */
-
-static int psp_get_mbox_addr(unsigned long *mbox_addr)
-{
- unsigned long long psp_mmio;
-
- if (rdmsrl_safe(MSR_AMD_PSP_ADDR, &psp_mmio))
- return -EIO;
-
- *mbox_addr = (unsigned long)(psp_mmio + PSP_MBOX_OFFSET);
-
- return 0;
-}
-
-static int psp_mbox_probe(void)
-{
- unsigned long mbox_addr;
- int ret;
-
- ret = psp_get_mbox_addr(&mbox_addr);
- if (ret)
- return ret;
-
- mbox_iomem = ioremap(mbox_addr, sizeof(struct psp_mbox));
- if (!mbox_iomem)
- return -ENOMEM;
-
- return 0;
-}
-
-/* Recovery field should be equal 0 to start sending commands */
-static int psp_check_mbox_recovery(struct psp_mbox __iomem *mbox)
-{
- u32 tmp;
-
- tmp = readl(&mbox->cmd_fields);
-
- 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 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
- * process further as soon as command was consumed.
- */
- return readl_poll_timeout(&mbox->cmd_fields, tmp, (tmp == expected),
- 0, PSP_CMD_TIMEOUT_US);
-}
-
-/* Status equal to 0 means that PSP succeed processing command */
-static u32 psp_check_mbox_sts(struct psp_mbox __iomem *mbox)
-{
- u32 cmd_reg;
-
- cmd_reg = readl(&mbox->cmd_fields);
-
- return FIELD_GET(PSP_CMDRESP_STS, cmd_reg);
-}
-
-static int psp_send_cmd(struct psp_i2c_req *req)
-{
- struct psp_mbox __iomem *mbox = mbox_iomem;
- phys_addr_t req_addr;
- u32 cmd_reg;
-
- if (psp_check_mbox_recovery(mbox))
- return -EIO;
-
- if (psp_wait_cmd(mbox))
- return -EBUSY;
-
- /*
- * 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((void *)req);
- writeq(req_addr, &mbox->i2c_req_addr);
-
- /* Write command register to trigger processing */
- cmd_reg = FIELD_PREP(PSP_CMDRESP_CMD, PSP_I2C_REQ_BUS_CMD);
- writel(cmd_reg, &mbox->cmd_fields);
-
- if (psp_wait_cmd(mbox))
- return -ETIMEDOUT;
-
- if (psp_check_mbox_sts(mbox))
- return -EIO;
-
- return 0;
-}
-
/* Helper to verify status returned by PSP */
static int check_i2c_req_sts(struct psp_i2c_req *req)
{
@@ -182,10 +64,10 @@ static int psp_send_check_i2c_req(struct psp_i2c_req *req)
* 2. i2c-requests - PSP refuses to grant i2c arbitration to x86 for too
* long.
* In order to distinguish between these two in error handling code, all
- * errors on the first level (returned by psp_send_cmd) are shadowed by
+ * errors on the first level (returned by psp_send_platform_access_msg) are shadowed by
* -EIO.
*/
- if (psp_send_cmd(req))
+ if (psp_send_platform_access_msg(PSP_I2C_REQ_BUS_CMD, (struct psp_request *)req))
return -EIO;
return check_i2c_req_sts(req);
@@ -202,7 +84,7 @@ static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
if (!req)
return -ENOMEM;
- req->hdr.total_size = sizeof(*req);
+ req->hdr.payload_size = sizeof(*req);
req->type = i2c_req_type;
start = jiffies;
@@ -381,7 +263,8 @@ static const struct i2c_lock_operations i2c_dw_psp_lock_ops = {
int i2c_dw_amdpsp_probe_lock_support(struct dw_i2c_dev *dev)
{
- int ret;
+ if (!IS_REACHABLE(CRYPTO_DEV_CCP_DD))
+ return -ENODEV;
if (!dev)
return -ENODEV;
@@ -393,11 +276,10 @@ int i2c_dw_amdpsp_probe_lock_support(struct dw_i2c_dev *dev)
if (psp_i2c_dev)
return -EEXIST;
- psp_i2c_dev = dev->dev;
+ if (psp_check_platform_access_status())
+ return -EPROBE_DEFER;
- ret = psp_mbox_probe();
- if (ret)
- return ret;
+ psp_i2c_dev = dev->dev;
dev_info(psp_i2c_dev, "I2C bus managed by AMD PSP\n");
@@ -411,9 +293,3 @@ int i2c_dw_amdpsp_probe_lock_support(struct dw_i2c_dev *dev)
return 0;
}
-
-/* Unmap area used as a mailbox with PSP */
-void i2c_dw_amdpsp_remove_lock_support(struct dw_i2c_dev *dev)
-{
- iounmap(mbox_iomem);
-}
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index 050d8c63ad3c..c5d87aae39c6 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -383,7 +383,6 @@ int i2c_dw_baytrail_probe_lock_support(struct dw_i2c_dev *dev);
#if IS_ENABLED(CONFIG_I2C_DESIGNWARE_AMDPSP)
int i2c_dw_amdpsp_probe_lock_support(struct dw_i2c_dev *dev);
-void i2c_dw_amdpsp_remove_lock_support(struct dw_i2c_dev *dev);
#endif
int i2c_dw_validate_speed(struct dw_i2c_dev *dev);
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 74182db03a88..89ad88c54754 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -214,7 +214,6 @@ static const struct i2c_dw_semaphore_callbacks i2c_dw_semaphore_cb_table[] = {
#ifdef CONFIG_I2C_DESIGNWARE_AMDPSP
{
.probe = i2c_dw_amdpsp_probe_lock_support,
- .remove = i2c_dw_amdpsp_remove_lock_support,
},
#endif
{}
diff --git a/include/linux/psp-platform-access.h b/include/linux/psp-platform-access.h
index 977df5cfd494..f5a03cd11f10 100644
--- a/include/linux/psp-platform-access.h
+++ b/include/linux/psp-platform-access.h
@@ -7,6 +7,7 @@
enum psp_platform_access_msg {
PSP_CMD_NONE = 0x0,
+ PSP_I2C_REQ_BUS_CMD = 0x64,
};
struct psp_req_buffer_hdr {
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 8/9] i2c: designware: Add doorbell support for Skyrim
2023-03-02 19:42 [PATCH v2 0/9] Export platform features from ccp driver Mario Limonciello
` (2 preceding siblings ...)
2023-03-02 19:42 ` [PATCH v2 6/9] i2c: designware: Use PCI PSP driver for communication Mario Limonciello
@ 2023-03-02 19:42 ` Mario Limonciello
2023-03-03 12:00 ` Grzegorz Bernacki
3 siblings, 1 reply; 9+ messages in thread
From: Mario Limonciello @ 2023-03-02 19:42 UTC (permalink / raw)
To: Jan Dąbroś, Grzegorz Bernacki, Rijo-john.Thomas,
Thomas.Lendacky, herbert, Jarkko Nikula, Andy Shevchenko,
Mika Westerberg
Cc: Mario Limonciello, linux-i2c, linux-kernel
Skyrim doesn't use the platform feature mailbox for communication
for I2C arbitration, it relies upon ringing a doorbell.
Add a new ACPI ID to use for Skyrim and when that ID is detected
use the doorbell instead.
Link: https://lore.kernel.org/linux-i2c/20220916131854.687371-3-jsd@semihalf.com/
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
v1->v2:
* New patch
Note: This ACPI ID hasn't currently been reserved, but as Skyrim runs coreboot
it should be easy enough to modify the BIOS and test it out.
If this approach works and has general agreement it can be reserved.
---
drivers/i2c/busses/i2c-designware-amdpsp.c | 29 ++++++++++++++-------
drivers/i2c/busses/i2c-designware-platdrv.c | 1 +
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c b/drivers/i2c/busses/i2c-designware-amdpsp.c
index 105584abcf8f..e1a4d3002c80 100644
--- a/drivers/i2c/busses/i2c-designware-amdpsp.c
+++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
@@ -73,34 +73,44 @@ static int psp_send_check_i2c_req(struct psp_i2c_req *req)
return check_i2c_req_sts(req);
}
-static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
+static int psp_send_i2c_req_amdi0019(enum psp_i2c_req_type i2c_req_type)
{
struct psp_i2c_req *req;
- unsigned long start;
int status, ret;
/* Allocate command-response buffer */
req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req)
return -ENOMEM;
-
req->hdr.payload_size = sizeof(*req);
req->type = i2c_req_type;
-
- start = jiffies;
ret = read_poll_timeout(psp_send_check_i2c_req, status,
(status != -EBUSY),
PSP_I2C_REQ_RETRY_DELAY_US,
PSP_I2C_REQ_RETRY_CNT * PSP_I2C_REQ_RETRY_DELAY_US,
0, req);
- if (ret) {
+ kfree(req);
+
+ if (ret)
dev_err(psp_i2c_dev, "Timed out waiting for PSP to %s I2C bus\n",
(i2c_req_type == PSP_I2C_REQ_ACQUIRE) ?
"release" : "acquire");
- goto cleanup;
- }
- ret = status;
+ return ret ? ret : status;
+}
+
+static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
+{
+ const char *hid = acpi_device_hid(ACPI_COMPANION(psp_i2c_dev));
+ unsigned long start = jiffies;
+ int ret;
+
+ /* Use doorbell for Skyrim and mailbox for Cezanne */
+ if (!strcmp(hid, "AMDI0020"))
+ ret = psp_ring_platform_doorbell(i2c_req_type);
+ else
+ ret = psp_send_i2c_req_amdi0019(i2c_req_type);
+
if (ret) {
dev_err(psp_i2c_dev, "PSP communication error\n");
goto cleanup;
@@ -115,7 +125,6 @@ static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
psp_i2c_mbox_fail = true;
}
- kfree(req);
return ret;
}
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 89ad88c54754..5ca71bda9ac2 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -51,6 +51,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = {
{ "AMD0010", ACCESS_INTR_MASK },
{ "AMDI0010", ACCESS_INTR_MASK },
{ "AMDI0019", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE },
+ { "AMDI0020", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE },
{ "AMDI0510", 0 },
{ "APMC0D0F", 0 },
{ "HISI02A1", 0 },
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 8/9] i2c: designware: Add doorbell support for Skyrim
2023-03-02 19:42 ` [PATCH v2 8/9] i2c: designware: Add doorbell support for Skyrim Mario Limonciello
@ 2023-03-03 12:00 ` Grzegorz Bernacki
2023-03-03 15:00 ` Limonciello, Mario
0 siblings, 1 reply; 9+ messages in thread
From: Grzegorz Bernacki @ 2023-03-03 12:00 UTC (permalink / raw)
To: Mario Limonciello
Cc: Jan Dąbroś, Rijo-john.Thomas, Thomas.Lendacky, herbert,
Jarkko Nikula, Andy Shevchenko, Mika Westerberg, linux-i2c,
linux-kernel
Hi Mario,
I am not sure if adding a new ACPI ID is a good idea. Actually we are
talking about the same devices. The only difference is in the
communication protocol between PSP and CPU. This could be easily
detected at runtime by checking cpu id. There is no need to introduce
a new id and create dependency on the FW version.
thanks,
greg
czw., 2 mar 2023 o 20:43 Mario Limonciello <mario.limonciello@amd.com>
napisał(a):
>
> Skyrim doesn't use the platform feature mailbox for communication
> for I2C arbitration, it relies upon ringing a doorbell.
>
> Add a new ACPI ID to use for Skyrim and when that ID is detected
> use the doorbell instead.
>
> Link: https://lore.kernel.org/linux-i2c/20220916131854.687371-3-jsd@semihalf.com/
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> v1->v2:
> * New patch
> Note: This ACPI ID hasn't currently been reserved, but as Skyrim runs coreboot
> it should be easy enough to modify the BIOS and test it out.
> If this approach works and has general agreement it can be reserved.
> ---
> drivers/i2c/busses/i2c-designware-amdpsp.c | 29 ++++++++++++++-------
> drivers/i2c/busses/i2c-designware-platdrv.c | 1 +
> 2 files changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c b/drivers/i2c/busses/i2c-designware-amdpsp.c
> index 105584abcf8f..e1a4d3002c80 100644
> --- a/drivers/i2c/busses/i2c-designware-amdpsp.c
> +++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
> @@ -73,34 +73,44 @@ static int psp_send_check_i2c_req(struct psp_i2c_req *req)
> return check_i2c_req_sts(req);
> }
>
> -static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
> +static int psp_send_i2c_req_amdi0019(enum psp_i2c_req_type i2c_req_type)
> {
> struct psp_i2c_req *req;
> - unsigned long start;
> int status, ret;
>
> /* Allocate command-response buffer */
> req = kzalloc(sizeof(*req), GFP_KERNEL);
> if (!req)
> return -ENOMEM;
> -
> req->hdr.payload_size = sizeof(*req);
> req->type = i2c_req_type;
> -
> - start = jiffies;
> ret = read_poll_timeout(psp_send_check_i2c_req, status,
> (status != -EBUSY),
> PSP_I2C_REQ_RETRY_DELAY_US,
> PSP_I2C_REQ_RETRY_CNT * PSP_I2C_REQ_RETRY_DELAY_US,
> 0, req);
> - if (ret) {
> + kfree(req);
> +
> + if (ret)
> dev_err(psp_i2c_dev, "Timed out waiting for PSP to %s I2C bus\n",
> (i2c_req_type == PSP_I2C_REQ_ACQUIRE) ?
> "release" : "acquire");
> - goto cleanup;
> - }
>
> - ret = status;
> + return ret ? ret : status;
> +}
> +
> +static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
> +{
> + const char *hid = acpi_device_hid(ACPI_COMPANION(psp_i2c_dev));
> + unsigned long start = jiffies;
> + int ret;
> +
> + /* Use doorbell for Skyrim and mailbox for Cezanne */
> + if (!strcmp(hid, "AMDI0020"))
> + ret = psp_ring_platform_doorbell(i2c_req_type);
> + else
> + ret = psp_send_i2c_req_amdi0019(i2c_req_type);
> +
> if (ret) {
> dev_err(psp_i2c_dev, "PSP communication error\n");
> goto cleanup;
> @@ -115,7 +125,6 @@ static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
> psp_i2c_mbox_fail = true;
> }
>
> - kfree(req);
> return ret;
> }
>
> diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
> index 89ad88c54754..5ca71bda9ac2 100644
> --- a/drivers/i2c/busses/i2c-designware-platdrv.c
> +++ b/drivers/i2c/busses/i2c-designware-platdrv.c
> @@ -51,6 +51,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = {
> { "AMD0010", ACCESS_INTR_MASK },
> { "AMDI0010", ACCESS_INTR_MASK },
> { "AMDI0019", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE },
> + { "AMDI0020", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE },
> { "AMDI0510", 0 },
> { "APMC0D0F", 0 },
> { "HISI02A1", 0 },
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread* RE: [PATCH v2 8/9] i2c: designware: Add doorbell support for Skyrim
2023-03-03 12:00 ` Grzegorz Bernacki
@ 2023-03-03 15:00 ` Limonciello, Mario
2023-03-06 11:37 ` Andy Shevchenko
0 siblings, 1 reply; 9+ messages in thread
From: Limonciello, Mario @ 2023-03-03 15:00 UTC (permalink / raw)
To: Grzegorz Bernacki
Cc: Jan Dąbroś, Thomas, Rijo-john, Lendacky, Thomas,
herbert@gondor.apana.org.au, Jarkko Nikula, Andy Shevchenko,
Mika Westerberg, linux-i2c@vger.kernel.org,
linux-kernel@vger.kernel.org
[Public]
> -----Original Message-----
> From: Grzegorz Bernacki <gjb@semihalf.com>
> Sent: Friday, March 3, 2023 06:00
> To: Limonciello, Mario <Mario.Limonciello@amd.com>
> Cc: Jan Dąbroś <jsd@semihalf.com>; Thomas, Rijo-john <Rijo-
> john.Thomas@amd.com>; Lendacky, Thomas
> <Thomas.Lendacky@amd.com>; herbert@gondor.apana.org.au; Jarkko
> Nikula <jarkko.nikula@linux.intel.com>; Andy Shevchenko
> <andriy.shevchenko@linux.intel.com>; Mika Westerberg
> <mika.westerberg@linux.intel.com>; linux-i2c@vger.kernel.org; linux-
> kernel@vger.kernel.org
> Subject: Re: [PATCH v2 8/9] i2c: designware: Add doorbell support for Skyrim
>
> Hi Mario,
>
> I am not sure if adding a new ACPI ID is a good idea. Actually we are
> talking about the same devices. The only difference is in the
> communication protocol between PSP and CPU. This could be easily
> detected at runtime by checking cpu id. There is no need to introduce
> a new id and create dependency on the FW version.
An ACPI ID seems more scalable to me to represent the difference in protocol.
Otherwise what happens when the follow on to Skyrim comes? Do you add
a new ID/case to the code? If it was an ACPI ID then it's a one line change
in the firmware to represent this.
What I'll do for v3 is do with a CPU ID in this patch, and then introduce an ACPI
ID in a new patch. You can test it without the ACPI ID, and when it's working
patch the BIOS with the new ID and see if that continues to work.
>
> thanks,
> greg
>
> czw., 2 mar 2023 o 20:43 Mario Limonciello <mario.limonciello@amd.com>
> napisał(a):
> >
> > Skyrim doesn't use the platform feature mailbox for communication
> > for I2C arbitration, it relies upon ringing a doorbell.
> >
> > Add a new ACPI ID to use for Skyrim and when that ID is detected
> > use the doorbell instead.
> >
> > Link: https://lore.kernel.org/linux-i2c/20220916131854.687371-3-
> jsd@semihalf.com/
> > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> > ---
> > v1->v2:
> > * New patch
> > Note: This ACPI ID hasn't currently been reserved, but as Skyrim runs
> coreboot
> > it should be easy enough to modify the BIOS and test it out.
> > If this approach works and has general agreement it can be reserved.
> > ---
> > drivers/i2c/busses/i2c-designware-amdpsp.c | 29 ++++++++++++++-------
> > drivers/i2c/busses/i2c-designware-platdrv.c | 1 +
> > 2 files changed, 20 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c
> b/drivers/i2c/busses/i2c-designware-amdpsp.c
> > index 105584abcf8f..e1a4d3002c80 100644
> > --- a/drivers/i2c/busses/i2c-designware-amdpsp.c
> > +++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
> > @@ -73,34 +73,44 @@ static int psp_send_check_i2c_req(struct
> psp_i2c_req *req)
> > return check_i2c_req_sts(req);
> > }
> >
> > -static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
> > +static int psp_send_i2c_req_amdi0019(enum psp_i2c_req_type
> i2c_req_type)
> > {
> > struct psp_i2c_req *req;
> > - unsigned long start;
> > int status, ret;
> >
> > /* Allocate command-response buffer */
> > req = kzalloc(sizeof(*req), GFP_KERNEL);
> > if (!req)
> > return -ENOMEM;
> > -
> > req->hdr.payload_size = sizeof(*req);
> > req->type = i2c_req_type;
> > -
> > - start = jiffies;
> > ret = read_poll_timeout(psp_send_check_i2c_req, status,
> > (status != -EBUSY),
> > PSP_I2C_REQ_RETRY_DELAY_US,
> > PSP_I2C_REQ_RETRY_CNT *
> PSP_I2C_REQ_RETRY_DELAY_US,
> > 0, req);
> > - if (ret) {
> > + kfree(req);
> > +
> > + if (ret)
> > dev_err(psp_i2c_dev, "Timed out waiting for PSP to %s I2C bus\n",
> > (i2c_req_type == PSP_I2C_REQ_ACQUIRE) ?
> > "release" : "acquire");
> > - goto cleanup;
> > - }
> >
> > - ret = status;
> > + return ret ? ret : status;
> > +}
> > +
> > +static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
> > +{
> > + const char *hid = acpi_device_hid(ACPI_COMPANION(psp_i2c_dev));
> > + unsigned long start = jiffies;
> > + int ret;
> > +
> > + /* Use doorbell for Skyrim and mailbox for Cezanne */
> > + if (!strcmp(hid, "AMDI0020"))
> > + ret = psp_ring_platform_doorbell(i2c_req_type);
> > + else
> > + ret = psp_send_i2c_req_amdi0019(i2c_req_type);
> > +
> > if (ret) {
> > dev_err(psp_i2c_dev, "PSP communication error\n");
> > goto cleanup;
> > @@ -115,7 +125,6 @@ static int psp_send_i2c_req(enum
> psp_i2c_req_type i2c_req_type)
> > psp_i2c_mbox_fail = true;
> > }
> >
> > - kfree(req);
> > return ret;
> > }
> >
> > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c
> b/drivers/i2c/busses/i2c-designware-platdrv.c
> > index 89ad88c54754..5ca71bda9ac2 100644
> > --- a/drivers/i2c/busses/i2c-designware-platdrv.c
> > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c
> > @@ -51,6 +51,7 @@ static const struct acpi_device_id
> dw_i2c_acpi_match[] = {
> > { "AMD0010", ACCESS_INTR_MASK },
> > { "AMDI0010", ACCESS_INTR_MASK },
> > { "AMDI0019", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE },
> > + { "AMDI0020", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE },
> > { "AMDI0510", 0 },
> > { "APMC0D0F", 0 },
> > { "HISI02A1", 0 },
> > --
> > 2.34.1
> >
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 8/9] i2c: designware: Add doorbell support for Skyrim
2023-03-03 15:00 ` Limonciello, Mario
@ 2023-03-06 11:37 ` Andy Shevchenko
0 siblings, 0 replies; 9+ messages in thread
From: Andy Shevchenko @ 2023-03-06 11:37 UTC (permalink / raw)
To: Limonciello, Mario
Cc: Grzegorz Bernacki, Jan Dąbroś, Thomas, Rijo-john,
Lendacky, Thomas, herbert@gondor.apana.org.au, Jarkko Nikula,
Mika Westerberg, linux-i2c@vger.kernel.org,
linux-kernel@vger.kernel.org
On Fri, Mar 03, 2023 at 03:00:55PM +0000, Limonciello, Mario wrote:
> > -----Original Message-----
> > From: Grzegorz Bernacki <gjb@semihalf.com>
> > Sent: Friday, March 3, 2023 06:00
> > I am not sure if adding a new ACPI ID is a good idea. Actually we are
> > talking about the same devices. The only difference is in the
> > communication protocol between PSP and CPU. This could be easily
> > detected at runtime by checking cpu id. There is no need to introduce
> > a new id and create dependency on the FW version.
>
> An ACPI ID seems more scalable to me to represent the difference in protocol.
> Otherwise what happens when the follow on to Skyrim comes? Do you add
> a new ID/case to the code? If it was an ACPI ID then it's a one line change
> in the firmware to represent this.
>
> What I'll do for v3 is do with a CPU ID in this patch, and then introduce an ACPI
> ID in a new patch. You can test it without the ACPI ID, and when it's working
> patch the BIOS with the new ID and see if that continues to work.
I don't think we need this complexity.
Please, use just an ACPI ID and that's it. For testing one may apply additional
(HACK) patch(es).
As telling from my experience, to distinguish such things via CPU ID is a bad
idea. Yes, we (used?) to have a PITA (find yourself what this stands for :)
times with the (mixed) approach. So, no, please don't add CPU ID into the I²C
platform driver (keyword: platform).
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 9+ messages in thread