Skip to content

Commit 6f75c3f

Browse files
computersforpeacerafaeljw
authored andcommitted
PM / sleep: don't suspend parent when async child suspend_{noirq, late} fails
Consider two devices, A and B, where B is a child of A, and B utilizes asynchronous suspend (it does not matter whether A is sync or async). If B fails to suspend_noirq() or suspend_late(), or is interrupted by a wakeup (pm_wakeup_pending()), then it aborts and sets the async_error variable. However, device A does not (immediately) check the async_error variable; it may continue to run its own suspend_noirq()/suspend_late() callback. This is bad. We can resolve this problem by doing our error and wakeup checking (particularly, for the async_error flag) after waiting for children to suspend, instead of before. This also helps align the logic for the noirq and late suspend cases with the logic in __device_suspend(). It's easy to observe this erroneous behavior by, for example, forcing a device to sleep a bit in its suspend_noirq() (to ensure the parent is waiting for the child to complete), then return an error, and watch the parent suspend_noirq() still get called. (Or similarly, fake a wakeup event at the right (or is it wrong?) time.) Fixes: de377b3 (PM / sleep: Asynchronous threads for suspend_late) Fixes: 28b6fd6 (PM / sleep: Asynchronous threads for suspend_noirq) Reported-by: Jeffy Chen <jeffy.chen@rock-chips.com> Signed-off-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent ceb7578 commit 6f75c3f

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/base/power/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,6 +1027,8 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
10271027
TRACE_DEVICE(dev);
10281028
TRACE_SUSPEND(0);
10291029

1030+
dpm_wait_for_children(dev, async);
1031+
10301032
if (async_error)
10311033
goto Complete;
10321034

@@ -1038,8 +1040,6 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
10381040
if (dev->power.syscore || dev->power.direct_complete)
10391041
goto Complete;
10401042

1041-
dpm_wait_for_children(dev, async);
1042-
10431043
if (dev->pm_domain) {
10441044
info = "noirq power domain ";
10451045
callback = pm_noirq_op(&dev->pm_domain->ops, state);
@@ -1174,6 +1174,8 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
11741174

11751175
__pm_runtime_disable(dev, false);
11761176

1177+
dpm_wait_for_children(dev, async);
1178+
11771179
if (async_error)
11781180
goto Complete;
11791181

@@ -1185,8 +1187,6 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
11851187
if (dev->power.syscore || dev->power.direct_complete)
11861188
goto Complete;
11871189

1188-
dpm_wait_for_children(dev, async);
1189-
11901190
if (dev->pm_domain) {
11911191
info = "late power domain ";
11921192
callback = pm_late_early_op(&dev->pm_domain->ops, state);

0 commit comments

Comments
 (0)