Skip to content

Commit 365aedc

Browse files
Ray Chigregkh
authored andcommitted
usb: dwc3: Skip resume if pm_runtime_set_active() fails
commit e3a9bd2 upstream. When the system begins to enter suspend mode, dwc3_suspend() is called by PM suspend. There is a problem that if someone interrupt the system suspend process between dwc3_suspend() and pm_suspend() of its parent device, PM suspend will be canceled and attempt to resume suspended devices so that dwc3_resume() will be called. However, dwc3 and its parent device (like the power domain or glue driver) may already be suspended by runtime PM in fact. If this sutiation happened, the pm_runtime_set_active() in dwc3_resume() will return an error since parent device was suspended. This can lead to unexpected behavior if DWC3 proceeds to execute dwc3_resume_common(). EX. RPM suspend: ... -> dwc3_runtime_suspend() -> rpm_suspend() of parent device ... PM suspend: ... -> dwc3_suspend() -> pm_suspend of parent device ^ interrupt, so resume suspended device ... <- dwc3_resume() <-/ ^ pm_runtime_set_active() returns error To prevent the problem, this commit will skip dwc3_resume_common() and return the error if pm_runtime_set_active() fails. Fixes: 68c26fe ("usb: dwc3: set pm runtime active before resume common") Cc: stable <stable@kernel.org> Signed-off-by: Ray Chi <raychi@google.com> Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com> Link: https://lore.kernel.org/r/20250106082240.3822059-1-raychi@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b9f8f66 commit 365aedc

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/usb/dwc3/core.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2601,12 +2601,15 @@ static int dwc3_resume(struct device *dev)
26012601
pinctrl_pm_select_default_state(dev);
26022602

26032603
pm_runtime_disable(dev);
2604-
pm_runtime_set_active(dev);
2604+
ret = pm_runtime_set_active(dev);
2605+
if (ret)
2606+
goto out;
26052607

26062608
ret = dwc3_resume_common(dwc, PMSG_RESUME);
26072609
if (ret)
26082610
pm_runtime_set_suspended(dev);
26092611

2612+
out:
26102613
pm_runtime_enable(dev);
26112614

26122615
return ret;

0 commit comments

Comments
 (0)