From: "Rafael J. Wysocki" <rjw@sisk.pl> To: Linux PM list <linux-pm@vger.kernel.org> Cc: LKML <linux-kernel@vger.kernel.org>, Linux-sh list <linux-sh@vger.kernel.org>, Magnus Damm <magnus.damm@gmail.com>, Paul Mundt <lethal@linux-sh.org>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH 8/15] PM / Runtime: Allow helpers to be called by early platform drivers Date: Sun, 05 Aug 2012 23:45:11 +0000 [thread overview] Message-ID: <201208060145.11549.rjw@sisk.pl> (raw) In-Reply-To: <201208060138.03950.rjw@sisk.pl> Runtime PM helper functions, like pm_runtime_get_sync(), cannot be called by early platform device drivers, because the devices' power management locks are not initialized at that time. This is quite inconvenient, so modify early_platform_add_devices() to initialize the devices power management locks as appropriate and make sure that they won't be initialized more than once if an early platform device is going to be used as a regular one later. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> --- drivers/base/platform.c | 2 ++ drivers/base/power/power.h | 18 ++++++++++++++++-- include/linux/pm.h | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) Index: linux/drivers/base/power/power.h =================================--- linux.orig/drivers/base/power/power.h +++ linux/drivers/base/power/power.h @@ -2,17 +2,31 @@ static inline void device_pm_init_common(struct device *dev) { - spin_lock_init(&dev->power.lock); - dev->power.power_state = PMSG_INVALID; + if (!dev->power.early_init) { + spin_lock_init(&dev->power.lock); + dev->power.power_state = PMSG_INVALID; + dev->power.early_init = true; + } } #ifdef CONFIG_PM_RUNTIME +static inline void pm_runtime_early_init(struct device *dev) +{ + dev->power.disable_depth = 1; + device_pm_init_common(dev); +} + extern void pm_runtime_init(struct device *dev); extern void pm_runtime_remove(struct device *dev); #else /* !CONFIG_PM_RUNTIME */ +static inline void pm_runtime_early_init(struct device *dev) +{ + device_pm_init_common(dev); +} + static inline void pm_runtime_init(struct device *dev) {} static inline void pm_runtime_remove(struct device *dev) {} Index: linux/include/linux/pm.h =================================--- linux.orig/include/linux/pm.h +++ linux/include/linux/pm.h @@ -510,6 +510,7 @@ struct dev_pm_info { bool is_prepared:1; /* Owned by the PM core */ bool is_suspended:1; /* Ditto */ bool ignore_children:1; + bool early_init:1; /* Owned by the PM core */ spinlock_t lock; #ifdef CONFIG_PM_SLEEP struct list_head entry; Index: linux/drivers/base/platform.c =================================--- linux.orig/drivers/base/platform.c +++ linux/drivers/base/platform.c @@ -22,6 +22,7 @@ #include <linux/pm_runtime.h> #include "base.h" +#include "power/power.h" #define to_platform_driver(drv) (container_of((drv), struct platform_driver, \ driver)) @@ -948,6 +949,7 @@ void __init early_platform_add_devices(s dev = &devs[i]->dev; if (!dev->devres_head.next) { + pm_runtime_early_init(dev); INIT_LIST_HEAD(&dev->devres_head); list_add_tail(&dev->devres_head, &early_platform_device_list);
WARNING: multiple messages have this Message-ID (diff)
From: "Rafael J. Wysocki" <rjw@sisk.pl> To: Linux PM list <linux-pm@vger.kernel.org> Cc: LKML <linux-kernel@vger.kernel.org>, "Linux-sh list" <linux-sh@vger.kernel.org>, Magnus Damm <magnus.damm@gmail.com>, Paul Mundt <lethal@linux-sh.org>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH 8/15] PM / Runtime: Allow helpers to be called by early platform drivers Date: Mon, 6 Aug 2012 01:45:11 +0200 [thread overview] Message-ID: <201208060145.11549.rjw@sisk.pl> (raw) In-Reply-To: <201208060138.03950.rjw@sisk.pl> Runtime PM helper functions, like pm_runtime_get_sync(), cannot be called by early platform device drivers, because the devices' power management locks are not initialized at that time. This is quite inconvenient, so modify early_platform_add_devices() to initialize the devices power management locks as appropriate and make sure that they won't be initialized more than once if an early platform device is going to be used as a regular one later. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> --- drivers/base/platform.c | 2 ++ drivers/base/power/power.h | 18 ++++++++++++++++-- include/linux/pm.h | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) Index: linux/drivers/base/power/power.h =================================================================== --- linux.orig/drivers/base/power/power.h +++ linux/drivers/base/power/power.h @@ -2,17 +2,31 @@ static inline void device_pm_init_common(struct device *dev) { - spin_lock_init(&dev->power.lock); - dev->power.power_state = PMSG_INVALID; + if (!dev->power.early_init) { + spin_lock_init(&dev->power.lock); + dev->power.power_state = PMSG_INVALID; + dev->power.early_init = true; + } } #ifdef CONFIG_PM_RUNTIME +static inline void pm_runtime_early_init(struct device *dev) +{ + dev->power.disable_depth = 1; + device_pm_init_common(dev); +} + extern void pm_runtime_init(struct device *dev); extern void pm_runtime_remove(struct device *dev); #else /* !CONFIG_PM_RUNTIME */ +static inline void pm_runtime_early_init(struct device *dev) +{ + device_pm_init_common(dev); +} + static inline void pm_runtime_init(struct device *dev) {} static inline void pm_runtime_remove(struct device *dev) {} Index: linux/include/linux/pm.h =================================================================== --- linux.orig/include/linux/pm.h +++ linux/include/linux/pm.h @@ -510,6 +510,7 @@ struct dev_pm_info { bool is_prepared:1; /* Owned by the PM core */ bool is_suspended:1; /* Ditto */ bool ignore_children:1; + bool early_init:1; /* Owned by the PM core */ spinlock_t lock; #ifdef CONFIG_PM_SLEEP struct list_head entry; Index: linux/drivers/base/platform.c =================================================================== --- linux.orig/drivers/base/platform.c +++ linux/drivers/base/platform.c @@ -22,6 +22,7 @@ #include <linux/pm_runtime.h> #include "base.h" +#include "power/power.h" #define to_platform_driver(drv) (container_of((drv), struct platform_driver, \ driver)) @@ -948,6 +949,7 @@ void __init early_platform_add_devices(s dev = &devs[i]->dev; if (!dev->devres_head.next) { + pm_runtime_early_init(dev); INIT_LIST_HEAD(&dev->devres_head); list_add_tail(&dev->devres_head, &early_platform_device_list);
next prev parent reply other threads:[~2012-08-05 23:45 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-07-29 14:12 [RFC][PATCH 0/6] PM: Suspend/resume for clock sources/clock event devices in PM domains Rafael J. Wysocki 2012-07-29 14:12 ` Rafael J. Wysocki 2012-07-29 14:13 ` [RFC][PATCH 1/6] PM / Domains: Introduce simplified power on routine for system resume Rafael J. Wysocki 2012-07-29 14:13 ` Rafael J. Wysocki 2012-07-29 14:14 ` [RFC][PATCH 2/6] PM / Domains: Add power off/on function for system core suspend stage Rafael J. Wysocki 2012-07-29 14:14 ` Rafael J. Wysocki 2012-07-29 14:15 ` [RFC][PATCH 3/6] timekeeping: Add suspend and resume of clock event devices Rafael J. Wysocki 2012-07-29 14:15 ` Rafael J. Wysocki 2012-07-29 14:16 ` [RFC][PATCH 4/6] sh: TMU: Introduce clocksource/clock events suspend/resume routines Rafael J. Wysocki 2012-07-29 14:16 ` Rafael J. Wysocki 2012-07-29 14:16 ` [RFC][PATCH 5/6] sh: CMT: " Rafael J. Wysocki 2012-07-29 14:16 ` Rafael J. Wysocki 2012-07-29 14:17 ` [RFC][PATCH 6/6] sh: MTU2: Introduce clock " Rafael J. Wysocki 2012-07-29 14:17 ` Rafael J. Wysocki 2012-08-05 23:38 ` [PATCH 0/15] PM: Suspend/resume and runtime PM for clock sources/clock event devices in PM domains Rafael J. Wysocki 2012-08-05 23:38 ` Rafael J. Wysocki 2012-08-05 23:39 ` [PATCH 1/15] PM / Domains: Introduce simplified power on routine for system resume Rafael J. Wysocki 2012-08-05 23:39 ` Rafael J. Wysocki 2012-08-05 23:39 ` [PATCH 2/15] PM / Domains: Add power off/on function for system core suspend stage Rafael J. Wysocki 2012-08-05 23:39 ` Rafael J. Wysocki 2012-08-05 23:40 ` [PATCH 3/15] timekeeping: Add suspend and resume of clock event devices Rafael J. Wysocki 2012-08-05 23:40 ` Rafael J. Wysocki 2012-08-05 23:41 ` [PATCH 4/15] sh: TMU: Introduce clocksource/clock events suspend/resume routines Rafael J. Wysocki 2012-08-05 23:41 ` Rafael J. Wysocki 2012-08-05 23:43 ` [PATCH 5/15] sh: CMT: " Rafael J. Wysocki 2012-08-05 23:43 ` Rafael J. Wysocki 2012-08-05 23:43 ` [PATCH 6/15] sh: MTU2: Introduce clock " Rafael J. Wysocki 2012-08-05 23:43 ` Rafael J. Wysocki 2012-08-05 23:44 ` [PATCH 7/15] PM: Reorganize device PM initialization Rafael J. Wysocki 2012-08-05 23:44 ` Rafael J. Wysocki 2012-08-05 23:45 ` Rafael J. Wysocki [this message] 2012-08-05 23:45 ` [PATCH 8/15] PM / Runtime: Allow helpers to be called by early platform drivers Rafael J. Wysocki 2012-08-05 23:45 ` [PATCH 9/15] PM / Domains: Rename the always_on device flag to syscore Rafael J. Wysocki 2012-08-05 23:45 ` Rafael J. Wysocki 2012-08-05 23:46 ` [PATCH 10/15] PM / Domains: Move syscore flag from subsys data to struct device Rafael J. Wysocki 2012-08-05 23:46 ` Rafael J. Wysocki 2012-08-05 23:47 ` [PATCH 11/15] PM / Domains: Do not measure start time for "irq safe" devices Rafael J. Wysocki 2012-08-05 23:47 ` Rafael J. Wysocki 2012-08-05 23:48 ` [PATCH 12/15] sh: TMU: Basic runtime PM support Rafael J. Wysocki 2012-08-05 23:48 ` Rafael J. Wysocki 2012-08-05 23:48 ` [PATCH 13/15] sh: CMT: " Rafael J. Wysocki 2012-08-05 23:48 ` Rafael J. Wysocki 2012-08-05 23:49 ` [PATCH 14/15] sh: MTU2: " Rafael J. Wysocki 2012-08-05 23:49 ` Rafael J. Wysocki 2012-08-11 9:39 ` Geert Uytterhoeven 2012-08-11 9:39 ` Geert Uytterhoeven 2012-08-11 22:29 ` Rafael J. Wysocki 2012-08-11 22:29 ` Rafael J. Wysocki 2012-08-05 23:53 ` [PATCH 15/15] PM: Do not use the syscore flag for runtime PM Rafael J. Wysocki 2012-08-05 23:53 ` Rafael J. Wysocki
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=201208060145.11549.rjw@sisk.pl \ --to=rjw@sisk.pl \ --cc=lethal@linux-sh.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=magnus.damm@gmail.com \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.