cpuidle: simplify multiple driver support
[cascardo/linux.git] / drivers / cpuidle / driver.c
index 8dfaaae..e75fa54 100644 (file)
 
 DEFINE_SPINLOCK(cpuidle_driver_lock);
 
-static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu);
-static struct cpuidle_driver * __cpuidle_get_cpu_driver(int cpu);
+#ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS
 
-static void cpuidle_setup_broadcast_timer(void *arg)
+static DEFINE_PER_CPU(struct cpuidle_driver *, cpuidle_drivers);
+
+static struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu)
 {
-       int cpu = smp_processor_id();
-       clockevents_notify((long)(arg), &cpu);
+       return per_cpu(cpuidle_drivers, cpu);
 }
 
-static void __cpuidle_driver_init(struct cpuidle_driver *drv, int cpu)
+static inline void __cpuidle_unset_driver(struct cpuidle_driver *drv)
 {
-       int i;
-
-       drv->refcnt = 0;
+       int cpu;
 
-       for (i = drv->state_count - 1; i >= 0 ; i--) {
+       for_each_cpu(cpu, drv->cpumask) {
 
-               if (!(drv->states[i].flags & CPUIDLE_FLAG_TIMER_STOP))
+               if (drv != __cpuidle_get_cpu_driver(cpu))
                        continue;
 
-               drv->bctimer = 1;
-               on_each_cpu_mask(get_cpu_mask(cpu), cpuidle_setup_broadcast_timer,
-                                (void *)CLOCK_EVT_NOTIFY_BROADCAST_ON, 1);
-               break;
+               per_cpu(cpuidle_drivers, cpu) = NULL;
        }
 }
 
-static int __cpuidle_register_driver(struct cpuidle_driver *drv, int cpu)
+static inline int __cpuidle_set_driver(struct cpuidle_driver *drv)
 {
-       if (!drv || !drv->state_count)
-               return -EINVAL;
-
-       if (cpuidle_disabled())
-               return -ENODEV;
+       int cpu;
 
-       if (__cpuidle_get_cpu_driver(cpu))
-               return -EBUSY;
+       for_each_cpu(cpu, drv->cpumask) {
 
-       __cpuidle_driver_init(drv, cpu);
+               if (__cpuidle_get_cpu_driver(cpu)) {
+                       __cpuidle_unset_driver(drv);
+                       return -EBUSY;
+               }
 
-       __cpuidle_set_cpu_driver(drv, cpu);
+               per_cpu(cpuidle_drivers, cpu) = drv;
+       }
 
        return 0;
 }
 
-static void __cpuidle_unregister_driver(struct cpuidle_driver *drv, int cpu)
-{
-       if (drv != __cpuidle_get_cpu_driver(cpu))
-               return;
+#else
 
-       if (!WARN_ON(drv->refcnt > 0))
-               __cpuidle_set_cpu_driver(NULL, cpu);
+static struct cpuidle_driver *cpuidle_curr_driver;
 
-       if (drv->bctimer) {
-               drv->bctimer = 0;
-               on_each_cpu_mask(get_cpu_mask(cpu), cpuidle_setup_broadcast_timer,
-                                (void *)CLOCK_EVT_NOTIFY_BROADCAST_OFF, 1);
-       }
+static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu)
+{
+       return cpuidle_curr_driver;
 }
 
-#ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS
+static inline int __cpuidle_set_driver(struct cpuidle_driver *drv)
+{
+       if (cpuidle_curr_driver)
+               return -EBUSY;
 
-static DEFINE_PER_CPU(struct cpuidle_driver *, cpuidle_drivers);
+       cpuidle_curr_driver = drv;
 
-static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu)
-{
-       per_cpu(cpuidle_drivers, cpu) = drv;
+       return 0;
 }
 
-static struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu)
+static inline void __cpuidle_unset_driver(struct cpuidle_driver *drv)
 {
-       return per_cpu(cpuidle_drivers, cpu);
+       if (drv == cpuidle_curr_driver)
+               cpuidle_curr_driver = NULL;
 }
 
-static void __cpuidle_unregister_all_cpu_driver(struct cpuidle_driver *drv)
+#endif
+
+static void cpuidle_setup_broadcast_timer(void *arg)
 {
-       int cpu;
-       for_each_present_cpu(cpu)
-               __cpuidle_unregister_driver(drv, cpu);
+       int cpu = smp_processor_id();
+       clockevents_notify((long)(arg), &cpu);
 }
 
-static int __cpuidle_register_all_cpu_driver(struct cpuidle_driver *drv)
+static int __cpuidle_driver_init(struct cpuidle_driver *drv)
 {
-       int ret = 0;
-       int i, cpu;
+       int i;
 
-       for_each_present_cpu(cpu) {
-               ret = __cpuidle_register_driver(drv, cpu);
-               if (ret)
-                       break;
-       }
+       drv->refcnt = 0;
 
-       if (ret)
-               for_each_present_cpu(i) {
-                       if (i == cpu)
-                               break;
-                       __cpuidle_unregister_driver(drv, i);
-               }
+       if (!drv->cpumask)
+               drv->cpumask = (struct cpumask *)cpu_possible_mask;
 
+       for (i = drv->state_count - 1; i >= 0 ; i--) {
 
-       return ret;
+               if (!(drv->states[i].flags & CPUIDLE_FLAG_TIMER_STOP))
+                       continue;
+
+               drv->bctimer = 1;
+               break;
+       }
+
+       return 0;
 }
 
-int cpuidle_register_cpu_driver(struct cpuidle_driver *drv, int cpu)
+static int __cpuidle_register_driver(struct cpuidle_driver *drv)
 {
        int ret;
 
-       spin_lock(&cpuidle_driver_lock);
-       ret = __cpuidle_register_driver(drv, cpu);
-       spin_unlock(&cpuidle_driver_lock);
+       if (!drv || !drv->state_count)
+               return -EINVAL;
 
-       return ret;
-}
+       if (cpuidle_disabled())
+               return -ENODEV;
 
-void cpuidle_unregister_cpu_driver(struct cpuidle_driver *drv, int cpu)
-{
-       spin_lock(&cpuidle_driver_lock);
-       __cpuidle_unregister_driver(drv, cpu);
-       spin_unlock(&cpuidle_driver_lock);
-}
+       ret = __cpuidle_driver_init(drv);
+       if (ret)
+               return ret;
 
-/**
- * cpuidle_register_driver - registers a driver
- * @drv: the driver
- */
-int cpuidle_register_driver(struct cpuidle_driver *drv)
-{
-       int ret;
+       ret = __cpuidle_set_driver(drv);
+       if (ret)
+               return ret;
 
-       spin_lock(&cpuidle_driver_lock);
-       ret = __cpuidle_register_all_cpu_driver(drv);
-       spin_unlock(&cpuidle_driver_lock);
+       if (drv->bctimer)
+               on_each_cpu_mask(drv->cpumask, cpuidle_setup_broadcast_timer,
+                                (void *)CLOCK_EVT_NOTIFY_BROADCAST_ON, 1);
 
-       return ret;
+       return 0;
 }
-EXPORT_SYMBOL_GPL(cpuidle_register_driver);
 
 /**
  * cpuidle_unregister_driver - unregisters a driver
  * @drv: the driver
  */
-void cpuidle_unregister_driver(struct cpuidle_driver *drv)
+static void __cpuidle_unregister_driver(struct cpuidle_driver *drv)
 {
-       spin_lock(&cpuidle_driver_lock);
-       __cpuidle_unregister_all_cpu_driver(drv);
-       spin_unlock(&cpuidle_driver_lock);
-}
-EXPORT_SYMBOL_GPL(cpuidle_unregister_driver);
-
-#else
-
-static struct cpuidle_driver *cpuidle_curr_driver;
+       if (WARN_ON(drv->refcnt > 0))
+               return;
 
-static inline void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu)
-{
-       cpuidle_curr_driver = drv;
-}
+       if (drv->bctimer) {
+               drv->bctimer = 0;
+               on_each_cpu_mask(drv->cpumask, cpuidle_setup_broadcast_timer,
+                                (void *)CLOCK_EVT_NOTIFY_BROADCAST_OFF, 1);
+       }
 
-static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu)
-{
-       return cpuidle_curr_driver;
+       __cpuidle_unset_driver(drv);
 }
 
 /**
@@ -187,13 +160,11 @@ static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu)
  */
 int cpuidle_register_driver(struct cpuidle_driver *drv)
 {
-       int ret, cpu;
+       int ret;
 
-       cpu = get_cpu();
        spin_lock(&cpuidle_driver_lock);
-       ret = __cpuidle_register_driver(drv, cpu);
+       ret = __cpuidle_register_driver(drv);
        spin_unlock(&cpuidle_driver_lock);
-       put_cpu();
 
        return ret;
 }
@@ -205,16 +176,11 @@ EXPORT_SYMBOL_GPL(cpuidle_register_driver);
  */
 void cpuidle_unregister_driver(struct cpuidle_driver *drv)
 {
-       int cpu;
-
-       cpu = get_cpu();
        spin_lock(&cpuidle_driver_lock);
-       __cpuidle_unregister_driver(drv, cpu);
+       __cpuidle_unregister_driver(drv);
        spin_unlock(&cpuidle_driver_lock);
-       put_cpu();
 }
 EXPORT_SYMBOL_GPL(cpuidle_unregister_driver);
-#endif
 
 /**
  * cpuidle_get_driver - return the current driver