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

usb: dwc2: fix hang during suspend if set as peripheral

dwc2 on most platforms needs phy controller, clock and power supply.
All of them must be enabled/activated to properly operate. If dwc2
is configured as peripheral mode, then all the above three hardware
resources are disabled at the end of the probe:

/* Gadget code manages lowlevel hw on its own */
if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL)
dwc2_lowlevel_hw_disable(hsotg);

But the dwc2_suspend() tries to read the dwc2's reg to check whether
is_device_mode or not, this would result in hang during suspend if dwc2
is configured as peripheral mode.

Fix this hang by bypassing suspend/resume if lowlevel hw isn't
enabled.

Fixes: 09a75e857790 ("usb: dwc2: refactor common low-level hw code to platform.c")
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Link: https://patch.msgid.link/20251104002503.17158-3-jszhang@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jisheng Zhang and committed by
Greg Kroah-Hartman
2b94b054 b6ebcfdc

+8 -1
+8 -1
drivers/usb/dwc2/platform.c
··· 649 649 static int __maybe_unused dwc2_suspend(struct device *dev) 650 650 { 651 651 struct dwc2_hsotg *dwc2 = dev_get_drvdata(dev); 652 - bool is_device_mode = dwc2_is_device_mode(dwc2); 652 + bool is_device_mode; 653 653 int ret = 0; 654 654 655 + if (!dwc2->ll_hw_enabled) 656 + return 0; 657 + 658 + is_device_mode = dwc2_is_device_mode(dwc2); 655 659 if (is_device_mode) 656 660 dwc2_hsotg_suspend(dwc2); 657 661 ··· 731 727 { 732 728 struct dwc2_hsotg *dwc2 = dev_get_drvdata(dev); 733 729 int ret = 0; 730 + 731 + if (!dwc2->ll_hw_enabled) 732 + return 0; 734 733 735 734 if (dwc2->phy_off_for_suspend && dwc2->ll_hw_enabled) { 736 735 ret = __dwc2_lowlevel_hw_enable(dwc2);