public inbox for linux-i2c@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v9 0/2] Use CCP driver to handle PSP I2C arbitration
@ 2023-04-14 14:40 Mario Limonciello
  2023-04-14 14:40 ` [PATCH v9 1/2] i2c: designware: Use PCI PSP driver for communication Mario Limonciello
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Mario Limonciello @ 2023-04-14 14:40 UTC (permalink / raw)
  To: Herbert Xu, Andy Shevchenko, Mika Westerberg, Jan Dabros,
	linux-i2c
  Cc: linux-crypto, Mario Limonciello, linux-kernel

The CCP driver now has symbols that can be used by i2c-designware-amdpsp
to handle the communication regarding i2c arbitration with the PSP for
both Cezanne and Mendocino based designs.

Utilize those symbols.

v8->v9:
 * Drop v8 patches 1-4 as they're merged now
 * Pick up tags for v8 patches 5-6
 * Repost to linux-crypto as this needs to merge through crypto tree.

Mario Limonciello (2):
  i2c: designware: Use PCI PSP driver for communication
  i2c: designware: Add doorbell support for Mendocino

 drivers/i2c/busses/Kconfig                  |   5 +-
 drivers/i2c/busses/i2c-designware-amdpsp.c  | 197 +++++---------------
 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, 53 insertions(+), 152 deletions(-)

-- 
2.34.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v9 1/2] i2c: designware: Use PCI PSP driver for communication
  2023-04-14 14:40 [PATCH v9 0/2] Use CCP driver to handle PSP I2C arbitration Mario Limonciello
@ 2023-04-14 14:40 ` Mario Limonciello
  2023-04-14 14:40 ` [PATCH v9 2/2] i2c: designware: Add doorbell support for Mendocino Mario Limonciello
  2023-04-20 10:22 ` [PATCH v9 0/2] Use CCP driver to handle PSP I2C arbitration Herbert Xu
  2 siblings, 0 replies; 6+ messages in thread
From: Mario Limonciello @ 2023-04-14 14:40 UTC (permalink / raw)
  To: Herbert Xu, Jarkko Nikula, Andy Shevchenko, Mika Westerberg,
	Jan Dabros
  Cc: linux-crypto, Mario Limonciello, Mark Hasemeyer, Wolfram Sang,
	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>
Reviewed-by: Mark Hasemeyer <markhas@chromium.org>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Mark Hasemeyer <markhas@chromium.org>
Acked-by: Wolfram Sang <wsa@kernel.org>
---
v8->v9
 * Add tag
v7->v8:
 * Drop hunk changing error message
 * Stop using imply.  As shown by failed configs for kernel robot we need
   stronger dependencies. Model them off of I2C_DESIGNWARE_BAYTRAIL which
   has a similar relationship
---
 drivers/i2c/busses/Kconfig                  |   4 +-
 drivers/i2c/busses/i2c-designware-amdpsp.c  | 175 +++-----------------
 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, 29 insertions(+), 153 deletions(-)

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 25eb4e8fd22f..89f8b75043d0 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -566,9 +566,11 @@ config I2C_DESIGNWARE_PLATFORM
 
 config I2C_DESIGNWARE_AMDPSP
 	bool "AMD PSP I2C semaphore support"
-	depends on X86_MSR
 	depends on ACPI
+	depends on CRYPTO_DEV_SP_PSP
 	depends on I2C_DESIGNWARE_PLATFORM
+	depends on (I2C_DESIGNWARE_PLATFORM=y && CRYPTO_DEV_CCP_DD=y) || \
+		   (I2C_DESIGNWARE_PLATFORM=m && CRYPTO_DEV_CCP_DD)
 	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..12870dc44bdb 100644
--- a/drivers/i2c/busses/i2c-designware-amdpsp.c
+++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
@@ -1,35 +1,20 @@
 // 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>
-
 #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 +26,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)
 {
@@ -173,22 +51,25 @@ static int check_i2c_req_sts(struct psp_i2c_req *req)
 	}
 }
 
-static int psp_send_check_i2c_req(struct psp_i2c_req *req)
+/*
+ * Errors in x86-PSP i2c-arbitration protocol may occur at two levels:
+ * 1. mailbox communication - PSP is not operational or some IO errors with
+ *    basic communication had happened.
+ * 2. i2c-requests - PSP refuses to grant i2c arbitration to x86 for too long.
+ *
+ * In order to distinguish between these in error handling code all mailbox
+ * communication errors on the first level (from CCP symbols) will be passed
+ * up and if -EIO is returned the second level will be checked.
+ */
+static int psp_send_i2c_req_cezanne(struct psp_i2c_req *req)
 {
-	/*
-	 * Errors in x86-PSP i2c-arbitration protocol may occur at two levels:
-	 * 1. mailbox communication - PSP is not operational or some IO errors
-	 * with basic communication had happened;
-	 * 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
-	 * -EIO.
-	 */
-	if (psp_send_cmd(req))
-		return -EIO;
+	int ret;
 
-	return check_i2c_req_sts(req);
+	ret = psp_send_platform_access_msg(PSP_I2C_REQ_BUS_CMD, (struct psp_request *)req);
+	if (ret == -EIO)
+		return check_i2c_req_sts(req);
+
+	return ret;
 }
 
 static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
@@ -202,11 +83,11 @@ 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;
-	ret = read_poll_timeout(psp_send_check_i2c_req, status,
+	ret = read_poll_timeout(psp_send_i2c_req_cezanne, status,
 				(status != -EBUSY),
 				PSP_I2C_REQ_RETRY_DELAY_US,
 				PSP_I2C_REQ_RETRY_CNT * PSP_I2C_REQ_RETRY_DELAY_US,
@@ -381,7 +262,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(CONFIG_CRYPTO_DEV_CCP_DD))
+		return -ENODEV;
 
 	if (!dev)
 		return -ENODEV;
@@ -393,11 +275,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 +292,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 1b661341d8f3..75da8f5f7ad8 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] 6+ messages in thread

* [PATCH v9 2/2] i2c: designware: Add doorbell support for Mendocino
  2023-04-14 14:40 [PATCH v9 0/2] Use CCP driver to handle PSP I2C arbitration Mario Limonciello
  2023-04-14 14:40 ` [PATCH v9 1/2] i2c: designware: Use PCI PSP driver for communication Mario Limonciello
@ 2023-04-14 14:40 ` Mario Limonciello
  2023-04-14 16:50   ` kernel test robot
  2023-04-20 10:22 ` [PATCH v9 0/2] Use CCP driver to handle PSP I2C arbitration Herbert Xu
  2 siblings, 1 reply; 6+ messages in thread
From: Mario Limonciello @ 2023-04-14 14:40 UTC (permalink / raw)
  To: Herbert Xu, Jarkko Nikula, Andy Shevchenko, Mika Westerberg,
	Jan Dabros
  Cc: linux-crypto, Mario Limonciello, Mark Hasemeyer, Wolfram Sang,
	linux-i2c, linux-kernel

Mendocino and later platform don't use the platform feature mailbox for
communication for I2C arbitration, they rely upon ringing a doorbell.

Detect the platform by the device ID of the root port and choose the
appropriate method.

Link: https://lore.kernel.org/linux-i2c/20220916131854.687371-3-jsd@semihalf.com/
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Mark Hasemeyer <markhas@chromium.org>
Tested-by: Mark Hasemeyer <markhas@chromium.org>
Acked-by: Wolfram Sang <wsa@kernel.org>
---
v8->v9:
 * Add tag

 drivers/i2c/busses/Kconfig                 |  1 +
 drivers/i2c/busses/i2c-designware-amdpsp.c | 26 +++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 89f8b75043d0..4b4323bbf268 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -568,6 +568,7 @@ config I2C_DESIGNWARE_AMDPSP
 	bool "AMD PSP I2C semaphore support"
 	depends on ACPI
 	depends on CRYPTO_DEV_SP_PSP
+	depends on PCI
 	depends on I2C_DESIGNWARE_PLATFORM
 	depends on (I2C_DESIGNWARE_PLATFORM=y && CRYPTO_DEV_CCP_DD=y) || \
 		   (I2C_DESIGNWARE_PLATFORM=m && CRYPTO_DEV_CCP_DD)
diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c b/drivers/i2c/busses/i2c-designware-amdpsp.c
index 12870dc44bdb..63454b06e5da 100644
--- a/drivers/i2c/busses/i2c-designware-amdpsp.c
+++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 
 #include <linux/i2c.h>
+#include <linux/pci.h>
 #include <linux/psp-platform-access.h>
 #include <linux/psp.h>
 #include <linux/workqueue.h>
@@ -32,6 +33,8 @@ static u32 psp_i2c_access_count;
 static bool psp_i2c_mbox_fail;
 static struct device *psp_i2c_dev;
 
+static int (*_psp_send_i2c_req)(struct psp_i2c_req *req);
+
 /* Helper to verify status returned by PSP */
 static int check_i2c_req_sts(struct psp_i2c_req *req)
 {
@@ -72,6 +75,17 @@ static int psp_send_i2c_req_cezanne(struct psp_i2c_req *req)
 	return ret;
 }
 
+static int psp_send_i2c_req_doorbell(struct psp_i2c_req *req)
+{
+	int ret;
+
+	ret = psp_ring_platform_doorbell(req->type, &req->hdr.status);
+	if (ret == -EIO)
+		return check_i2c_req_sts(req);
+
+	return ret;
+}
+
 static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
 {
 	struct psp_i2c_req *req;
@@ -87,7 +101,7 @@ static int psp_send_i2c_req(enum psp_i2c_req_type i2c_req_type)
 	req->type = i2c_req_type;
 
 	start = jiffies;
-	ret = read_poll_timeout(psp_send_i2c_req_cezanne, status,
+	ret = read_poll_timeout(_psp_send_i2c_req, status,
 				(status != -EBUSY),
 				PSP_I2C_REQ_RETRY_DELAY_US,
 				PSP_I2C_REQ_RETRY_CNT * PSP_I2C_REQ_RETRY_DELAY_US,
@@ -262,6 +276,8 @@ static const struct i2c_lock_operations i2c_dw_psp_lock_ops = {
 
 int i2c_dw_amdpsp_probe_lock_support(struct dw_i2c_dev *dev)
 {
+	struct pci_dev *rdev;
+
 	if (!IS_REACHABLE(CONFIG_CRYPTO_DEV_CCP_DD))
 		return -ENODEV;
 
@@ -275,6 +291,14 @@ int i2c_dw_amdpsp_probe_lock_support(struct dw_i2c_dev *dev)
 	if (psp_i2c_dev)
 		return -EEXIST;
 
+	/* Cezanne uses platform mailbox, Mendocino and later use doorbell */
+	rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
+	if (rdev->device == 0x1630)
+		_psp_send_i2c_req = psp_send_i2c_req_cezanne;
+	else
+		_psp_send_i2c_req = psp_send_i2c_req_doorbell;
+	pci_dev_put(rdev);
+
 	if (psp_check_platform_access_status())
 		return -EPROBE_DEFER;
 
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v9 2/2] i2c: designware: Add doorbell support for Mendocino
  2023-04-14 14:40 ` [PATCH v9 2/2] i2c: designware: Add doorbell support for Mendocino Mario Limonciello
@ 2023-04-14 16:50   ` kernel test robot
  2023-04-14 17:01     ` Limonciello, Mario
  0 siblings, 1 reply; 6+ messages in thread
From: kernel test robot @ 2023-04-14 16:50 UTC (permalink / raw)
  To: Mario Limonciello, Herbert Xu, Jarkko Nikula, Andy Shevchenko,
	Mika Westerberg, Jan Dabros
  Cc: oe-kbuild-all, linux-crypto, Mario Limonciello, Mark Hasemeyer,
	Wolfram Sang, linux-i2c, linux-kernel

Hi Mario,

kernel test robot noticed the following build errors:

[auto build test ERROR on next-20230413]
[cannot apply to wsa/i2c/for-next linus/master v6.3-rc6 v6.3-rc5 v6.3-rc4 v6.3-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Mario-Limonciello/i2c-designware-Use-PCI-PSP-driver-for-communication/20230414-224238
patch link:    https://lore.kernel.org/r/20230414144008.836-3-mario.limonciello%40amd.com
patch subject: [PATCH v9 2/2] i2c: designware: Add doorbell support for Mendocino
config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20230415/202304150012.IieZ4vzl-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce (this is a W=1 build):
        # https://github.com/intel-lab-lkp/linux/commit/a8ae7845f0c3fcb46f4c37508838fed08dae7eec
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Mario-Limonciello/i2c-designware-Use-PCI-PSP-driver-for-communication/20230414-224238
        git checkout a8ae7845f0c3fcb46f4c37508838fed08dae7eec
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        make W=1 O=build_dir ARCH=x86_64 olddefconfig
        make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/i2c/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202304150012.IieZ4vzl-lkp@intel.com/

All errors (new ones prefixed by >>):

   drivers/i2c/busses/i2c-designware-amdpsp.c: In function 'psp_send_i2c_req_doorbell':
>> drivers/i2c/busses/i2c-designware-amdpsp.c:82:15: error: too many arguments to function 'psp_ring_platform_doorbell'
      82 |         ret = psp_ring_platform_doorbell(req->type, &req->hdr.status);
         |               ^~~~~~~~~~~~~~~~~~~~~~~~~~
   In file included from drivers/i2c/busses/i2c-designware-amdpsp.c:5:
   include/linux/psp-platform-access.h:51:5: note: declared here
      51 | int psp_ring_platform_doorbell(int msg);
         |     ^~~~~~~~~~~~~~~~~~~~~~~~~~


vim +/psp_ring_platform_doorbell +82 drivers/i2c/busses/i2c-designware-amdpsp.c

    77	
    78	static int psp_send_i2c_req_doorbell(struct psp_i2c_req *req)
    79	{
    80		int ret;
    81	
  > 82		ret = psp_ring_platform_doorbell(req->type, &req->hdr.status);
    83		if (ret == -EIO)
    84			return check_i2c_req_sts(req);
    85	
    86		return ret;
    87	}
    88	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests

^ permalink raw reply	[flat|nested] 6+ messages in thread

* RE: [PATCH v9 2/2] i2c: designware: Add doorbell support for Mendocino
  2023-04-14 16:50   ` kernel test robot
@ 2023-04-14 17:01     ` Limonciello, Mario
  0 siblings, 0 replies; 6+ messages in thread
From: Limonciello, Mario @ 2023-04-14 17:01 UTC (permalink / raw)
  To: Herbert Xu, kernel test robot
  Cc: oe-kbuild-all@lists.linux.dev, linux-crypto@vger.kernel.org,
	Mark Hasemeyer, Wolfram Sang, linux-i2c@vger.kernel.org,
	linux-kernel@vger.kernel.org, Jarkko Nikula, Andy Shevchenko,
	Mika Westerberg, Jan Dabros

[Public]



> -----Original Message-----
> From: kernel test robot <lkp@intel.com>
> Sent: Friday, April 14, 2023 11:50
> To: Limonciello, Mario <Mario.Limonciello@amd.com>; Herbert Xu
> <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>; Jan Dabros <jsd@semihalf.com>
> Cc: oe-kbuild-all@lists.linux.dev; linux-crypto@vger.kernel.org; Limonciello,
> Mario <Mario.Limonciello@amd.com>; Mark Hasemeyer
> <markhas@chromium.org>; Wolfram Sang <wsa-dev@sang-
> engineering.com>; linux-i2c@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH v9 2/2] i2c: designware: Add doorbell support for
> Mendocino
> 
> Hi Mario,
> 
> kernel test robot noticed the following build errors:
> 
> [auto build test ERROR on next-20230413]
> [cannot apply to wsa/i2c/for-next linus/master v6.3-rc6 v6.3-rc5 v6.3-rc4
> v6.3-rc6]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch#_base_tree_information]
> 
> url:    https://github.com/intel-lab-lkp/linux/commits/Mario-Limonciello/i2c-
> designware-Use-PCI-PSP-driver-for-communication/20230414-224238
> patch link:    https://lore.kernel.org/r/20230414144008.836-3-
> mario.limonciello%40amd.com
> patch subject: [PATCH v9 2/2] i2c: designware: Add doorbell support for
> Mendocino
> config: x86_64-allyesconfig (https://download.01.org/0day-
> ci/archive/20230415/202304150012.IieZ4vzl-lkp@intel.com/config)
> compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
> reproduce (this is a W=1 build):
>         # https://github.com/intel-lab-
> lkp/linux/commit/a8ae7845f0c3fcb46f4c37508838fed08dae7eec
>         git remote add linux-review https://github.com/intel-lab-lkp/linux
>         git fetch --no-tags linux-review Mario-Limonciello/i2c-designware-Use-
> PCI-PSP-driver-for-communication/20230414-224238
>         git checkout a8ae7845f0c3fcb46f4c37508838fed08dae7eec
>         # save the config file
>         mkdir build_dir && cp config build_dir/.config
>         make W=1 O=build_dir ARCH=x86_64 olddefconfig
>         make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/i2c/
> 
> If you fix the issue, kindly add following tag where applicable
> | Reported-by: kernel test robot <lkp@intel.com>
> | Link: https://lore.kernel.org/oe-kbuild-all/202304150012.IieZ4vzl-
> lkp@intel.com/
> 
> All errors (new ones prefixed by >>):
> 
>    drivers/i2c/busses/i2c-designware-amdpsp.c: In function
> 'psp_send_i2c_req_doorbell':
> >> drivers/i2c/busses/i2c-designware-amdpsp.c:82:15: error: too many
> arguments to function 'psp_ring_platform_doorbell'
>       82 |         ret = psp_ring_platform_doorbell(req->type, &req->hdr.status);
>          |               ^~~~~~~~~~~~~~~~~~~~~~~~~~
>    In file included from drivers/i2c/busses/i2c-designware-amdpsp.c:5:
>    include/linux/psp-platform-access.h:51:5: note: declared here
>       51 | int psp_ring_platform_doorbell(int msg);
>          |     ^~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> 
> vim +/psp_ring_platform_doorbell +82 drivers/i2c/busses/i2c-designware-
> amdpsp.c
> 
>     77
>     78	static int psp_send_i2c_req_doorbell(struct psp_i2c_req *req)
>     79	{
>     80		int ret;
>     81
>   > 82		ret = psp_ring_platform_doorbell(req->type, &req-
> >hdr.status);
>     83		if (ret == -EIO)
>     84			return check_i2c_req_sts(req);
>     85
>     86		return ret;
>     87	}
>     88
> 
> --
> 0-DAY CI Kernel Test Service
> https://github.com/intel/lkp-tests

FYI - this failure is because it was tested across wrong tree.  I didn't use
a base commit so it guessed.

Thanks,

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v9 0/2] Use CCP driver to handle PSP I2C arbitration
  2023-04-14 14:40 [PATCH v9 0/2] Use CCP driver to handle PSP I2C arbitration Mario Limonciello
  2023-04-14 14:40 ` [PATCH v9 1/2] i2c: designware: Use PCI PSP driver for communication Mario Limonciello
  2023-04-14 14:40 ` [PATCH v9 2/2] i2c: designware: Add doorbell support for Mendocino Mario Limonciello
@ 2023-04-20 10:22 ` Herbert Xu
  2 siblings, 0 replies; 6+ messages in thread
From: Herbert Xu @ 2023-04-20 10:22 UTC (permalink / raw)
  To: Mario Limonciello
  Cc: Andy Shevchenko, Mika Westerberg, Jan Dabros, linux-i2c,
	linux-crypto, linux-kernel

On Fri, Apr 14, 2023 at 09:40:06AM -0500, Mario Limonciello wrote:
> The CCP driver now has symbols that can be used by i2c-designware-amdpsp
> to handle the communication regarding i2c arbitration with the PSP for
> both Cezanne and Mendocino based designs.
> 
> Utilize those symbols.
> 
> v8->v9:
>  * Drop v8 patches 1-4 as they're merged now
>  * Pick up tags for v8 patches 5-6
>  * Repost to linux-crypto as this needs to merge through crypto tree.
> 
> Mario Limonciello (2):
>   i2c: designware: Use PCI PSP driver for communication
>   i2c: designware: Add doorbell support for Mendocino
> 
>  drivers/i2c/busses/Kconfig                  |   5 +-
>  drivers/i2c/busses/i2c-designware-amdpsp.c  | 197 +++++---------------
>  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, 53 insertions(+), 152 deletions(-)
> 
> -- 
> 2.34.1

All applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-04-20 10:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-14 14:40 [PATCH v9 0/2] Use CCP driver to handle PSP I2C arbitration Mario Limonciello
2023-04-14 14:40 ` [PATCH v9 1/2] i2c: designware: Use PCI PSP driver for communication Mario Limonciello
2023-04-14 14:40 ` [PATCH v9 2/2] i2c: designware: Add doorbell support for Mendocino Mario Limonciello
2023-04-14 16:50   ` kernel test robot
2023-04-14 17:01     ` Limonciello, Mario
2023-04-20 10:22 ` [PATCH v9 0/2] Use CCP driver to handle PSP I2C arbitration Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox