[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2673469.H8s3UchFPJ@vostro.rjw.lan>
Date: Thu, 16 Jan 2014 17:07:07 +0100
From: "Rafael J. Wysocki" <rjw@...ysocki.net>
To: Mika Westerberg <mika.westerberg@...ux.intel.com>,
Linux PM list <linux-pm@...r.kernel.org>
Cc: Alan Stern <stern@...land.harvard.edu>,
Aaron Lu <aaron.lu@...el.com>,
ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [Update][RFC][PATCH 2/3] PM / runtime: Routine for checking device status during system suspend
On Thursday, January 16, 2014 03:32:51 PM Mika Westerberg wrote:
> On Wed, Jan 15, 2014 at 12:14:46AM +0100, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
> >
> > Add a new helper routine, pm_runtime_enabled_and_suspended(), to
> > allow subsystems (or PM domains) to check the runtime PM status of
> > devices during system suspend (possibly to avoid resuming those
> > devices upfront at that time).
> >
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
> > ---
> > drivers/base/power/runtime.c | 28 ++++++++++++++++++++++++++++
> > include/linux/pm_runtime.h | 2 ++
> > 2 files changed, 30 insertions(+)
> >
> > Index: linux-pm/include/linux/pm_runtime.h
> > ===================================================================
> > --- linux-pm.orig/include/linux/pm_runtime.h
> > +++ linux-pm/include/linux/pm_runtime.h
> > @@ -53,6 +53,7 @@ extern unsigned long pm_runtime_autosusp
> > extern void pm_runtime_update_max_time_suspended(struct device *dev,
> > s64 delta_ns);
> > extern void pm_runtime_set_memalloc_noio(struct device *dev, bool enable);
> > +extern bool pm_runtime_enabled_and_suspended(struct device *dev);
> >
> > static inline bool pm_children_suspended(struct device *dev)
> > {
> > @@ -161,6 +162,7 @@ static inline unsigned long pm_runtime_a
> > struct device *dev) { return 0; }
> > static inline void pm_runtime_set_memalloc_noio(struct device *dev,
> > bool enable){}
> > +static inline bool pm_runtime_enabled_and_suspended(struct device *dev) { return false };
>
> The above probably doesn't compile if !CONFIG_PM_RUNTIME because of the
> misplaced semicolon.
Of well, indeed, thanks!
Update follows.
---
From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Subject: PM / runtime: Routine for checking device status during system suspend
Add a new helper routine, pm_runtime_enabled_and_suspended(), to
allow subsystems (or PM domains) to check the runtime PM status of
devices during system suspend (possibly to avoid resuming those
devices upfront at that time).
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
---
drivers/base/power/runtime.c | 28 ++++++++++++++++++++++++++++
include/linux/pm_runtime.h | 2 ++
2 files changed, 30 insertions(+)
Index: linux-pm/include/linux/pm_runtime.h
===================================================================
--- linux-pm.orig/include/linux/pm_runtime.h
+++ linux-pm/include/linux/pm_runtime.h
@@ -53,6 +53,7 @@ extern unsigned long pm_runtime_autosusp
extern void pm_runtime_update_max_time_suspended(struct device *dev,
s64 delta_ns);
extern void pm_runtime_set_memalloc_noio(struct device *dev, bool enable);
+extern bool pm_runtime_enabled_and_suspended(struct device *dev);
static inline bool pm_children_suspended(struct device *dev)
{
@@ -161,6 +162,7 @@ static inline unsigned long pm_runtime_a
struct device *dev) { return 0; }
static inline void pm_runtime_set_memalloc_noio(struct device *dev,
bool enable){}
+static inline bool pm_runtime_enabled_and_suspended(struct device *dev) { return false; }
#endif /* !CONFIG_PM_RUNTIME */
Index: linux-pm/drivers/base/power/runtime.c
===================================================================
--- linux-pm.orig/drivers/base/power/runtime.c
+++ linux-pm/drivers/base/power/runtime.c
@@ -1194,6 +1194,34 @@ void pm_runtime_enable(struct device *de
EXPORT_SYMBOL_GPL(pm_runtime_enable);
/**
+ * pm_runtime_enabled_and_suspended - Check runtime PM status of a device.
+ * @dev: Device to handle.
+ *
+ * This routine is to be executed during system suspend only, after
+ * device_prepare() has been executed for @dev.
+ *
+ * Return false if runtime PM is disabled for the device. Otherwise, wait
+ * for pending transitions to complete and check the runtime PM status of the
+ * device after that. Return true if it is RPM_SUSPENDED.
+ */
+bool pm_runtime_enabled_and_suspended(struct device *dev)
+{
+ unsigned long flags;
+ bool ret;
+
+ spin_lock_irqsave(&dev->power.lock, flags);
+ if (dev->power.disable_depth) {
+ ret = false;
+ } else {
+ __pm_runtime_barrier(dev);
+ ret = pm_runtime_status_suspended(dev);
+ }
+ spin_unlock_irqrestore(&dev->power.lock, flags);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(pm_runtime_enabled_and_suspended);
+
+/**
* pm_runtime_forbid - Block runtime PM of a device.
* @dev: Device to handle.
*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists