Message ID | 1606659745-19420-1-git-send-email-pthombar@cadence.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | I3C mastership handover support | expand |
Hi Parshuram,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on next-20201127]
[cannot apply to linus/master v5.10-rc5 v5.10-rc4 v5.10-rc3 v5.10-rc5]
[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]
url: https://github.com/0day-ci/linux/commits/Parshuram-Thombare/I3C-mastership-handover-support/20201129-222847
base: 6174f05255e65622ff3340257879a4c0f858b0df
config: i386-randconfig-a012-20201129 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/963007469aa0a76446a899aa8b019802dfc82cb6
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Parshuram-Thombare/I3C-mastership-handover-support/20201129-222847
git checkout 963007469aa0a76446a899aa8b019802dfc82cb6
# save the attached .config to linux build tree
make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/i3c/master/mipi-i3c-hci/core.c: In function 'i3c_hci_probe':
>> drivers/i3c/master/mipi-i3c-hci/core.c:760:8: error: implicit declaration of function 'i3c_master_register'; did you mean 'i3c_master_unregister'? [-Werror=implicit-function-declaration]
760 | ret = i3c_master_register(&hci->master, &pdev->dev,
| ^~~~~~~~~~~~~~~~~~~
| i3c_master_unregister
cc1: some warnings being treated as errors
vim +760 drivers/i3c/master/mipi-i3c-hci/core.c
9ad9a52cce2828d Nicolas Pitre 2020-11-11 733
9ad9a52cce2828d Nicolas Pitre 2020-11-11 734 static int i3c_hci_probe(struct platform_device *pdev)
9ad9a52cce2828d Nicolas Pitre 2020-11-11 735 {
9ad9a52cce2828d Nicolas Pitre 2020-11-11 736 struct i3c_hci *hci;
9ad9a52cce2828d Nicolas Pitre 2020-11-11 737 int irq, ret;
9ad9a52cce2828d Nicolas Pitre 2020-11-11 738
9ad9a52cce2828d Nicolas Pitre 2020-11-11 739 hci = devm_kzalloc(&pdev->dev, sizeof(*hci), GFP_KERNEL);
9ad9a52cce2828d Nicolas Pitre 2020-11-11 740 if (!hci)
9ad9a52cce2828d Nicolas Pitre 2020-11-11 741 return -ENOMEM;
9ad9a52cce2828d Nicolas Pitre 2020-11-11 742 hci->base_regs = devm_platform_ioremap_resource(pdev, 0);
9ad9a52cce2828d Nicolas Pitre 2020-11-11 743 if (IS_ERR(hci->base_regs))
9ad9a52cce2828d Nicolas Pitre 2020-11-11 744 return PTR_ERR(hci->base_regs);
9ad9a52cce2828d Nicolas Pitre 2020-11-11 745
9ad9a52cce2828d Nicolas Pitre 2020-11-11 746 platform_set_drvdata(pdev, hci);
9ad9a52cce2828d Nicolas Pitre 2020-11-11 747 /* temporary for dev_printk's, to be replaced in i3c_master_register */
9ad9a52cce2828d Nicolas Pitre 2020-11-11 748 hci->master.dev.init_name = dev_name(&pdev->dev);
9ad9a52cce2828d Nicolas Pitre 2020-11-11 749
9ad9a52cce2828d Nicolas Pitre 2020-11-11 750 ret = i3c_hci_init(hci);
9ad9a52cce2828d Nicolas Pitre 2020-11-11 751 if (ret)
9ad9a52cce2828d Nicolas Pitre 2020-11-11 752 return ret;
9ad9a52cce2828d Nicolas Pitre 2020-11-11 753
9ad9a52cce2828d Nicolas Pitre 2020-11-11 754 irq = platform_get_irq(pdev, 0);
9ad9a52cce2828d Nicolas Pitre 2020-11-11 755 ret = devm_request_irq(&pdev->dev, irq, i3c_hci_irq_handler,
9ad9a52cce2828d Nicolas Pitre 2020-11-11 756 0, NULL, hci);
9ad9a52cce2828d Nicolas Pitre 2020-11-11 757 if (ret)
9ad9a52cce2828d Nicolas Pitre 2020-11-11 758 return ret;
9ad9a52cce2828d Nicolas Pitre 2020-11-11 759
9ad9a52cce2828d Nicolas Pitre 2020-11-11 @760 ret = i3c_master_register(&hci->master, &pdev->dev,
9ad9a52cce2828d Nicolas Pitre 2020-11-11 761 &i3c_hci_ops, false);
9ad9a52cce2828d Nicolas Pitre 2020-11-11 762 if (ret)
9ad9a52cce2828d Nicolas Pitre 2020-11-11 763 return ret;
9ad9a52cce2828d Nicolas Pitre 2020-11-11 764
9ad9a52cce2828d Nicolas Pitre 2020-11-11 765 return 0;
9ad9a52cce2828d Nicolas Pitre 2020-11-11 766 }
9ad9a52cce2828d Nicolas Pitre 2020-11-11 767
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index b61bf53..56e8fe4 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -1637,7 +1637,7 @@ static void i3c_master_detach_free_devs(struct i3c_master_controller *master) } /** - * i3c_master_bus_init() - initialize an I3C bus + * i3c_primary_master_bus_init() - initialize an I3C bus * @master: main master initializing the bus * * This function is following all initialisation steps described in the I3C @@ -1668,7 +1668,7 @@ static void i3c_master_detach_free_devs(struct i3c_master_controller *master) * * Return: a 0 in case of success, an negative error code otherwise. */ -static int i3c_master_bus_init(struct i3c_master_controller *master) +static int i3c_primary_master_bus_init(struct i3c_master_controller *master) { enum i3c_addr_slot_status status; struct i2c_dev_boardinfo *i2cboardinfo; @@ -2441,31 +2441,10 @@ static int i3c_master_check_ops(const struct i3c_master_controller_ops *ops) return 0; } -/** - * i3c_master_register() - register an I3C master - * @master: master used to send frames on the bus - * @parent: the parent device (the one that provides this I3C master - * controller) - * @ops: the master controller operations - * @secondary: true if you are registering a secondary master. Will return - * -ENOTSUPP if set to true since secondary masters are not yet - * supported - * - * This function takes care of everything for you: - * - * - creates and initializes the I3C bus - * - populates the bus with static I2C devs if @parent->of_node is not - * NULL - * - registers all I3C devices added by the controller during bus - * initialization - * - registers the I2C adapter and all I2C devices - * - * Return: 0 in case of success, a negative error code otherwise. - */ -int i3c_master_register(struct i3c_master_controller *master, - struct device *parent, - const struct i3c_master_controller_ops *ops, - bool secondary) +static int i3c_master_init(struct i3c_master_controller *master, + struct device *parent, + const struct i3c_master_controller_ops *ops, + bool secondary) { unsigned long i2c_scl_rate = I3C_BUS_I2C_FM_PLUS_SCL_RATE; struct i3c_bus *i3cbus = i3c_master_get_bus(master); @@ -2535,10 +2514,49 @@ int i3c_master_register(struct i3c_master_controller *master, goto err_put_dev; } - ret = i3c_master_bus_init(master); + ret = i3c_primary_master_bus_init(master); if (ret) goto err_destroy_wq; + return 0; + +err_destroy_wq: + destroy_workqueue(master->wq); + +err_put_dev: + put_device(&master->dev); + + return ret; +} + +/** + * i3c_primary_master_register() - register an I3C master + * @master: master used to send frames on the bus + * @parent: the parent device (the one that provides this I3C master + * controller) + * @ops: the master controller operations + * + * This function takes care of everything for you: + * + * - creates and initializes the I3C bus + * - populates the bus with static I2C devs if @parent->of_node is not + * NULL + * - registers all I3C devices added by the controller during bus + * initialization + * - registers the I2C adapter and all I2C devices + * + * Return: 0 in case of success, a negative error code otherwise. + */ +int i3c_primary_master_register(struct i3c_master_controller *master, + struct device *parent, + const struct i3c_master_controller_ops *ops) +{ + int ret; + + ret = i3c_master_init(master, parent, ops, false); + if (ret) + return ret; + ret = device_add(&master->dev); if (ret) goto err_cleanup_bus; @@ -2568,15 +2586,13 @@ int i3c_master_register(struct i3c_master_controller *master, err_cleanup_bus: i3c_master_bus_cleanup(master); -err_destroy_wq: destroy_workqueue(master->wq); -err_put_dev: put_device(&master->dev); return ret; } -EXPORT_SYMBOL_GPL(i3c_master_register); +EXPORT_SYMBOL_GPL(i3c_primary_master_register); /** * i3c_master_unregister() - unregister an I3C master diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c index 8513bd3..4f4d41f 100644 --- a/drivers/i3c/master/dw-i3c-master.c +++ b/drivers/i3c/master/dw-i3c-master.c @@ -1166,8 +1166,8 @@ static int dw_i3c_probe(struct platform_device *pdev) master->maxdevs = ret >> 16; master->free_pos = GENMASK(master->maxdevs - 1, 0); - ret = i3c_master_register(&master->base, &pdev->dev, - &dw_mipi_i3c_ops, false); + ret = i3c_primary_master_register(&master->base, &pdev->dev, + &dw_mipi_i3c_ops); if (ret) goto err_assert_rst; diff --git a/drivers/i3c/master/i3c-master-cdns.c b/drivers/i3c/master/i3c-master-cdns.c index 3f22269..f1d6d68 100644 --- a/drivers/i3c/master/i3c-master-cdns.c +++ b/drivers/i3c/master/i3c-master-cdns.c @@ -1644,8 +1644,8 @@ static int cdns_i3c_master_probe(struct platform_device *pdev) writel(MST_INT_IBIR_THR, master->regs + MST_IER); writel(DEVS_CTRL_DEV_CLR_ALL, master->regs + DEVS_CTRL); - ret = i3c_master_register(&master->base, &pdev->dev, - &cdns_i3c_master_ops, false); + ret = i3c_primary_master_register(&master->base, &pdev->dev, + &cdns_i3c_master_ops); if (ret) goto err_disable_sysclk; diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h index 9cb39d9..e543f68 100644 --- a/include/linux/i3c/master.h +++ b/include/linux/i3c/master.h @@ -538,10 +538,9 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master, int i3c_master_set_info(struct i3c_master_controller *master, const struct i3c_device_info *info); -int i3c_master_register(struct i3c_master_controller *master, - struct device *parent, - const struct i3c_master_controller_ops *ops, - bool secondary); +int i3c_primary_master_register(struct i3c_master_controller *master, + struct device *parent, + const struct i3c_master_controller_ops *ops); int i3c_master_unregister(struct i3c_master_controller *master); /**
Removed last argument 'secondary' and restructured i3c_master_register to move code that can be common to i3c_secondary_master_register to separate function i3c_master_init. Signed-off-by: Parshuram Thombare <pthombar@cadence.com> --- drivers/i3c/master.c | 78 ++++++++++++++++++++------------- drivers/i3c/master/dw-i3c-master.c | 4 +- drivers/i3c/master/i3c-master-cdns.c | 4 +- include/linux/i3c/master.h | 7 +-- 4 files changed, 54 insertions(+), 39 deletions(-)