]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: dwc2: fix hang during suspend if set as peripheral
authorJisheng Zhang <jszhang@kernel.org>
Tue, 4 Nov 2025 00:25:03 +0000 (08:25 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jan 2026 12:09:32 +0000 (13:09 +0100)
[ Upstream commit 2b94b054ac4974ad2f89f7f7461840c851933adb ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/dwc2/platform.c

index ae2d73c5aa811e4d69e2ca1f332272e10935f821..c9fa8c3ff425ad2eb5a4465b3d169c3112c65ef2 100644 (file)
@@ -669,9 +669,13 @@ error:
 static int __maybe_unused dwc2_suspend(struct device *dev)
 {
        struct dwc2_hsotg *dwc2 = dev_get_drvdata(dev);
-       bool is_device_mode = dwc2_is_device_mode(dwc2);
+       bool is_device_mode;
        int ret = 0;
 
+       if (!dwc2->ll_hw_enabled)
+               return 0;
+
+       is_device_mode = dwc2_is_device_mode(dwc2);
        if (is_device_mode)
                dwc2_hsotg_suspend(dwc2);
 
@@ -722,6 +726,9 @@ static int __maybe_unused dwc2_resume(struct device *dev)
        struct dwc2_hsotg *dwc2 = dev_get_drvdata(dev);
        int ret = 0;
 
+       if (!dwc2->ll_hw_enabled)
+               return 0;
+
        if (dwc2->phy_off_for_suspend && dwc2->ll_hw_enabled) {
                ret = __dwc2_lowlevel_hw_enable(dwc2);
                if (ret)