Skip to content

Commit 2a71519

Browse files
committed
Merge back material related to system sleep for 6.20
2 parents 7966cf0 + 10c3ab8 commit 2a71519

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

Documentation/power/runtime_pm.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -712,10 +712,9 @@ out the following operations:
712712
* During system suspend pm_runtime_get_noresume() is called for every device
713713
right before executing the subsystem-level .prepare() callback for it and
714714
pm_runtime_barrier() is called for every device right before executing the
715-
subsystem-level .suspend() callback for it. In addition to that the PM core
716-
calls __pm_runtime_disable() with 'false' as the second argument for every
717-
device right before executing the subsystem-level .suspend_late() callback
718-
for it.
715+
subsystem-level .suspend() callback for it. In addition to that, the PM
716+
core disables runtime PM for every device right before executing the
717+
subsystem-level .suspend_late() callback for it.
719718

720719
* During system resume pm_runtime_enable() and pm_runtime_put() are called for
721720
every device right after executing the subsystem-level .resume_early()

drivers/base/power/main.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,10 +1647,11 @@ static void device_suspend_late(struct device *dev, pm_message_t state, bool asy
16471647
goto Complete;
16481648

16491649
/*
1650-
* Disable runtime PM for the device without checking if there is a
1651-
* pending resume request for it.
1650+
* After this point, any runtime PM operations targeting the device
1651+
* will fail until the corresponding pm_runtime_enable() call in
1652+
* device_resume_early().
16521653
*/
1653-
__pm_runtime_disable(dev, false);
1654+
pm_runtime_disable(dev);
16541655

16551656
if (dev->power.syscore)
16561657
goto Skip;

kernel/power/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ EXPORT_SYMBOL_GPL(pm_wq);
11251125

11261126
static int __init pm_start_workqueues(void)
11271127
{
1128-
pm_wq = alloc_workqueue("pm", WQ_FREEZABLE | WQ_UNBOUND, 0);
1128+
pm_wq = alloc_workqueue("pm", WQ_UNBOUND, 0);
11291129
if (!pm_wq)
11301130
return -ENOMEM;
11311131

0 commit comments

Comments
 (0)