diff mbox series

[v1,09/10] PM: sleep: Propagate power.set_active in dependency chains

Message ID 47028492.fMDQidcC6G@rjwysocki.net (mailing list archive)
State Superseded, archived
Headers show
Series PM: Make the core and pm_runtime_force_suspend/resume() agree more | expand

Commit Message

Rafael J. Wysocki Feb. 11, 2025, 9:21 p.m. UTC 
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

After preparing pm_runtime_force_resume() for dealing with devices
having power.set_active set, make the core propagate that flag in
dependency chains, so that subordinate device are resumed along with
the ones that they depend on, but take exceptions into account.

Namely, do not set power.set_active for devices that have never had
runtime PM enabled, for parents that have power.ignore_children set and
for suppliers coming from device links with DL_FLAG_PM_RUNTIME unset.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/base/power/main.c |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)
diff mbox series

Patch

--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1189,18 +1189,31 @@ 
 	return PMSG_ON;
 }
 
+static void dpm_cond_set_active(struct device *dev, bool cond)
+{
+	if (cond && !pm_runtime_no_support(dev))
+		dev->power.set_active = true;
+}
+
 static void dpm_superior_set_must_resume(struct device *dev)
 {
+	bool set_active = dev->power.set_active;
 	struct device_link *link;
 	int idx;
 
-	if (dev->parent)
+	if (dev->parent) {
 		dev->parent->power.must_resume = true;
+		dpm_cond_set_active(dev->parent, set_active &&
+				    !dev->parent->power.ignore_children);
+	}
 
 	idx = device_links_read_lock();
 
-	list_for_each_entry_rcu_locked(link, &dev->links.suppliers, c_node)
+	list_for_each_entry_rcu_locked(link, &dev->links.suppliers, c_node) {
 		link->supplier->power.must_resume = true;
+		dpm_cond_set_active(link->supplier, set_active &&
+				    (link->flags & DL_FLAG_PM_RUNTIME));
+	}
 
 	device_links_read_unlock(idx);
 }
@@ -1277,13 +1290,7 @@ 
 		dev->power.must_resume = true;
 
 	if (dev->power.must_resume) {
-		if (dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND) &&
-		    !pm_runtime_no_support(dev)) {
-			dev->power.set_active = true;
-			if (dev->parent && !dev->parent->power.ignore_children &&
-			    !pm_runtime_no_support(dev->parent))
-				dev->parent->power.set_active = true;
-		}
+		dpm_cond_set_active(dev, dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND));
 		dpm_superior_set_must_resume(dev);
 	}