Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42f67f2a authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Rafael J. Wysocki
Browse files

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: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarPeter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8f3e9953

drivers/cpuidle/driver.c

+8 −5
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


static struct cpuidle_driver *cpuidle_curr_driver;

DEFINE_SPINLOCK(cpuidle_driver_lock);

int cpuidle_driver_refcount;



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)

		set_power_states(drv);



	drv->refcnt = 0;



	cpuidle_curr_driver = drv;



	spin_unlock(&cpuidle_driver_lock);
@@ -92,7 +93,7 @@ void cpuidle_unregister_driver(struct cpuidle_driver *drv) 


	spin_lock(&cpuidle_driver_lock);



	if (!WARN_ON(cpuidle_driver_refcount > 0))

	if (!WARN_ON(drv->refcnt > 0))

		cpuidle_curr_driver = NULL;



	spin_unlock(&cpuidle_driver_lock);
@@ -106,7 +107,7 @@ struct cpuidle_driver *cpuidle_driver_ref(void) 
	spin_lock(&cpuidle_driver_lock);



	drv = cpuidle_curr_driver;

	cpuidle_driver_refcount++;

	drv->refcnt++;



	spin_unlock(&cpuidle_driver_lock);

	return drv;
@@ -114,10 +115,12 @@ struct cpuidle_driver *cpuidle_driver_ref(void) 


void cpuidle_driver_unref(void)

{

	struct cpuidle_driver *drv = cpuidle_curr_driver;



	spin_lock(&cpuidle_driver_lock);



	if (!WARN_ON(cpuidle_driver_refcount <= 0))

		cpuidle_driver_refcount--;

	if (drv && !WARN_ON(drv->refcnt <= 0))

		drv->refcnt--;



	spin_unlock(&cpuidle_driver_lock);

}

include/linux/cpuidle.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static inline int cpuidle_get_last_residency(struct cpuidle_device *dev) 
struct cpuidle_driver {

	const char		*name;

	struct module 		*owner;

	int                     refcnt;



	unsigned int		power_specified:1;

	/* set to 1 to use the core cpuidle time keeping (for all states). */