Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: dwc2: drd: fix clock gating on USB role switch

The dwc2_handle_usb_suspend_intr() function disables gadget clocks in USB
peripheral mode when no other power-down mode is available (introduced by
commit 0112b7ce68ea ("usb: dwc2: Update dwc2_handle_usb_suspend_intr function.")).
However, the dwc2_drd_role_sw_set() USB role update handler attempts to
read DWC2 registers if the USB role has changed while the USB is in suspend
mode (when the clocks are gated). This causes the system to hang.

Release the gadget clocks before handling the USB role update.

Fixes: 0112b7ce68ea ("usb: dwc2: Update dwc2_handle_usb_suspend_intr function.")
Cc: stable@vger.kernel.org
Signed-off-by: Tomas Marek <tomas.marek@elrest.cz>
Link: https://lore.kernel.org/r/20240906055025.25057-1-tomas.marek@elrest.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Tomas Marek and committed by
Greg Kroah-Hartman
2c6b6afa 1702bec4

+9
+9
drivers/usb/dwc2/drd.c
··· 127 127 role = USB_ROLE_DEVICE; 128 128 } 129 129 130 + if ((IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || 131 + IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)) && 132 + dwc2_is_device_mode(hsotg) && 133 + hsotg->lx_state == DWC2_L2 && 134 + hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_NONE && 135 + hsotg->bus_suspended && 136 + !hsotg->params.no_clock_gating) 137 + dwc2_gadget_exit_clock_gating(hsotg, 0); 138 + 130 139 if (role == USB_ROLE_HOST) { 131 140 already = dwc2_ovr_avalid(hsotg, true); 132 141 } else if (role == USB_ROLE_DEVICE) {