[v9,2/2] i2c: designware: Add doorbell support for Mendocino
Commit Message
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(-)
Comments
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
[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,
@@ -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)
@@ -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;