usb: dwc3: re-enable runtime PM after failed resume

When dwc3_resume_common() returns an error, runtime pm is left in
suspended and disabled state in dwc3_resume(). Since the device
is suspended, its parent devices (like the power domain or glue
driver) could also be suspended and may have released resources
that dwc requires. Consequently, calling dwc3_suspend_common() in
this situation could result in attempts to access unclocked or
unpowered registers.
To prevent these problems, runtime PM should always be re-enabled,
even after failed resume attempts. This ensures that
dwc3_suspend_common() is skipped in such cases.

Fixes: 68c26fe58182 ("usb: dwc3: set pm runtime active before resume common")
Cc: stable@vger.kernel.org
Signed-off-by: Roy Luo <royluo@google.com>
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/20240913232145.3507723-1-royluo@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 9eb085f359ce3fe7ee9667ccfbe29bc591de0d54..40611a5511c179faa9d1cc5efdf1f7e87f6606a0 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -2552,7 +2552,7 @@ static int dwc3_suspend(struct device *dev)
 static int dwc3_resume(struct device *dev)
 {
        struct dwc3     *dwc = dev_get_drvdata(dev);
-       int             ret;
+       int             ret = 0;
 
        pinctrl_pm_select_default_state(dev);
 
@@ -2560,14 +2560,12 @@ static int dwc3_resume(struct device *dev)
        pm_runtime_set_active(dev);
 
        ret = dwc3_resume_common(dwc, PMSG_RESUME);
-       if (ret) {
+       if (ret)
                pm_runtime_set_suspended(dev);
-               return ret;
-       }
 
        pm_runtime_enable(dev);
 
-       return 0;
+       return ret;
 }
 
 static void dwc3_complete(struct device *dev)