cpuidle/powernv: Convert to hotplug state machine

Install the callbacks via the state machine.

v1…v2: - Use only CPUHP_CPUIDLE_DEAD (requested by Daniel Lezcano)

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: linux-pm@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160824091259.ozyslcopxvbfdqzy@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c
index f7ca891b5b59ff4681edad72bd5392b9f1081d1f..7fe442ca38f4b793cef0f70731a62e215d5d37fc 100644 (file)
--- a/drivers/cpuidle/cpuidle-powernv.c
+++ b/drivers/cpuidle/cpuidle-powernv.c
@@ -119,40 +119,30 @@ static struct cpuidle_state powernv_states[CPUIDLE_STATE_MAX] = {
                .enter = snooze_loop },
 };
 
-static int powernv_cpuidle_add_cpu_notifier(struct notifier_block *n,
-                       unsigned long action, void *hcpu)
+static int powernv_cpuidle_cpu_online(unsigned int cpu)
 {
-       int hotcpu = (unsigned long)hcpu;
-       struct cpuidle_device *dev =
-                               per_cpu(cpuidle_devices, hotcpu);
+       struct cpuidle_device *dev = per_cpu(cpuidle_devices, cpu);
 
        if (dev && cpuidle_get_driver()) {
-               switch (action) {
-               case CPU_ONLINE:
-               case CPU_ONLINE_FROZEN:
-                       cpuidle_pause_and_lock();
-                       cpuidle_enable_device(dev);
-                       cpuidle_resume_and_unlock();
-                       break;
+               cpuidle_pause_and_lock();
+               cpuidle_enable_device(dev);
+               cpuidle_resume_and_unlock();
+       }
+       return 0;
+}
 
-               case CPU_DEAD:
-               case CPU_DEAD_FROZEN:
-                       cpuidle_pause_and_lock();
-                       cpuidle_disable_device(dev);
-                       cpuidle_resume_and_unlock();
-                       break;
+static int powernv_cpuidle_cpu_dead(unsigned int cpu)
+{
+       struct cpuidle_device *dev = per_cpu(cpuidle_devices, cpu);
 
-               default:
-                       return NOTIFY_DONE;
-               }
+       if (dev && cpuidle_get_driver()) {
+               cpuidle_pause_and_lock();
+               cpuidle_disable_device(dev);
+               cpuidle_resume_and_unlock();
        }
-       return NOTIFY_OK;
+       return 0;
 }
 
-static struct notifier_block setup_hotplug_notifier = {
-       .notifier_call = powernv_cpuidle_add_cpu_notifier,
-};
-
 /*
  * powernv_cpuidle_driver_init()
  */
@@ -355,7 +345,14 @@ static int __init powernv_processor_idle_init(void)
                return retval;
        }
 
-       register_cpu_notifier(&setup_hotplug_notifier);
+       retval = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
+                                          "cpuidle/powernv:online",
+                                          powernv_cpuidle_cpu_online, NULL);
+       WARN_ON(retval < 0);
+       retval = cpuhp_setup_state_nocalls(CPUHP_CPUIDLE_DEAD,
+                                          "cpuidle/powernv:dead", NULL,
+                                          powernv_cpuidle_cpu_dead);
+       WARN_ON(retval < 0);
        printk(KERN_DEBUG "powernv_idle_driver registered\n");
        return 0;
 }