From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 24 Oct 2012 00:08:30 +0000 (+0200)
Subject: PM / Domains: Check device PM QoS flags in pm_genpd_poweroff()
X-Git-Tag: next-20121025~36^2~9^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=34b1f76275a2cb8c1ce8e00095d200552b235122;p=karo-tx-linux.git

PM / Domains: Check device PM QoS flags in pm_genpd_poweroff()

Make the generic PM domains pm_genpd_poweroff() function take
device PM QoS flags into account when deciding whether or not to
remove power from the domain.

After this change the routine will return -EBUSY without executing
the domain's .power_off() callback if there is at least one PM QoS
flags request for at least one device in the domain and at least of
those request has at least one of the NO_POWER_OFF and REMOTE_WAKEUP
flags set.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Jean Pihet <j-pihet@ti.com>
Reviewed-by: mark gross <markgross@thegnar.org>
---

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index c22b869245d9..e2cf392d99d2 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -470,10 +470,19 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)
 		return -EBUSY;
 
 	not_suspended = 0;
-	list_for_each_entry(pdd, &genpd->dev_list, list_node)
+	list_for_each_entry(pdd, &genpd->dev_list, list_node) {
+		enum pm_qos_flags_status stat;
+
+		stat = dev_pm_qos_flags(pdd->dev,
+					PM_QOS_FLAG_NO_POWER_OFF
+						| PM_QOS_FLAG_REMOTE_WAKEUP);
+		if (stat > PM_QOS_FLAGS_NONE)
+			return -EBUSY;
+
 		if (pdd->dev->driver && (!pm_runtime_suspended(pdd->dev)
 		    || pdd->dev->power.irq_safe))
 			not_suspended++;
+	}
 
 	if (not_suspended > genpd->in_progress)
 		return -EBUSY;