mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-19 07:49:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

PM: core: Tweak pm_runtime_block_if_disabled() return value

Browse Source 
Modify pm_runtime_block_if_disabled() to return true when runtime PM
is disabled for the device, regardless of the power.last_status value.

This effectively prevents "smart suspend" from being enabled for
devices with runtime PM disabled in device_prepare(), even transiently,
so update the related comment in that function accordingly.

If a device has runtime PM disabled in device_prepare(), it is not
actually known whether or not runtime PM will be enabled for that
device going forward, so it is more appropriate to postpone the
"smart suspend" optimization for the device in the given system
suspend-resume cycle than to enable it and get confused going
forward.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://patch.msgid.link/13718674.uLZWGnKmhe@rjwysocki.net
This commit is contained in:
Rafael J. Wysocki
2025-02-27 11:49:12 +01:00
parent 1476bb20ee
commit a84c2a885b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/power/main.c
View File

@@ -1897,7 +1897,7 @@ static int device_prepare(struct device *dev, pm_message_t state)
pm_runtime_put(dev);
return ret;
}
/* Do not enable "smart suspend" for devices without runtime PM. */
/* Do not enable "smart suspend" for devices with disabled runtime PM. */
if (smart_suspend)
smart_suspend = device_prepare_smart_suspend(dev);

4
drivers/base/power/runtime.c
View File

@@ -1466,8 +1466,8 @@ bool pm_runtime_block_if_disabled(struct device *dev)
spin_lock_irq(&dev->power.lock);
ret = dev->power.disable_depth && dev->power.last_status == RPM_INVALID;
if (ret)
ret = !pm_runtime_enabled(dev);
if (ret && dev->power.last_status == RPM_INVALID)
dev->power.last_status = RPM_BLOCKED;
spin_unlock_irq(&dev->power.lock);