UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PM / Domains: Rename struct dev_power_domain to struct dev_pm_domain 

The naming convention used by commit 7538e3db6e015e890825fbd9f86599b
(PM: Add support for device power domains), which introduced the
struct dev_power_domain type for representing device power domains,
evidently confuses some developers who tend to think that objects
of this type must correspond to "power domains" as defined by
hardware, which is not the case.  Namely, at the kernel level, a
struct dev_power_domain object can represent arbitrary set of devices
that are mutually dependent power management-wise and need not belong
to one hardware power domain.  To avoid that confusion, rename struct
dev_power_domain to struct dev_pm_domain and rename the related
pointers in struct device and struct pm_clk_notifier_block from
pwr_domain to pm_domain.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
Rafael J. Wysocki 2011-06-23 01:52:55 +02:00
parent f5da24dbed
commit 564b905ab1
11 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/power/devices.txt
View File

@ -506,8 +506,8 @@ routines. Nevertheless, different callback pointers are used in case there is a
situation where it actually matters. situation where it actually matters.
Device Power Domains Device Power Management Domains
-------------------- -------------------------------
Sometimes devices share reference clocks or other power resources. In those Sometimes devices share reference clocks or other power resources. In those
cases it generally is not possible to put devices into low-power states cases it generally is not possible to put devices into low-power states
individually. Instead, a set of devices sharing a power resource can be put individually. Instead, a set of devices sharing a power resource can be put
@ -516,8 +516,8 @@ power resource. Of course, they also need to be put into the full-power state
together, by turning the shared power resource on. A set of devices with this together, by turning the shared power resource on. A set of devices with this
property is often referred to as a power domain. property is often referred to as a power domain.
Support for power domains is provided through the pwr_domain field of struct Support for power domains is provided through the pm_domain field of struct
device. This field is a pointer to an object of type struct dev_power_domain, device. This field is a pointer to an object of type struct dev_pm_domain,
defined in include/linux/pm.h, providing a set of power management callbacks defined in include/linux/pm.h, providing a set of power management callbacks
analogous to the subsystem-level and device driver callbacks that are executed analogous to the subsystem-level and device driver callbacks that are executed
for the given device during all power transitions, instead of the respective for the given device during all power transitions, instead of the respective

8
arch/arm/mach-omap1/pm_bus.c
View File

@ -49,20 +49,20 @@ static int omap1_pm_runtime_resume(struct device *dev)
return pm_generic_runtime_resume(dev); return pm_generic_runtime_resume(dev);
} }
static struct dev_power_domain default_power_domain = { static struct dev_pm_domain default_pm_domain = {
.ops = { .ops = {
.runtime_suspend = omap1_pm_runtime_suspend, .runtime_suspend = omap1_pm_runtime_suspend,
.runtime_resume = omap1_pm_runtime_resume, .runtime_resume = omap1_pm_runtime_resume,
USE_PLATFORM_PM_SLEEP_OPS USE_PLATFORM_PM_SLEEP_OPS
}, },
}; };
#define OMAP1_PWR_DOMAIN (&default_power_domain) #define OMAP1_PM_DOMAIN (&default_pm_domain)
#else #else
#define OMAP1_PWR_DOMAIN NULL #define OMAP1_PM_DOMAIN NULL
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM_RUNTIME */
static struct pm_clk_notifier_block platform_bus_notifier = { static struct pm_clk_notifier_block platform_bus_notifier = {
.pwr_domain = OMAP1_PWR_DOMAIN, .pm_domain = OMAP1_PM_DOMAIN,
.con_ids = { "ick", "fck", NULL, }, .con_ids = { "ick", "fck", NULL, },
}; };

8
arch/arm/mach-shmobile/pm_runtime.c
View File

@ -28,7 +28,7 @@ static int default_platform_runtime_idle(struct device *dev)
return pm_runtime_suspend(dev); return pm_runtime_suspend(dev);
} }
static struct dev_power_domain default_power_domain = { static struct dev_pm_domain default_pm_domain = {
.ops = { .ops = {
.runtime_suspend = pm_runtime_clk_suspend, .runtime_suspend = pm_runtime_clk_suspend,
.runtime_resume = pm_runtime_clk_resume, .runtime_resume = pm_runtime_clk_resume,
@ -37,16 +37,16 @@ static struct dev_power_domain default_power_domain = {
}, },
}; };
#define DEFAULT_PWR_DOMAIN_PTR (&default_power_domain) #define DEFAULT_PM_DOMAIN_PTR (&default_pm_domain)
#else #else
#define DEFAULT_PWR_DOMAIN_PTR NULL #define DEFAULT_PM_DOMAIN_PTR NULL
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM_RUNTIME */
static struct pm_clk_notifier_block platform_bus_notifier = { static struct pm_clk_notifier_block platform_bus_notifier = {
.pwr_domain = DEFAULT_PWR_DOMAIN_PTR, .pm_domain = DEFAULT_PM_DOMAIN_PTR,
.con_ids = { NULL, }, .con_ids = { NULL, },
}; };

4
arch/arm/plat-omap/omap_device.c
View File

@ -564,7 +564,7 @@ static int _od_runtime_resume(struct device *dev)
return pm_generic_runtime_resume(dev); return pm_generic_runtime_resume(dev);
} }
static struct dev_power_domain omap_device_power_domain = { static struct dev_pm_domain omap_device_pm_domain = {
.ops = { .ops = {
.runtime_suspend = _od_runtime_suspend, .runtime_suspend = _od_runtime_suspend,
.runtime_idle = _od_runtime_idle, .runtime_idle = _od_runtime_idle,
@ -586,7 +586,7 @@ int omap_device_register(struct omap_device *od)
pr_debug("omap_device: %s: registering\n", od->pdev.name); pr_debug("omap_device: %s: registering\n", od->pdev.name);
od->pdev.dev.parent = &omap_device_parent; od->pdev.dev.parent = &omap_device_parent;
od->pdev.dev.pwr_domain = &omap_device_power_domain; od->pdev.dev.pm_domain = &omap_device_pm_domain;
return platform_device_register(&od->pdev); return platform_device_register(&od->pdev);
} }

6
arch/sh/kernel/cpu/shmobile/pm_runtime.c
View File

@ -256,7 +256,7 @@ out:
return ret; return ret;
} }
static struct dev_power_domain default_power_domain = { static struct dev_pm_domain default_pm_domain = {
.ops = { .ops = {
.runtime_suspend = default_platform_runtime_suspend, .runtime_suspend = default_platform_runtime_suspend,
.runtime_resume = default_platform_runtime_resume, .runtime_resume = default_platform_runtime_resume,
@ -285,7 +285,7 @@ static int platform_bus_notify(struct notifier_block *nb,
hwblk_disable(hwblk_info, hwblk); hwblk_disable(hwblk_info, hwblk);
/* make sure driver re-inits itself once */ /* make sure driver re-inits itself once */
__set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags); __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags);
dev->pwr_domain = &default_power_domain; dev->pm_domain = &default_pm_domain;
break; break;
/* TODO: add BUS_NOTIFY_BIND_DRIVER and increase idle count */ /* TODO: add BUS_NOTIFY_BIND_DRIVER and increase idle count */
case BUS_NOTIFY_BOUND_DRIVER: case BUS_NOTIFY_BOUND_DRIVER:
@ -299,7 +299,7 @@ static int platform_bus_notify(struct notifier_block *nb,
__set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags); __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags);
break; break;
case BUS_NOTIFY_DEL_DEVICE: case BUS_NOTIFY_DEL_DEVICE:
dev->pwr_domain = NULL; dev->pm_domain = NULL;
break; break;
} }
return 0; return 0;

14
drivers/base/power/clock_ops.c
View File

@ -278,11 +278,11 @@ int pm_runtime_clk_resume(struct device *dev)
* *
* For this function to work, @nb must be a member of an object of type * For this function to work, @nb must be a member of an object of type
* struct pm_clk_notifier_block containing all of the requisite data. * struct pm_clk_notifier_block containing all of the requisite data.
* Specifically, the pwr_domain member of that object is copied to the device's * Specifically, the pm_domain member of that object is copied to the device's
* pwr_domain field and its con_ids member is used to populate the device's list * pm_domain field and its con_ids member is used to populate the device's list
* of runtime PM clocks, depending on @action. * of runtime PM clocks, depending on @action.
* *
* If the device's pwr_domain field is already populated with a value different * If the device's pm_domain field is already populated with a value different
* from the one stored in the struct pm_clk_notifier_block object, the function * from the one stored in the struct pm_clk_notifier_block object, the function
* does nothing. * does nothing.
*/ */
@ -300,14 +300,14 @@ static int pm_runtime_clk_notify(struct notifier_block *nb,
switch (action) { switch (action) {
case BUS_NOTIFY_ADD_DEVICE: case BUS_NOTIFY_ADD_DEVICE:
if (dev->pwr_domain) if (dev->pm_domain)
break; break;
error = pm_runtime_clk_init(dev); error = pm_runtime_clk_init(dev);
if (error) if (error)
break; break;
dev->pwr_domain = clknb->pwr_domain; dev->pm_domain = clknb->pm_domain;
if (clknb->con_ids[0]) { if (clknb->con_ids[0]) {
for (con_id = clknb->con_ids; *con_id; con_id++) for (con_id = clknb->con_ids; *con_id; con_id++)
pm_runtime_clk_add(dev, *con_id); pm_runtime_clk_add(dev, *con_id);
@ -317,10 +317,10 @@ static int pm_runtime_clk_notify(struct notifier_block *nb,
break; break;
case BUS_NOTIFY_DEL_DEVICE: case BUS_NOTIFY_DEL_DEVICE:
if (dev->pwr_domain != clknb->pwr_domain) if (dev->pm_domain != clknb->pm_domain)
break; break;
dev->pwr_domain = NULL; dev->pm_domain = NULL;
pm_runtime_clk_destroy(dev); pm_runtime_clk_destroy(dev);
break; break;
} }

30
drivers/base/power/main.c
View File

@ -425,9 +425,9 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
TRACE_DEVICE(dev); TRACE_DEVICE(dev);
TRACE_RESUME(0); TRACE_RESUME(0);
if (dev->pwr_domain) { if (dev->pm_domain) {
pm_dev_dbg(dev, state, "EARLY power domain "); pm_dev_dbg(dev, state, "EARLY power domain ");
error = pm_noirq_op(dev, &dev->pwr_domain->ops, state); error = pm_noirq_op(dev, &dev->pm_domain->ops, state);
} else if (dev->type && dev->type->pm) { } else if (dev->type && dev->type->pm) {
pm_dev_dbg(dev, state, "EARLY type "); pm_dev_dbg(dev, state, "EARLY type ");
error = pm_noirq_op(dev, dev->type->pm, state); error = pm_noirq_op(dev, dev->type->pm, state);
@ -521,9 +521,9 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
if (!dev->power.is_suspended) if (!dev->power.is_suspended)
goto Unlock; goto Unlock;
if (dev->pwr_domain) { if (dev->pm_domain) {
pm_dev_dbg(dev, state, "power domain "); pm_dev_dbg(dev, state, "power domain ");
error = pm_op(dev, &dev->pwr_domain->ops, state); error = pm_op(dev, &dev->pm_domain->ops, state);
goto End; goto End;
} }
@ -641,10 +641,10 @@ static void device_complete(struct device *dev, pm_message_t state)
{ {
device_lock(dev); device_lock(dev);
if (dev->pwr_domain) { if (dev->pm_domain) {
pm_dev_dbg(dev, state, "completing power domain "); pm_dev_dbg(dev, state, "completing power domain ");
if (dev->pwr_domain->ops.complete) if (dev->pm_domain->ops.complete)
dev->pwr_domain->ops.complete(dev); dev->pm_domain->ops.complete(dev);
} else if (dev->type && dev->type->pm) { } else if (dev->type && dev->type->pm) {
pm_dev_dbg(dev, state, "completing type "); pm_dev_dbg(dev, state, "completing type ");
if (dev->type->pm->complete) if (dev->type->pm->complete)
@ -744,9 +744,9 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
{ {
int error; int error;
if (dev->pwr_domain) { if (dev->pm_domain) {
pm_dev_dbg(dev, state, "LATE power domain "); pm_dev_dbg(dev, state, "LATE power domain ");
error = pm_noirq_op(dev, &dev->pwr_domain->ops, state); error = pm_noirq_op(dev, &dev->pm_domain->ops, state);
if (error) if (error)
return error; return error;
} else if (dev->type && dev->type->pm) { } else if (dev->type && dev->type->pm) {
@ -853,9 +853,9 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
goto Unlock; goto Unlock;
} }
if (dev->pwr_domain) { if (dev->pm_domain) {
pm_dev_dbg(dev, state, "power domain "); pm_dev_dbg(dev, state, "power domain ");
error = pm_op(dev, &dev->pwr_domain->ops, state); error = pm_op(dev, &dev->pm_domain->ops, state);
goto End; goto End;
} }
@ -982,11 +982,11 @@ static int device_prepare(struct device *dev, pm_message_t state)
device_lock(dev); device_lock(dev);
if (dev->pwr_domain) { if (dev->pm_domain) {
pm_dev_dbg(dev, state, "preparing power domain "); pm_dev_dbg(dev, state, "preparing power domain ");
if (dev->pwr_domain->ops.prepare) if (dev->pm_domain->ops.prepare)
error = dev->pwr_domain->ops.prepare(dev); error = dev->pm_domain->ops.prepare(dev);
suspend_report_result(dev->pwr_domain->ops.prepare, error); suspend_report_result(dev->pm_domain->ops.prepare, error);
if (error) if (error)
goto End; goto End;
} else if (dev->type && dev->type->pm) { } else if (dev->type && dev->type->pm) {

12
drivers/base/power/runtime.c
View File

@ -213,8 +213,8 @@ static int rpm_idle(struct device *dev, int rpmflags)
dev->power.idle_notification = true; dev->power.idle_notification = true;
if (dev->pwr_domain) if (dev->pm_domain)
callback = dev->pwr_domain->ops.runtime_idle; callback = dev->pm_domain->ops.runtime_idle;
else if (dev->type && dev->type->pm) else if (dev->type && dev->type->pm)
callback = dev->type->pm->runtime_idle; callback = dev->type->pm->runtime_idle;
else if (dev->class && dev->class->pm) else if (dev->class && dev->class->pm)
@ -374,8 +374,8 @@ static int rpm_suspend(struct device *dev, int rpmflags)
__update_runtime_status(dev, RPM_SUSPENDING); __update_runtime_status(dev, RPM_SUSPENDING);
if (dev->pwr_domain) if (dev->pm_domain)
callback = dev->pwr_domain->ops.runtime_suspend; callback = dev->pm_domain->ops.runtime_suspend;
else if (dev->type && dev->type->pm) else if (dev->type && dev->type->pm)
callback = dev->type->pm->runtime_suspend; callback = dev->type->pm->runtime_suspend;
else if (dev->class && dev->class->pm) else if (dev->class && dev->class->pm)
@ -573,8 +573,8 @@ static int rpm_resume(struct device *dev, int rpmflags)
__update_runtime_status(dev, RPM_RESUMING); __update_runtime_status(dev, RPM_RESUMING);
if (dev->pwr_domain) if (dev->pm_domain)
callback = dev->pwr_domain->ops.runtime_resume; callback = dev->pm_domain->ops.runtime_resume;
else if (dev->type && dev->type->pm) else if (dev->type && dev->type->pm)
callback = dev->type->pm->runtime_resume; callback = dev->type->pm->runtime_resume;
else if (dev->class && dev->class->pm) else if (dev->class && dev->class->pm)

4
include/linux/device.h
View File

@ -516,7 +516,7 @@ struct device_dma_parameters {
* minimizes board-specific #ifdefs in drivers. * minimizes board-specific #ifdefs in drivers.
* @power: For device power management. * @power: For device power management.
* See Documentation/power/devices.txt for details. * See Documentation/power/devices.txt for details.
* @pwr_domain: Provide callbacks that are executed during system suspend, * @pm_domain: Provide callbacks that are executed during system suspend,
* hibernation, system resume and during runtime PM transitions * hibernation, system resume and during runtime PM transitions
* along with subsystem-level and driver-level callbacks. * along with subsystem-level and driver-level callbacks.
* @numa_node: NUMA node this device is close to. * @numa_node: NUMA node this device is close to.
@ -567,7 +567,7 @@ struct device {
void *platform_data; /* Platform specific data, device void *platform_data; /* Platform specific data, device
core doesn't touch it */ core doesn't touch it */
struct dev_pm_info power; struct dev_pm_info power;
struct dev_power_domain *pwr_domain; struct dev_pm_domain *pm_domain;
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
int numa_node; /* NUMA node this device is close to */ int numa_node; /* NUMA node this device is close to */

2
include/linux/pm.h
View File

@ -472,7 +472,7 @@ extern void update_pm_runtime_accounting(struct device *dev);
* hibernation, system resume and during runtime PM transitions along with * hibernation, system resume and during runtime PM transitions along with
* subsystem-level and driver-level callbacks. * subsystem-level and driver-level callbacks.
*/ */
struct dev_power_domain { struct dev_pm_domain {
struct dev_pm_ops ops; struct dev_pm_ops ops;
}; };

2
include/linux/pm_runtime.h
View File

@ -247,7 +247,7 @@ static inline void pm_runtime_dont_use_autosuspend(struct device *dev)
struct pm_clk_notifier_block { struct pm_clk_notifier_block {
struct notifier_block nb; struct notifier_block nb;
struct dev_power_domain *pwr_domain; struct dev_pm_domain *pm_domain;
char *con_ids[]; char *con_ids[];
}; };