7 files changed, 78 insertions, 15 deletions

diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 8ca20ac28dc2..c2c0f4478be3 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -451,7 +451,7 @@ enum idle_boot_override {IDLE_NO_OVERRIDE = 0, IDLE_POWERSAVE_OFF};
 extern int powersave_nap;       /* set if nap mode can be used in idle loop */
 extern void power7_nap(void);
 
-#ifdef CONFIG_PSERIES_IDLE
+#ifdef CONFIG_PSERIES_CPUIDLE
 extern void update_smt_snooze_delay(int cpu, int residency);
 #else
 static inline void update_smt_snooze_delay(int cpu, int residency) {}
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index e66643250fee..37300f6ee244 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -119,12 +119,3 @@ config DTL
           which are accessible through a debugfs file.
 
           Say N if you are unsure.
-
-config PSERIES_IDLE
-        bool "Cpuidle driver for pSeries platforms"
-        depends on CPU_IDLE
-        depends on PPC_PSERIES
-        default y
-        help
-          Select this option to enable processor idle state management
-          through cpuidle subsystem.
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index fbccac9cd2dc..03480796af9a 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -21,7 +21,6 @@ obj-$(CONFIG_HCALL_STATS)	+= hvCall_inst.o
 obj-$(CONFIG_CMM)               += cmm.o
 obj-$(CONFIG_DTL)               += dtl.o
 obj-$(CONFIG_IO_EVENT_IRQ)      += io_event_irq.o
-obj-$(CONFIG_PSERIES_IDLE)      += processor_idle.o
 obj-$(CONFIG_LPARCFG)           += lparcfg.o
 
 ifeq ($(CONFIG_PPC_PSERIES),y)
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index b3fb81d7cf04..f04e25f6c98d 100644
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -35,6 +35,11 @@ depends on ARM
 source "drivers/cpuidle/Kconfig.arm"
 endmenu
 
+menu "POWERPC CPU Idle Drivers"
+depends on PPC
+source "drivers/cpuidle/Kconfig.powerpc"
+endmenu
+
 endif
 
 config ARCH_NEEDS_CPU_IDLE_COUPLED
diff --git a/drivers/cpuidle/Kconfig.powerpc b/drivers/cpuidle/Kconfig.powerpc
new file mode 100644
index 000000000000..8147de522a96
--- /dev/null
+++ b/drivers/cpuidle/Kconfig.powerpc
@@ -0,0 +1,11 @@
+#
+# POWERPC CPU Idle Drivers
+#
+config PSERIES_CPUIDLE
+        bool "Cpuidle driver for pSeries platforms"
+        depends on CPU_IDLE
+        depends on PPC_PSERIES
+        default y
+        help
+          Select this option to enable processor idle state management
+          through cpuidle subsystem.
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index 527be28e5c1e..a6331ad32738 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -13,3 +13,7 @@ obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)	+= cpuidle-kirkwood.o
 obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)          += cpuidle-zynq.o
 obj-$(CONFIG_ARM_U8500_CPUIDLE)         += cpuidle-ux500.o
 obj-$(CONFIG_ARM_AT91_CPUIDLE)          += cpuidle-at91.o
+
+###############################################################################
+# POWERPC drivers
+obj-$(CONFIG_PSERIES_CPUIDLE)           += cpuidle-pseries.o
diff --git a/arch/powerpc/platforms/pseries/processor_idle.c b/drivers/cpuidle/cpuidle-pseries.c
index 002d5b4112f2..21154782402a 100644
--- a/arch/powerpc/platforms/pseries/processor_idle.c
+++ b/drivers/cpuidle/cpuidle-pseries.c
@@ -1,5 +1,5 @@
 /*
- *  processor_idle - idle state cpuidle driver.
+ *  cpuidle-pseries - idle state cpuidle driver.
  *  Adapted from drivers/idle/intel_idle.c and
  *  drivers/acpi/processor_idle.c
  *
@@ -27,6 +27,7 @@ struct cpuidle_driver pseries_idle_driver = {
 #define MAX_IDLE_STATE_COUNT    2
 
 static int max_idle_state = MAX_IDLE_STATE_COUNT - 1;
+static struct cpuidle_device __percpu *pseries_cpuidle_devices;
 static struct cpuidle_state *cpuidle_state_table;
 
 static inline void idle_loop_prolog(unsigned long *in_purr)
@@ -187,7 +188,7 @@ static int pseries_cpuidle_add_cpu_notifier(struct notifier_block *n,
 {
         int hotcpu = (unsigned long)hcpu;
         struct cpuidle_device *dev =
-                        per_cpu_ptr(cpuidle_devices, hotcpu);
+                        per_cpu_ptr(pseries_cpuidle_devices, hotcpu);
 
         if (dev && cpuidle_get_driver()) {
                 switch (action) {
@@ -244,6 +245,50 @@ static int pseries_cpuidle_driver_init(void)
         return 0;
 }
 
+/* pseries_idle_devices_uninit(void)
+ * unregister cpuidle devices and de-allocate memory
+ */
+static void pseries_idle_devices_uninit(void)
+{
+        int i;
+        struct cpuidle_device *dev;
+
+        for_each_possible_cpu(i) {
+                dev = per_cpu_ptr(pseries_cpuidle_devices, i);
+                cpuidle_unregister_device(dev);
+        }
+
+        free_percpu(pseries_cpuidle_devices);
+        return;
+}
+
+/* pseries_idle_devices_init()
+ * allocate, initialize and register cpuidle device
+ */
+static int pseries_idle_devices_init(void)
+{
+        int i;
+        struct cpuidle_driver *drv = &pseries_idle_driver;
+        struct cpuidle_device *dev;
+
+        pseries_cpuidle_devices = alloc_percpu(struct cpuidle_device);
+        if (pseries_cpuidle_devices == NULL)
+                return -ENOMEM;
+
+        for_each_possible_cpu(i) {
+                dev = per_cpu_ptr(pseries_cpuidle_devices, i);
+                dev->state_count = drv->state_count;
+                dev->cpu = i;
+                if (cpuidle_register_device(dev)) {
+                        printk(KERN_DEBUG \
+                                "cpuidle_register_device %d failed!\n", i);
+                        return -EIO;
+                }
+        }
+
+        return 0;
+}
+
 /*
  * pseries_idle_probe()
  * Choose state table for shared versus dedicated partition
@@ -279,12 +324,19 @@ static int __init pseries_processor_idle_init(void)
                 return retval;
 
         pseries_cpuidle_driver_init();
-        retval = cpuidle_register(&pseries_idle_driver, NULL);
+        retval = cpuidle_register_driver(&pseries_idle_driver);
         if (retval) {
                 printk(KERN_DEBUG "Registration of pseries driver failed.\n");
                 return retval;
         }
 
+        retval = pseries_idle_devices_init();
+        if (retval) {
+                pseries_idle_devices_uninit();
+                cpuidle_unregister_driver(&pseries_idle_driver);
+                return retval;
+        }
+
         register_cpu_notifier(&setup_hotplug_notifier);
         printk(KERN_DEBUG "pseries_idle_driver registered\n");
 
@@ -295,7 +347,8 @@ static void __exit pseries_processor_idle_exit(void)
 {
 
         unregister_cpu_notifier(&setup_hotplug_notifier);
-        cpuidle_unregister(&pseries_idle_driver);
+        pseries_idle_devices_uninit();
+        cpuidle_unregister_driver(&pseries_idle_driver);
 
         return;
 }