ARM: OMAP4: PM: Program CPU1 to hit OFF when off-lined

Program non-boot CPUs to hit lowest supported power state
when it is off-lined using cpu hotplug framework.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Tested-by: Vishwanath BS <vishwanath.bs@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 36cdba7727f22be589379fc0d513c2f5cd2f4698..c078db1b3de8b332346c1a1b6662ab205a4ff4d7 100644 (file)
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -200,6 +200,7 @@ extern int omap4_mpuss_init(void);
 extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state);
 extern int omap4_finish_suspend(unsigned long cpu_state);
 extern void omap4_cpu_resume(void);
+extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state);
 #else
 static inline int omap4_enter_lowpower(unsigned int cpu,
                                        unsigned int power_state)
@@ -208,6 +209,12 @@ static inline int omap4_enter_lowpower(unsigned int cpu,
        return 0;
 }
 
+static inline int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
+{
+       cpu_do_idle();
+       return 0;
+}
+
 static inline int omap4_mpuss_init(void)
 {
        return 0;

diff --git a/arch/arm/mach-omap2/omap-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c
index e5a1c3f40a86134737b34a968ee4859b0bbef474..adbe4d8c7cafdcd64d52c5880530f096ffacaebd 100644 (file)
--- a/arch/arm/mach-omap2/omap-hotplug.c
+++ b/arch/arm/mach-omap2/omap-hotplug.c
@@ -22,6 +22,8 @@
 
 #include "common.h"
 
+#include "powerdomain.h"
+
 int platform_cpu_kill(unsigned int cpu)
 {
        return 1;
@@ -33,6 +35,8 @@ int platform_cpu_kill(unsigned int cpu)
  */
 void platform_cpu_die(unsigned int cpu)
 {
+       unsigned int this_cpu;
+
        flush_cache_all();
        dsb();
 
@@ -40,15 +44,15 @@ void platform_cpu_die(unsigned int cpu)
         * we're ready for shutdown now, so do it
         */
        if (omap_modify_auxcoreboot0(0x0, 0x200) != 0x0)
-               printk(KERN_CRIT "Secure clear status failed\n");
+               pr_err("Secure clear status failed\n");
 
        for (;;) {
                /*
-                * Execute WFI
+                * Enter into low power state
                 */
-               do_wfi();
-
-               if (omap_read_auxcoreboot0() == cpu) {
+               omap4_hotplug_cpu(cpu, PWRDM_POWER_OFF);
+               this_cpu = smp_processor_id();
+               if (omap_read_auxcoreboot0() == this_cpu) {
                        /*
                         * OK, proper wakeup, we're done
                         */

diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
index 867fee51e42ca2719ff045cdc573e6fa59f0d8e4..9c1c12b8c5e143d73c5a4ee0130c33975dd37140 100644 (file)
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
@@ -192,6 +192,38 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)
        return 0;
 }
 
+/**
+ * omap4_hotplug_cpu: OMAP4 CPU hotplug entry
+ * @cpu : CPU ID
+ * @power_state: CPU low power state.
+ */
+int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
+{
+       unsigned int cpu_state = 0;
+
+       if (omap_rev() == OMAP4430_REV_ES1_0)
+               return -ENXIO;
+
+       if (power_state == PWRDM_POWER_OFF)
+               cpu_state = 1;
+
+       clear_cpu_prev_pwrst(cpu);
+       set_cpu_next_pwrst(cpu, power_state);
+       set_cpu_wakeup_addr(cpu, virt_to_phys(omap_secondary_startup));
+       scu_pwrst_prepare(cpu, power_state);
+
+       /*
+        * CPU never retuns back if targetted power state is OFF mode.
+        * CPU ONLINE follows normal CPU ONLINE ptah via
+        * omap_secondary_startup().
+        */
+       omap4_finish_suspend(cpu_state);
+
+       set_cpu_next_pwrst(cpu, PWRDM_POWER_ON);
+       return 0;
+}
+
+
 /*
  * Initialise OMAP4 MPUSS
  */

diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index a8a8d0efe350ace3e81edda725ac4331efdd9399..701dfecad64b8bd9bd61b530b74cbcd8cfa803bb 100644 (file)
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -180,6 +180,36 @@ static void wakeupgen_irqmask_all(unsigned int cpu, unsigned int set)
        spin_unlock_irqrestore(&wakeupgen_lock, flags);
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
+static int __cpuinit irq_cpu_hotplug_notify(struct notifier_block *self,
+                                        unsigned long action, void *hcpu)
+{
+       unsigned int cpu = (unsigned int)hcpu;
+
+       switch (action) {
+       case CPU_ONLINE:
+               wakeupgen_irqmask_all(cpu, 0);
+               break;
+       case CPU_DEAD:
+               wakeupgen_irqmask_all(cpu, 1);
+               break;
+       }
+       return NOTIFY_OK;
+}
+
+static struct notifier_block __refdata irq_hotplug_notifier = {
+       .notifier_call = irq_cpu_hotplug_notify,
+};
+
+static void __init irq_hotplug_init(void)
+{
+       register_hotcpu_notifier(&irq_hotplug_notifier);
+}
+#else
+static void __init irq_hotplug_init(void)
+{}
+#endif
+
 /*
  * Initialise the wakeupgen module.
  */
@@ -222,5 +252,7 @@ int __init omap_wakeupgen_init(void)
        for (i = 0; i < NR_IRQS; i++)
                irq_target_cpu[i] = boot_cpu;
 
+       irq_hotplug_init();
+
        return 0;
 }