Skip to content

Commit 5021383

Browse files
Fabrice Gasniergregkh
authored andcommitted
usb: dwc2: fix a race, don't power off/on phy for dual-role mode
When in dual role mode (dr_mode == USB_DR_MODE_OTG), platform probe successively basically calls: - dwc2_gadget_init() - dwc2_hcd_init() - dwc2_lowlevel_hw_disable() since recent change [1] - usb_add_gadget_udc() The PHYs (and so the clocks it may provide) shouldn't be disabled for all SoCs, in OTG mode, as the HCD part has been initialized. On STM32 this creates some weird race condition upon boot, when: - initially attached as a device, to a HOST - and there is a gadget script invoked to setup the device part. Below issue becomes systematic, as long as the gadget script isn't started by userland: the hardware PHYs (and so the clocks provided by the PHYs) remains disabled. It ends up in having an endless interrupt storm, before the watchdog resets the platform. [ 16.924163] dwc2 49000000.usb-otg: EPs: 9, dedicated fifos, 952 entries in SPRAM [ 16.962704] dwc2 49000000.usb-otg: DWC OTG Controller [ 16.966488] dwc2 49000000.usb-otg: new USB bus registered, assigned bus number 2 [ 16.974051] dwc2 49000000.usb-otg: irq 77, io mem 0x49000000 [ 17.032170] hub 2-0:1.0: USB hub found [ 17.042299] hub 2-0:1.0: 1 port detected [ 17.175408] dwc2 49000000.usb-otg: Mode Mismatch Interrupt: currently in Host mode [ 17.181741] dwc2 49000000.usb-otg: Mode Mismatch Interrupt: currently in Host mode [ 17.189303] dwc2 49000000.usb-otg: Mode Mismatch Interrupt: currently in Host mode ... The host part is also not functional, until the gadget part is configured. The HW may only be disabled for peripheral mode (original init), e.g. dr_mode == USB_DR_MODE_PERIPHERAL, until the gadget driver initializes. But when in USB_DR_MODE_OTG, the HW should remain enabled, as the HCD part is able to run, while the gadget part isn't necessarily configured. I don't fully get the of purpose the original change, that claims disabling the hardware is missing. It creates conditions on SOCs using the PHY initialization to be completely non working in OTG mode. Original change [1] should be reworked to be platform specific. [1] https://lore.kernel.org/r/20221206-dwc2-gadget-dual-role-v1-2-36515e1092cd@theobroma-systems.com Fixes: ade23d7 ("usb: dwc2: power on/off phy for peripheral mode in dual-role mode") Cc: stable <stable@kernel.org> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com> Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Tested-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Link: https://lore.kernel.org/r/20230315144433.3095859-1-fabrice.gasnier@foss.st.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f747313 commit 5021383

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

drivers/usb/dwc2/gadget.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4549,8 +4549,7 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget,
45494549
hsotg->gadget.dev.of_node = hsotg->dev->of_node;
45504550
hsotg->gadget.speed = USB_SPEED_UNKNOWN;
45514551

4552-
if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL ||
4553-
(hsotg->dr_mode == USB_DR_MODE_OTG && dwc2_is_device_mode(hsotg))) {
4552+
if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL) {
45544553
ret = dwc2_lowlevel_hw_enable(hsotg);
45554554
if (ret)
45564555
goto err;
@@ -4612,8 +4611,7 @@ static int dwc2_hsotg_udc_stop(struct usb_gadget *gadget)
46124611
if (!IS_ERR_OR_NULL(hsotg->uphy))
46134612
otg_set_peripheral(hsotg->uphy->otg, NULL);
46144613

4615-
if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL ||
4616-
(hsotg->dr_mode == USB_DR_MODE_OTG && dwc2_is_device_mode(hsotg)))
4614+
if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL)
46174615
dwc2_lowlevel_hw_disable(hsotg);
46184616

46194617
return 0;

drivers/usb/dwc2/platform.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,7 @@ static int dwc2_driver_probe(struct platform_device *dev)
564564
dwc2_debugfs_init(hsotg);
565565

566566
/* Gadget code manages lowlevel hw on its own */
567-
if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL ||
568-
(hsotg->dr_mode == USB_DR_MODE_OTG && dwc2_is_device_mode(hsotg)))
567+
if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL)
569568
dwc2_lowlevel_hw_disable(hsotg);
570569

571570
#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \

0 commit comments

Comments
 (0)