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

cpuidle: move driver's refcount to cpuidle 

We want to support different cpuidle drivers co-existing together.
In this case we should move the refcount to the cpuidle_driver
structure to handle several drivers at a time.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Daniel Lezcano 2012-10-31 16:44:45 +00:00 committed by Rafael J. Wysocki
parent 8f3e9953e1
commit 42f67f2aca
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/cpuidle/driver.c
View File

@ -16,7 +16,6 @@
static struct cpuidle_driver *cpuidle_curr_driver; static struct cpuidle_driver *cpuidle_curr_driver;
DEFINE_SPINLOCK(cpuidle_driver_lock); DEFINE_SPINLOCK(cpuidle_driver_lock);
int cpuidle_driver_refcount;
static void set_power_states(struct cpuidle_driver *drv) static void set_power_states(struct cpuidle_driver *drv)
{ {
@ -61,6 +60,8 @@ int cpuidle_register_driver(struct cpuidle_driver *drv)
if (!drv->power_specified) if (!drv->power_specified)
set_power_states(drv); set_power_states(drv);
drv->refcnt = 0;
cpuidle_curr_driver = drv; cpuidle_curr_driver = drv;
spin_unlock(&cpuidle_driver_lock); spin_unlock(&cpuidle_driver_lock);
@ -92,7 +93,7 @@ void cpuidle_unregister_driver(struct cpuidle_driver *drv)
spin_lock(&cpuidle_driver_lock); spin_lock(&cpuidle_driver_lock);
if (!WARN_ON(cpuidle_driver_refcount > 0)) if (!WARN_ON(drv->refcnt > 0))
cpuidle_curr_driver = NULL; cpuidle_curr_driver = NULL;
spin_unlock(&cpuidle_driver_lock); spin_unlock(&cpuidle_driver_lock);
@ -106,7 +107,7 @@ struct cpuidle_driver *cpuidle_driver_ref(void)
spin_lock(&cpuidle_driver_lock); spin_lock(&cpuidle_driver_lock);
drv = cpuidle_curr_driver; drv = cpuidle_curr_driver;
cpuidle_driver_refcount++; drv->refcnt++;
spin_unlock(&cpuidle_driver_lock); spin_unlock(&cpuidle_driver_lock);
return drv; return drv;
@ -114,10 +115,12 @@ struct cpuidle_driver *cpuidle_driver_ref(void)
void cpuidle_driver_unref(void) void cpuidle_driver_unref(void)
{ {
struct cpuidle_driver *drv = cpuidle_curr_driver;
spin_lock(&cpuidle_driver_lock); spin_lock(&cpuidle_driver_lock);
if (!WARN_ON(cpuidle_driver_refcount <= 0)) if (drv && !WARN_ON(drv->refcnt <= 0))
cpuidle_driver_refcount--; drv->refcnt--;
spin_unlock(&cpuidle_driver_lock); spin_unlock(&cpuidle_driver_lock);
} }

1
include/linux/cpuidle.h
View File

@ -124,6 +124,7 @@ static inline int cpuidle_get_last_residency(struct cpuidle_device *dev)
struct cpuidle_driver { struct cpuidle_driver {
const char *name; const char *name;
struct module *owner; struct module *owner;
int refcnt;
unsigned int power_specified:1; unsigned int power_specified:1;
/* set to 1 to use the core cpuidle time keeping (for all states). */ /* set to 1 to use the core cpuidle time keeping (for all states). */