On 2023/7/17 06:35, Jonas Karlman wrote:

The current error check for device_find_first_child is not working as expected, the documentation for device_find_first_child mention:

@devp: Returns first child device, or NULL if none Return: 0

Change to return early when there is no child node to avoid any possible null pointer dereference.

Signed-off-by: Jonas Karlman jonas@kwiboo.se Reviewed-by: Marek Vasut marex@denx.de

Reviewed-by: Kever Yang kever.yang@rock-chips.com

Thanks, - Kever

---

v3:

• Collect r-b tag

v2:

• Update commit message

  drivers/usb/dwc3/dwc3-generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 35e4b36a695e..4d5d500aefab 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -558,9 +558,9 @@ int dwc3_glue_probe(struct udevice *dev) return ret; }

• ret = device_find_first_child(dev, &child);
• if (ret)

• return ret;
  

• device_find_first_child(dev, &child);

• if (!child)

• return 0;
  
  

  if (glue->clks.count == 0) { ret = dwc3_glue_clk_init(child, glue);

Hi Marek,

Could you help to look at this patch, is there any further comment for the change?

Thanks,

- Kever

On 2023/7/17 06:35, Jonas Karlman wrote:

When dr_mode is peripheral or otg and U-Boot has not been built with DM_USB_GADGET support, booting such device may end up with:

dwc3_glue_bind_common: subnode name: usb@fcc00000 Error binding driver 'dwc3-generic-wrapper': -6 Some drivers failed to bind initcall sequence 00000000effbca08 failed at call 0000000000a217c8 (err=-6) ### ERROR ### Please RESET the board ###

Instead fail gracfully with ENODEV to allow board continue booting.

dwc3_glue_bind_common: subnode name: usb@fcc00000 dwc3_glue_bind_common: unsupported dr_mode 3

Also use CONFIG_IS_ENABLED(USB_HOST) and change switch to if statements to improve readability of the code.

Signed-off-by: Jonas Karlman jonas@kwiboo.se

v3:

• Update debug message to include dr_mode (Marek Vasut)

v2:

• Change to use CONFIG_IS_ENABLED for USB_HOST

• Refactor switch to if statements (Marek Vasut)

  drivers/usb/dwc3/dwc3-generic.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 4d5d500aefab..2331ac453132 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -226,8 +226,7 @@ U_BOOT_DRIVER(dwc3_generic_peripheral) = { }; #endif

-#if defined(CONFIG_SPL_USB_HOST) || \

• !defined(CONFIG_SPL_BUILD) && defined(CONFIG_USB_HOST)

+#if CONFIG_IS_ENABLED(USB_HOST) static int dwc3_generic_host_probe(struct udevice *dev) { struct xhci_hcor *hcor; @@ -409,7 +408,7 @@ struct dwc3_glue_ops ti_ops = { static int dwc3_glue_bind_common(struct udevice *parent, ofnode node) { const char *name = ofnode_get_name(node);

• const char *driver = NULL;

• const char *driver; enum usb_dr_mode dr_mode; struct udevice *dev; int ret;

@@ -421,27 +420,17 @@ static int dwc3_glue_bind_common(struct udevice *parent, ofnode node) if (!dr_mode) dr_mode = usb_get_dr_mode(node);

• switch (dr_mode) {
• case USB_DR_MODE_PERIPHERAL:
• case USB_DR_MODE_OTG:

-#if CONFIG_IS_ENABLED(DM_USB_GADGET)

• if (CONFIG_IS_ENABLED(DM_USB_GADGET) &&

•    (dr_mode == USB_DR_MODE_PERIPHERAL || dr_mode == USB_DR_MODE_OTG)) {
  

  debug("%s: dr_mode: OTG or Peripheral\n", __func__); driver = "dwc3-generic-peripheral";

-#endif

• break;
  

-#if defined(CONFIG_SPL_USB_HOST) || !defined(CONFIG_SPL_BUILD)

• case USB_DR_MODE_HOST:

• } else if (CONFIG_IS_ENABLED(USB_HOST) && dr_mode == USB_DR_MODE_HOST) { debug("%s: dr_mode: HOST\n", __func__); driver = "dwc3-generic-host";

• break;
  

-#endif

• default:

• debug("%s: unsupported dr_mode\n", __func__);
  

• } else {

• debug("%s: unsupported dr_mode %d\n", __func__, dr_mode);
  

  return -ENODEV;

• };
• if (!driver)

• return -ENXIO;
  

• }

  ret = device_bind_driver_to_node(parent, driver, name, node, &dev);

On 2023/7/17 06:35, Jonas Karlman wrote:

Change RK3568 devices to use the newer dwc3-generic driver instead of the old xhci-dwc3 driver for USB 3.0 support.

Signed-off-by: Jonas Karlman jonas@kwiboo.se

Reviewed-by: Kever Yang kever.yang@rock-chips.com

Thanks, - Kever

---

v3:

• No change

v2:

• No change

  configs/radxa-cm3-io-rk3566_defconfig | 2 +- configs/rock-3a-rk3568_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/radxa-cm3-io-rk3566_defconfig b/configs/radxa-cm3-io-rk3566_defconfig index 488723dfaa30..f89777184ceb 100644 --- a/configs/radxa-cm3-io-rk3566_defconfig +++ b/configs/radxa-cm3-io-rk3566_defconfig @@ -75,8 +75,8 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GENERIC=y CONFIG_ERRNO_STR=y diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig index 753d03914d90..ddb43249654e 100644 --- a/configs/rock-3a-rk3568_defconfig +++ b/configs/rock-3a-rk3568_defconfig @@ -85,10 +85,10 @@ CONFIG_ROCKCHIP_SFC=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GENERIC=y CONFIG_ERRNO_STR=y