| From 7f53f19b45ca9ad725dac3799f7b79312e8a1936 Mon Sep 17 00:00:00 2001 |
| From: "Rafael J. Wysocki" <rjw@sisk.pl> |
| Date: Thu, 25 Aug 2011 15:34:12 +0200 |
| Subject: PM / Domains: Use power.sybsys_data to reduce overhead |
| |
| Currently pm_genpd_runtime_resume() has to walk the list of devices |
| from the device's PM domain to find the corresponding device list |
| object containing the need_restore field to check if the driver's |
| .runtime_resume() callback should be executed for the device. |
| This is suboptimal and can be simplified by using power.sybsys_data |
| to store device information used by the generic PM domains code. |
| |
| Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> |
| (cherry picked from commit 4605ab653c1f9d7cc2dda8033de215c9cee325f4) |
| |
| Conflicts: |
| |
| arch/arm/mach-shmobile/pm-sh7372.c |
| arch/arm/mach-shmobile/pm_runtime.c |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| arch/arm/mach-omap1/pm_bus.c | 1 + |
| arch/arm/mach-shmobile/board-ap4evb.c | 1 + |
| arch/arm/mach-shmobile/board-mackerel.c | 2 +- |
| arch/arm/mach-shmobile/pm-sh7372.c | 1 + |
| arch/arm/mach-shmobile/pm_runtime.c | 1 + |
| drivers/base/power/clock_ops.c | 2 +- |
| drivers/base/power/common.c | 3 +- |
| drivers/base/power/domain.c | 87 +++++++++++-------------------- |
| include/linux/pm.h | 9 ++++ |
| include/linux/pm_clock.h | 71 +++++++++++++++++++++++++ |
| include/linux/pm_domain.h | 6 --- |
| include/linux/pm_runtime.h | 46 ---------------- |
| 12 files changed, 117 insertions(+), 113 deletions(-) |
| create mode 100644 include/linux/pm_clock.h |
| |
| diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c |
| index 943072d..7868e75 100644 |
| --- a/arch/arm/mach-omap1/pm_bus.c |
| +++ b/arch/arm/mach-omap1/pm_bus.c |
| @@ -13,6 +13,7 @@ |
| #include <linux/kernel.h> |
| #include <linux/io.h> |
| #include <linux/pm_runtime.h> |
| +#include <linux/pm_clock.h> |
| #include <linux/platform_device.h> |
| #include <linux/mutex.h> |
| #include <linux/clk.h> |
| diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c |
| index 629b0f4..3cbf5bf 100644 |
| --- a/arch/arm/mach-shmobile/board-ap4evb.c |
| +++ b/arch/arm/mach-shmobile/board-ap4evb.c |
| @@ -42,6 +42,7 @@ |
| #include <linux/leds.h> |
| #include <linux/input/sh_keysc.h> |
| #include <linux/usb/r8a66597.h> |
| +#include <linux/pm_clock.h> |
| |
| #include <media/sh_mobile_ceu.h> |
| #include <media/sh_mobile_csi2.h> |
| diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c |
| index 6d4bc29..70eca5a 100644 |
| --- a/arch/arm/mach-shmobile/board-mackerel.c |
| +++ b/arch/arm/mach-shmobile/board-mackerel.c |
| @@ -39,7 +39,7 @@ |
| #include <linux/mtd/mtd.h> |
| #include <linux/mtd/partitions.h> |
| #include <linux/mtd/physmap.h> |
| -#include <linux/pm_runtime.h> |
| +#include <linux/pm_clock.h> |
| #include <linux/smsc911x.h> |
| #include <linux/sh_intc.h> |
| #include <linux/tca6416_keypad.h> |
| diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c |
| index b516069..3019ce9 100644 |
| --- a/arch/arm/mach-shmobile/pm-sh7372.c |
| +++ b/arch/arm/mach-shmobile/pm-sh7372.c |
| @@ -15,6 +15,7 @@ |
| #include <linux/list.h> |
| #include <linux/err.h> |
| #include <linux/slab.h> |
| +#include <linux/pm_clock.h> |
| #include <asm/system.h> |
| #include <asm/io.h> |
| #include <asm/tlbflush.h> |
| diff --git a/arch/arm/mach-shmobile/pm_runtime.c b/arch/arm/mach-shmobile/pm_runtime.c |
| index 2bcde1c..27ddf43 100644 |
| --- a/arch/arm/mach-shmobile/pm_runtime.c |
| +++ b/arch/arm/mach-shmobile/pm_runtime.c |
| @@ -14,6 +14,7 @@ |
| #include <linux/kernel.h> |
| #include <linux/io.h> |
| #include <linux/pm_runtime.h> |
| +#include <linux/pm_clock.h> |
| #include <linux/platform_device.h> |
| #include <linux/clk.h> |
| #include <linux/sh_clk.h> |
| diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c |
| index 8383e24..cb44b58 100644 |
| --- a/drivers/base/power/clock_ops.c |
| +++ b/drivers/base/power/clock_ops.c |
| @@ -10,7 +10,7 @@ |
| #include <linux/kernel.h> |
| #include <linux/io.h> |
| #include <linux/pm.h> |
| -#include <linux/pm_runtime.h> |
| +#include <linux/pm_clock.h> |
| #include <linux/clk.h> |
| #include <linux/slab.h> |
| #include <linux/err.h> |
| diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c |
| index d398cf0..29820c3 100644 |
| --- a/drivers/base/power/common.c |
| +++ b/drivers/base/power/common.c |
| @@ -10,8 +10,7 @@ |
| #include <linux/kernel.h> |
| #include <linux/module.h> |
| #include <linux/slab.h> |
| -#include <linux/device.h> |
| -#include <linux/pm_runtime.h> |
| +#include <linux/pm_clock.h> |
| |
| /** |
| * dev_pm_get_subsys_data - Create or refcount power.subsys_data for device. |
| diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c |
| index 1fc6cc9..339eb2d 100644 |
| --- a/drivers/base/power/domain.c |
| +++ b/drivers/base/power/domain.c |
| @@ -181,18 +181,18 @@ int pm_genpd_poweron(struct generic_pm_domain *genpd) |
| |
| /** |
| * __pm_genpd_save_device - Save the pre-suspend state of a device. |
| - * @dle: Device list entry of the device to save the state of. |
| + * @pdd: Domain data of the device to save the state of. |
| * @genpd: PM domain the device belongs to. |
| */ |
| -static int __pm_genpd_save_device(struct dev_list_entry *dle, |
| +static int __pm_genpd_save_device(struct pm_domain_data *pdd, |
| struct generic_pm_domain *genpd) |
| __releases(&genpd->lock) __acquires(&genpd->lock) |
| { |
| - struct device *dev = dle->dev; |
| + struct device *dev = pdd->dev; |
| struct device_driver *drv = dev->driver; |
| int ret = 0; |
| |
| - if (dle->need_restore) |
| + if (pdd->need_restore) |
| return 0; |
| |
| mutex_unlock(&genpd->lock); |
| @@ -210,24 +210,24 @@ static int __pm_genpd_save_device(struct dev_list_entry *dle, |
| mutex_lock(&genpd->lock); |
| |
| if (!ret) |
| - dle->need_restore = true; |
| + pdd->need_restore = true; |
| |
| return ret; |
| } |
| |
| /** |
| * __pm_genpd_restore_device - Restore the pre-suspend state of a device. |
| - * @dle: Device list entry of the device to restore the state of. |
| + * @pdd: Domain data of the device to restore the state of. |
| * @genpd: PM domain the device belongs to. |
| */ |
| -static void __pm_genpd_restore_device(struct dev_list_entry *dle, |
| +static void __pm_genpd_restore_device(struct pm_domain_data *pdd, |
| struct generic_pm_domain *genpd) |
| __releases(&genpd->lock) __acquires(&genpd->lock) |
| { |
| - struct device *dev = dle->dev; |
| + struct device *dev = pdd->dev; |
| struct device_driver *drv = dev->driver; |
| |
| - if (!dle->need_restore) |
| + if (!pdd->need_restore) |
| return; |
| |
| mutex_unlock(&genpd->lock); |
| @@ -244,7 +244,7 @@ static void __pm_genpd_restore_device(struct dev_list_entry *dle, |
| |
| mutex_lock(&genpd->lock); |
| |
| - dle->need_restore = false; |
| + pdd->need_restore = false; |
| } |
| |
| /** |
| @@ -286,7 +286,7 @@ void genpd_queue_power_off_work(struct generic_pm_domain *genpd) |
| static int pm_genpd_poweroff(struct generic_pm_domain *genpd) |
| __releases(&genpd->lock) __acquires(&genpd->lock) |
| { |
| - struct dev_list_entry *dle; |
| + struct pm_domain_data *pdd; |
| struct gpd_link *link; |
| unsigned int not_suspended; |
| int ret = 0; |
| @@ -308,8 +308,8 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd) |
| return -EBUSY; |
| |
| not_suspended = 0; |
| - list_for_each_entry(dle, &genpd->dev_list, node) |
| - if (dle->dev->driver && !pm_runtime_suspended(dle->dev)) |
| + list_for_each_entry(pdd, &genpd->dev_list, list_node) |
| + if (pdd->dev->driver && !pm_runtime_suspended(pdd->dev)) |
| not_suspended++; |
| |
| if (not_suspended > genpd->in_progress) |
| @@ -332,9 +332,9 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd) |
| genpd->status = GPD_STATE_BUSY; |
| genpd->poweroff_task = current; |
| |
| - list_for_each_entry_reverse(dle, &genpd->dev_list, node) { |
| + list_for_each_entry_reverse(pdd, &genpd->dev_list, list_node) { |
| ret = atomic_read(&genpd->sd_count) == 0 ? |
| - __pm_genpd_save_device(dle, genpd) : -EBUSY; |
| + __pm_genpd_save_device(pdd, genpd) : -EBUSY; |
| |
| if (genpd_abort_poweroff(genpd)) |
| goto out; |
| @@ -433,24 +433,6 @@ static int pm_genpd_runtime_suspend(struct device *dev) |
| } |
| |
| /** |
| - * __pm_genpd_runtime_resume - Resume a device belonging to I/O PM domain. |
| - * @dev: Device to resume. |
| - * @genpd: PM domain the device belongs to. |
| - */ |
| -static void __pm_genpd_runtime_resume(struct device *dev, |
| - struct generic_pm_domain *genpd) |
| -{ |
| - struct dev_list_entry *dle; |
| - |
| - list_for_each_entry(dle, &genpd->dev_list, node) { |
| - if (dle->dev == dev) { |
| - __pm_genpd_restore_device(dle, genpd); |
| - break; |
| - } |
| - } |
| -} |
| - |
| -/** |
| * pm_genpd_runtime_resume - Resume a device belonging to I/O PM domain. |
| * @dev: Device to resume. |
| * |
| @@ -495,7 +477,7 @@ static int pm_genpd_runtime_resume(struct device *dev) |
| mutex_lock(&genpd->lock); |
| } |
| finish_wait(&genpd->status_wait_queue, &wait); |
| - __pm_genpd_runtime_resume(dev, genpd); |
| + __pm_genpd_restore_device(&dev->power.subsys_data->domain_data, genpd); |
| genpd->resume_count--; |
| genpd_set_active(genpd); |
| wake_up_all(&genpd->status_wait_queue); |
| @@ -525,8 +507,6 @@ void pm_genpd_poweroff_unused(void) |
| #else |
| |
| static inline void genpd_power_off_work_fn(struct work_struct *work) {} |
| -static inline void __pm_genpd_runtime_resume(struct device *dev, |
| - struct generic_pm_domain *genpd) {} |
| |
| #define pm_genpd_runtime_suspend NULL |
| #define pm_genpd_runtime_resume NULL |
| @@ -1083,7 +1063,7 @@ static void pm_genpd_complete(struct device *dev) |
| */ |
| int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) |
| { |
| - struct dev_list_entry *dle; |
| + struct pm_domain_data *pdd; |
| int ret = 0; |
| |
| dev_dbg(dev, "%s()\n", __func__); |
| @@ -1103,26 +1083,20 @@ int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) |
| goto out; |
| } |
| |
| - list_for_each_entry(dle, &genpd->dev_list, node) |
| - if (dle->dev == dev) { |
| + list_for_each_entry(pdd, &genpd->dev_list, list_node) |
| + if (pdd->dev == dev) { |
| ret = -EINVAL; |
| goto out; |
| } |
| |
| - dle = kzalloc(sizeof(*dle), GFP_KERNEL); |
| - if (!dle) { |
| - ret = -ENOMEM; |
| - goto out; |
| - } |
| - |
| - dle->dev = dev; |
| - dle->need_restore = false; |
| - list_add_tail(&dle->node, &genpd->dev_list); |
| genpd->device_count++; |
| |
| - spin_lock_irq(&dev->power.lock); |
| dev->pm_domain = &genpd->domain; |
| - spin_unlock_irq(&dev->power.lock); |
| + dev_pm_get_subsys_data(dev); |
| + pdd = &dev->power.subsys_data->domain_data; |
| + pdd->dev = dev; |
| + pdd->need_restore = false; |
| + list_add_tail(&pdd->list_node, &genpd->dev_list); |
| |
| out: |
| genpd_release_lock(genpd); |
| @@ -1138,7 +1112,7 @@ int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) |
| int pm_genpd_remove_device(struct generic_pm_domain *genpd, |
| struct device *dev) |
| { |
| - struct dev_list_entry *dle; |
| + struct pm_domain_data *pdd; |
| int ret = -EINVAL; |
| |
| dev_dbg(dev, "%s()\n", __func__); |
| @@ -1153,17 +1127,16 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd, |
| goto out; |
| } |
| |
| - list_for_each_entry(dle, &genpd->dev_list, node) { |
| - if (dle->dev != dev) |
| + list_for_each_entry(pdd, &genpd->dev_list, list_node) { |
| + if (pdd->dev != dev) |
| continue; |
| |
| - spin_lock_irq(&dev->power.lock); |
| + list_del_init(&pdd->list_node); |
| + pdd->dev = NULL; |
| + dev_pm_put_subsys_data(dev); |
| dev->pm_domain = NULL; |
| - spin_unlock_irq(&dev->power.lock); |
| |
| genpd->device_count--; |
| - list_del(&dle->node); |
| - kfree(dle); |
| |
| ret = 0; |
| break; |
| diff --git a/include/linux/pm.h b/include/linux/pm.h |
| index 5b9b36f..b17b6aa 100644 |
| --- a/include/linux/pm.h |
| +++ b/include/linux/pm.h |
| @@ -423,12 +423,21 @@ enum rpm_request { |
| |
| struct wakeup_source; |
| |
| +struct pm_domain_data { |
| + struct list_head list_node; |
| + struct device *dev; |
| + bool need_restore; |
| +}; |
| + |
| struct pm_subsys_data { |
| spinlock_t lock; |
| unsigned int refcount; |
| #ifdef CONFIG_PM_CLK |
| struct list_head clock_list; |
| #endif |
| +#ifdef CONFIG_PM_GENERIC_DOMAINS |
| + struct pm_domain_data domain_data; |
| +#endif |
| }; |
| |
| struct dev_pm_info { |
| diff --git a/include/linux/pm_clock.h b/include/linux/pm_clock.h |
| new file mode 100644 |
| index 0000000..8348866 |
| --- /dev/null |
| +++ b/include/linux/pm_clock.h |
| @@ -0,0 +1,71 @@ |
| +/* |
| + * pm_clock.h - Definitions and headers related to device clocks. |
| + * |
| + * Copyright (C) 2011 Rafael J. Wysocki <rjw@sisk.pl>, Renesas Electronics Corp. |
| + * |
| + * This file is released under the GPLv2. |
| + */ |
| + |
| +#ifndef _LINUX_PM_CLOCK_H |
| +#define _LINUX_PM_CLOCK_H |
| + |
| +#include <linux/device.h> |
| +#include <linux/notifier.h> |
| + |
| +struct pm_clk_notifier_block { |
| + struct notifier_block nb; |
| + struct dev_pm_domain *pm_domain; |
| + char *con_ids[]; |
| +}; |
| + |
| +#ifdef CONFIG_PM_CLK |
| +static inline bool pm_clk_no_clocks(struct device *dev) |
| +{ |
| + return dev && dev->power.subsys_data |
| + && list_empty(&dev->power.subsys_data->clock_list); |
| +} |
| + |
| +extern void pm_clk_init(struct device *dev); |
| +extern int pm_clk_create(struct device *dev); |
| +extern void pm_clk_destroy(struct device *dev); |
| +extern int pm_clk_add(struct device *dev, const char *con_id); |
| +extern void pm_clk_remove(struct device *dev, const char *con_id); |
| +extern int pm_clk_suspend(struct device *dev); |
| +extern int pm_clk_resume(struct device *dev); |
| +#else |
| +static inline bool pm_clk_no_clocks(struct device *dev) |
| +{ |
| + return true; |
| +} |
| +static inline void pm_clk_init(struct device *dev) |
| +{ |
| +} |
| +static inline int pm_clk_create(struct device *dev) |
| +{ |
| + return -EINVAL; |
| +} |
| +static inline void pm_clk_destroy(struct device *dev) |
| +{ |
| +} |
| +static inline int pm_clk_add(struct device *dev, const char *con_id) |
| +{ |
| + return -EINVAL; |
| +} |
| +static inline void pm_clk_remove(struct device *dev, const char *con_id) |
| +{ |
| +} |
| +#define pm_clk_suspend NULL |
| +#define pm_clk_resume NULL |
| +#endif |
| + |
| +#ifdef CONFIG_HAVE_CLK |
| +extern void pm_clk_add_notifier(struct bus_type *bus, |
| + struct pm_clk_notifier_block *clknb); |
| +#else |
| +static inline void pm_clk_add_notifier(struct bus_type *bus, |
| + struct pm_clk_notifier_block *clknb) |
| +{ |
| +} |
| +#endif |
| + |
| +#endif |
| diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h |
| index bf679f5..5cce46c 100644 |
| --- a/include/linux/pm_domain.h |
| +++ b/include/linux/pm_domain.h |
| @@ -61,12 +61,6 @@ struct gpd_link { |
| struct list_head slave_node; |
| }; |
| |
| -struct dev_list_entry { |
| - struct list_head node; |
| - struct device *dev; |
| - bool need_restore; |
| -}; |
| - |
| #ifdef CONFIG_PM_GENERIC_DOMAINS |
| extern int pm_genpd_add_device(struct generic_pm_domain *genpd, |
| struct device *dev); |
| diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h |
| index 6b90630e..70b2840 100644 |
| --- a/include/linux/pm_runtime.h |
| +++ b/include/linux/pm_runtime.h |
| @@ -251,50 +251,4 @@ static inline void pm_runtime_dont_use_autosuspend(struct device *dev) |
| __pm_runtime_use_autosuspend(dev, false); |
| } |
| |
| -struct pm_clk_notifier_block { |
| - struct notifier_block nb; |
| - struct dev_pm_domain *pm_domain; |
| - char *con_ids[]; |
| -}; |
| - |
| -#ifdef CONFIG_PM_CLK |
| -extern void pm_clk_init(struct device *dev); |
| -extern int pm_clk_create(struct device *dev); |
| -extern void pm_clk_destroy(struct device *dev); |
| -extern int pm_clk_add(struct device *dev, const char *con_id); |
| -extern void pm_clk_remove(struct device *dev, const char *con_id); |
| -extern int pm_clk_suspend(struct device *dev); |
| -extern int pm_clk_resume(struct device *dev); |
| -#else |
| -static inline void pm_clk_init(struct device *dev) |
| -{ |
| -} |
| -static inline int pm_clk_create(struct device *dev) |
| -{ |
| - return -EINVAL; |
| -} |
| -static inline void pm_clk_destroy(struct device *dev) |
| -{ |
| -} |
| -static inline int pm_clk_add(struct device *dev, const char *con_id) |
| -{ |
| - return -EINVAL; |
| -} |
| -static inline void pm_clk_remove(struct device *dev, const char *con_id) |
| -{ |
| -} |
| -#define pm_clk_suspend NULL |
| -#define pm_clk_resume NULL |
| -#endif |
| - |
| -#ifdef CONFIG_HAVE_CLK |
| -extern void pm_clk_add_notifier(struct bus_type *bus, |
| - struct pm_clk_notifier_block *clknb); |
| -#else |
| -static inline void pm_clk_add_notifier(struct bus_type *bus, |
| - struct pm_clk_notifier_block *clknb) |
| -{ |
| -} |
| -#endif |
| - |
| #endif |
| -- |
| 1.7.10.1.362.g242cab3 |
| |