Commit 897e13a8 authored by Roy Luo's avatar Roy Luo Committed by Greg Kroah-Hartman
Browse files

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: 68c26fe5 ("usb: dwc3: set pm runtime active before resume common")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRoy Luo <royluo@google.com>
Acked-by: default avatarThinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/20240913232145.3507723-1-royluo@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6555cb1

drivers/usb/dwc3/core.c

+3 −5
Original line number Diff line number Diff line
@@ -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)