| Message ID | 1727187551-3772897-1-git-send-email-radhey.shyam.pandey@amd.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb: misc: onboard_usb_dev: introduce new config symbol for usb5744 SMBus support | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
El Tue, Sep 24, 2024 at 07:49:11PM GMT Radhey Shyam Pandey ha dit: > Introduce new kernel config symbol for Microchip usb5744 SMBus programming > support. Since usb5744 i2c initialization routine uses i2c SMBus APIs these > APIs should only be invoked when kernel has I2C support. This new kernel > config describes the dependency on I2C kernel support and fix the below > build issues when USB_ONBOARD_DEV=y and CONFIG_I2C=m. > > riscv64-linux-ld: drivers/usb/misc/onboard_usb_dev.o: > undefined reference to `i2c_find_device_by_fwnode' > drivers/usb/misc/onboard_usb_dev.c:408:(.text+0xb24): undefined > reference to `i2c_smbus_write_block_data' > <snip> > > Parsing of the i2c-bus bus handle is not put under usb5744 kernel config > check as the intention is to report an error when DT is configured for > usb5744 SMBus support and kernel has USB_ONBOARD_DEV_USB5744 disabled. > > Fixes: 6782311d04df ("usb: misc: onboard_usb_dev: add Microchip usb5744 SMBus programming support") > Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com> > Suggested-by: Matthias Kaehlcke <matthias@kaehlcke.net> > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202409140539.3Axwv38m-lkp@intel.com/ Acked-by: Matthias Kaehlcke <matthias@kaehlcke.net>
On Tue, Sep 24, 2024 at 07:49:11PM +0530, Radhey Shyam Pandey wrote: > Introduce new kernel config symbol for Microchip usb5744 SMBus programming > support. Since usb5744 i2c initialization routine uses i2c SMBus APIs these > APIs should only be invoked when kernel has I2C support. This new kernel > config describes the dependency on I2C kernel support and fix the below > build issues when USB_ONBOARD_DEV=y and CONFIG_I2C=m. > > riscv64-linux-ld: drivers/usb/misc/onboard_usb_dev.o: > undefined reference to `i2c_find_device_by_fwnode' > drivers/usb/misc/onboard_usb_dev.c:408:(.text+0xb24): undefined > reference to `i2c_smbus_write_block_data' > <snip> > > Parsing of the i2c-bus bus handle is not put under usb5744 kernel config > check as the intention is to report an error when DT is configured for > usb5744 SMBus support and kernel has USB_ONBOARD_DEV_USB5744 disabled. > > Fixes: 6782311d04df ("usb: misc: onboard_usb_dev: add Microchip usb5744 SMBus programming support") > Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com> > Suggested-by: Matthias Kaehlcke <matthias@kaehlcke.net> > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202409140539.3Axwv38m-lkp@intel.com/ > --- > drivers/usb/misc/Kconfig | 11 +++++++++++ > drivers/usb/misc/onboard_usb_dev.c | 6 ++++-- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig > index 50b86d531701..29976a93f122 100644 > --- a/drivers/usb/misc/Kconfig > +++ b/drivers/usb/misc/Kconfig > @@ -331,3 +331,14 @@ config USB_ONBOARD_DEV > this config will enable the driver and it will automatically > match the state of the USB subsystem. If this driver is a > module it will be called onboard_usb_dev. > + > +config USB_ONBOARD_DEV_USB5744 > + bool "Onboard USB Microchip usb5744 hub with SMBus support" > + depends on (USB_ONBOARD_DEV && I2C=y) || (USB_ONBOARD_DEV=m && I2C=m) > + default y "default y" is if you can not boot without this option enabled for all Linux systems. I doubt that is the case here :( thanks, greg k-h
On 9/25/24 08:33, Greg KH wrote: > On Tue, Sep 24, 2024 at 07:49:11PM +0530, Radhey Shyam Pandey wrote: >> Introduce new kernel config symbol for Microchip usb5744 SMBus programming >> support. Since usb5744 i2c initialization routine uses i2c SMBus APIs these >> APIs should only be invoked when kernel has I2C support. This new kernel >> config describes the dependency on I2C kernel support and fix the below >> build issues when USB_ONBOARD_DEV=y and CONFIG_I2C=m. >> >> riscv64-linux-ld: drivers/usb/misc/onboard_usb_dev.o: >> undefined reference to `i2c_find_device_by_fwnode' >> drivers/usb/misc/onboard_usb_dev.c:408:(.text+0xb24): undefined >> reference to `i2c_smbus_write_block_data' >> <snip> >> >> Parsing of the i2c-bus bus handle is not put under usb5744 kernel config >> check as the intention is to report an error when DT is configured for >> usb5744 SMBus support and kernel has USB_ONBOARD_DEV_USB5744 disabled. >> >> Fixes: 6782311d04df ("usb: misc: onboard_usb_dev: add Microchip usb5744 SMBus programming support") >> Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com> >> Suggested-by: Matthias Kaehlcke <matthias@kaehlcke.net> >> Reported-by: kernel test robot <lkp@intel.com> >> Closes: https://lore.kernel.org/oe-kbuild-all/202409140539.3Axwv38m-lkp@intel.com/ >> --- >> drivers/usb/misc/Kconfig | 11 +++++++++++ >> drivers/usb/misc/onboard_usb_dev.c | 6 ++++-- >> 2 files changed, 15 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig >> index 50b86d531701..29976a93f122 100644 >> --- a/drivers/usb/misc/Kconfig >> +++ b/drivers/usb/misc/Kconfig >> @@ -331,3 +331,14 @@ config USB_ONBOARD_DEV >> this config will enable the driver and it will automatically >> match the state of the USB subsystem. If this driver is a >> module it will be called onboard_usb_dev. >> + >> +config USB_ONBOARD_DEV_USB5744 >> + bool "Onboard USB Microchip usb5744 hub with SMBus support" >> + depends on (USB_ONBOARD_DEV && I2C=y) || (USB_ONBOARD_DEV=m && I2C=m) >> + default y > > "default y" is if you can not boot without this option enabled for all > Linux systems. I doubt that is the case here :( Intention is to have it enabled when USB_ONBOARD_DEV is enabled with all other conditions. In our case where our HW guys started to use this usb hub with usb-sd convertor where rootfs is on it. Without usb hub initialization via i2c we are not able to boot our system. Thanks, Michal
On Wed, Sep 25, 2024 at 08:59:00AM +0200, Michal Simek wrote: > > > On 9/25/24 08:33, Greg KH wrote: > > On Tue, Sep 24, 2024 at 07:49:11PM +0530, Radhey Shyam Pandey wrote: > > > Introduce new kernel config symbol for Microchip usb5744 SMBus programming > > > support. Since usb5744 i2c initialization routine uses i2c SMBus APIs these > > > APIs should only be invoked when kernel has I2C support. This new kernel > > > config describes the dependency on I2C kernel support and fix the below > > > build issues when USB_ONBOARD_DEV=y and CONFIG_I2C=m. > > > > > > riscv64-linux-ld: drivers/usb/misc/onboard_usb_dev.o: > > > undefined reference to `i2c_find_device_by_fwnode' > > > drivers/usb/misc/onboard_usb_dev.c:408:(.text+0xb24): undefined > > > reference to `i2c_smbus_write_block_data' > > > <snip> > > > > > > Parsing of the i2c-bus bus handle is not put under usb5744 kernel config > > > check as the intention is to report an error when DT is configured for > > > usb5744 SMBus support and kernel has USB_ONBOARD_DEV_USB5744 disabled. > > > > > > Fixes: 6782311d04df ("usb: misc: onboard_usb_dev: add Microchip usb5744 SMBus programming support") > > > Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com> > > > Suggested-by: Matthias Kaehlcke <matthias@kaehlcke.net> > > > Reported-by: kernel test robot <lkp@intel.com> > > > Closes: https://lore.kernel.org/oe-kbuild-all/202409140539.3Axwv38m-lkp@intel.com/ > > > --- > > > drivers/usb/misc/Kconfig | 11 +++++++++++ > > > drivers/usb/misc/onboard_usb_dev.c | 6 ++++-- > > > 2 files changed, 15 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig > > > index 50b86d531701..29976a93f122 100644 > > > --- a/drivers/usb/misc/Kconfig > > > +++ b/drivers/usb/misc/Kconfig > > > @@ -331,3 +331,14 @@ config USB_ONBOARD_DEV > > > this config will enable the driver and it will automatically > > > match the state of the USB subsystem. If this driver is a > > > module it will be called onboard_usb_dev. > > > + > > > +config USB_ONBOARD_DEV_USB5744 > > > + bool "Onboard USB Microchip usb5744 hub with SMBus support" > > > + depends on (USB_ONBOARD_DEV && I2C=y) || (USB_ONBOARD_DEV=m && I2C=m) > > > + default y > > > > "default y" is if you can not boot without this option enabled for all > > Linux systems. I doubt that is the case here :( > > Intention is to have it enabled when USB_ONBOARD_DEV is enabled with all > other conditions. In our case where our HW guys started to use this usb hub > with usb-sd convertor where rootfs is on it. Without usb hub initialization > via i2c we are not able to boot our system. That's fine, so say so in the Kconfig text and your depends line should be fine for that to be correct. But don't do "default y" as it is not normal for drivers. thanks, greg k-h
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index 50b86d531701..29976a93f122 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig @@ -331,3 +331,14 @@ config USB_ONBOARD_DEV this config will enable the driver and it will automatically match the state of the USB subsystem. If this driver is a module it will be called onboard_usb_dev. + +config USB_ONBOARD_DEV_USB5744 + bool "Onboard USB Microchip usb5744 hub with SMBus support" + depends on (USB_ONBOARD_DEV && I2C=y) || (USB_ONBOARD_DEV=m && I2C=m) + default y + help + Say Y here if you want to support onboard USB Microchip usb5744 + hub that requires SMBus initialization. + + This options enables usb5744 i2c default initialization sequence + during hub start-up configuration stage. diff --git a/drivers/usb/misc/onboard_usb_dev.c b/drivers/usb/misc/onboard_usb_dev.c index 560591e02d6a..75dfdca04ff1 100644 --- a/drivers/usb/misc/onboard_usb_dev.c +++ b/drivers/usb/misc/onboard_usb_dev.c @@ -311,7 +311,7 @@ static void onboard_dev_attach_usb_driver(struct work_struct *work) static int onboard_dev_5744_i2c_init(struct i2c_client *client) { -#if IS_ENABLED(CONFIG_I2C) +#if IS_ENABLED(CONFIG_USB_ONBOARD_DEV_USB5744) struct device *dev = &client->dev; int ret; @@ -394,9 +394,11 @@ static int onboard_dev_probe(struct platform_device *pdev) i2c_node = of_parse_phandle(pdev->dev.of_node, "i2c-bus", 0); if (i2c_node) { - struct i2c_client *client; + struct i2c_client *client = NULL; +#if IS_ENABLED(CONFIG_USB_ONBOARD_DEV_USB5744) client = of_find_i2c_device_by_node(i2c_node); +#endif of_node_put(i2c_node); if (!client) {
Introduce new kernel config symbol for Microchip usb5744 SMBus programming support. Since usb5744 i2c initialization routine uses i2c SMBus APIs these APIs should only be invoked when kernel has I2C support. This new kernel config describes the dependency on I2C kernel support and fix the below build issues when USB_ONBOARD_DEV=y and CONFIG_I2C=m. riscv64-linux-ld: drivers/usb/misc/onboard_usb_dev.o: undefined reference to `i2c_find_device_by_fwnode' drivers/usb/misc/onboard_usb_dev.c:408:(.text+0xb24): undefined reference to `i2c_smbus_write_block_data' <snip> Parsing of the i2c-bus bus handle is not put under usb5744 kernel config check as the intention is to report an error when DT is configured for usb5744 SMBus support and kernel has USB_ONBOARD_DEV_USB5744 disabled. Fixes: 6782311d04df ("usb: misc: onboard_usb_dev: add Microchip usb5744 SMBus programming support") Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com> Suggested-by: Matthias Kaehlcke <matthias@kaehlcke.net> Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202409140539.3Axwv38m-lkp@intel.com/ --- drivers/usb/misc/Kconfig | 11 +++++++++++ drivers/usb/misc/onboard_usb_dev.c | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) base-commit: ef545bc03a65438cabe87beb1b9a15b0ffcb6ace