[PATCH v5 6/7] usb: dwc2: restore peripheral mode on low-level enable
From: Fabrice Gasnier
Date: Tue Nov 17 2026 - 12:07:27 EST
When peripheral-only mode has no gadget driver bound, gadget code manages
low-level hardware on its own. If standby loses the DWC2 registers,
dwc2_resume() returns early because ll_hw_enabled is false. When a
gadget driver is later bound, low-level hardware is re-enabled, but
FORCEDEVMODE has not been restored.
Restore the configured mode after enabling low-level hardware for fixed
peripheral mode. The dr_mode check leaves the initial probe-time enable
unchanged, as the mode is parsed later. Skip the duplicate peripheral
restore in dwc2_resume(), while retaining its restore for other fixed
modes and the role-switch resume path.
Fixes: 2b94b054ac49 ("usb: dwc2: fix hang during suspend if set as peripheral")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Fabrice Gasnier <fabrice.gasnier@xxxxxxxxxxx>
---
Changes in v5:
- New separate patch added since issue raised by Sashiko on next patch
pre-exists, e.g. missing forced mode restore in peripheral-only mode.
---
drivers/usb/dwc2/platform.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 3bdb88902811..5fd005e72173 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -129,6 +129,14 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg)
if (ret)
goto err_dis_clk;
+ if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL && !hsotg->role_sw) {
+ /*
+ * Gadget code manages low-level hardware on its own. Restore
+ * peripheral mode after register loss while it was disabled.
+ */
+ dwc2_force_dr_mode(hsotg);
+ }
+
return 0;
err_dis_clk:
@@ -743,10 +751,10 @@ static int __maybe_unused dwc2_resume(struct device *dev)
spin_unlock_irqrestore(&dwc2->lock, flags);
}
- if (!dwc2->role_sw) {
+ if (!dwc2->role_sw && dwc2->dr_mode != USB_DR_MODE_PERIPHERAL) {
/* Need to restore FORCEDEVMODE/FORCEHOSTMODE */
dwc2_force_dr_mode(dwc2);
- } else {
+ } else if (dwc2->role_sw) {
dwc2_drd_resume(dwc2);
}
--
2.43.0