Skip to content

Commit d46c4c8

Browse files
committed
PM: sleep: Fix power.is_suspended cleanup for direct-complete devices
Commit 03f1444 ("PM: sleep: Fix handling devices with direct_complete set on errors") caused power.is_suspended to be set for devices with power.direct_complete set, but it forgot to ensure the clearing of that flag for them in device_resume(), so power.is_suspended is still set for them during the next system suspend-resume cycle. If that cycle is aborted in dpm_suspend(), the subsequent invocation of dpm_resume() will trigger a device_resume() call for every device and because power.is_suspended is set for the devices in question, they will not be skipped by device_resume() as expected which causes scary error messages to be logged (as appropriate). To address this issue, move the clearing of power.is_suspended in device_resume() immediately after the power.is_suspended check so it will be always cleared for all devices processed by that function. Fixes: 03f1444 ("PM: sleep: Fix handling devices with direct_complete set on errors") Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4280 Reported-and-tested-by: Chris Bainbridge <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Reviewed-by: Mario Limonciello <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 079e888 commit d46c4c8

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/base/power/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,6 +985,8 @@ static void device_resume(struct device *dev, pm_message_t state, bool async)
985985
if (!dev->power.is_suspended)
986986
goto Complete;
987987

988+
dev->power.is_suspended = false;
989+
988990
if (dev->power.direct_complete) {
989991
/*
990992
* Allow new children to be added under the device after this
@@ -1047,7 +1049,6 @@ static void device_resume(struct device *dev, pm_message_t state, bool async)
10471049

10481050
End:
10491051
error = dpm_run_callback(callback, dev, state, info);
1050-
dev->power.is_suspended = false;
10511052

10521053
device_unlock(dev);
10531054
dpm_watchdog_clear(&wd);

0 commit comments

Comments
 (0)