ARM: SH-Mobile: sh73a0: Add CPU Hotplug

Add the capability to add and remove CPUs on the fly.
The Cortex-A9 offers the possibility to take single cores out of the
MP Core. We add this capabilty taking care that caches are kept
coherent. For verifying the shutdown we rely on the internal SH73A0
Power Status Register PSTR.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

1 files changed, 30 insertions, 6 deletions

diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index 430b44ea85f2..9812ea3255c9 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/irqchip/arm-gic.h>
 #include <mach/common.h>
+#include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 #include <mach/sh73a0.h>
 #include <asm/smp_scu.h>
@@ -36,6 +37,8 @@
 #define SBAR            IOMEM(0xe6180020)
 #define APARMBAREA      IOMEM(0xe6f10020)
 
+#define PSTR_SHUTDOWN_MODE      3
+
 static void __iomem *scu_base_addr(void)
 {
         return (void __iomem *)0xf0000000;
@@ -92,16 +95,20 @@ static void __init sh73a0_smp_init_cpus(void)
         shmobile_smp_init_cpus(ncores);
 }
 
-static int __maybe_unused sh73a0_cpu_kill(unsigned int cpu)
+#ifdef CONFIG_HOTPLUG_CPU
+static int sh73a0_cpu_kill(unsigned int cpu)
 {
+
         int k;
+        u32 pstr;
 
-        /* this function is running on another CPU than the offline target,
-         * here we need wait for shutdown code in platform_cpu_die() to
-         * finish before asking SoC-specific code to power off the CPU core.
+        /*
+         * wait until the power status register confirms the shutdown of the
+         * offline target
          */
         for (k = 0; k < 1000; k++) {
-                if (shmobile_cpu_is_dead(cpu))
+                pstr = (__raw_readl(PSTR) >> (4 * cpu)) & 3;
+                if (pstr == PSTR_SHUTDOWN_MODE)
                         return 1;
 
                 mdelay(1);
@@ -110,6 +117,23 @@ static int __maybe_unused sh73a0_cpu_kill(unsigned int cpu)
         return 0;
 }
 
+static void sh73a0_cpu_die(unsigned int cpu)
+{
+        /*
+         * The ARM MPcore does not issue a cache coherency request for the L1
+         * cache when powering off single CPUs. We must take care of this and
+         * further caches.
+         */
+        dsb();
+        flush_cache_all();
+
+        /* Set power off mode. This takes the CPU out of the MP cluster */
+        scu_power_mode(scu_base_addr(), SCU_PM_POWEROFF);
+
+        /* Enter shutdown mode */
+        cpu_do_idle();
+}
+#endif /* CONFIG_HOTPLUG_CPU */
 
 struct smp_operations sh73a0_smp_ops __initdata = {
         .smp_init_cpus          = sh73a0_smp_init_cpus,
@@ -118,7 +142,7 @@ struct smp_operations sh73a0_smp_ops __initdata = {
         .smp_boot_secondary     = sh73a0_boot_secondary,
 #ifdef CONFIG_HOTPLUG_CPU
         .cpu_kill               = sh73a0_cpu_kill,
-        .cpu_die                = shmobile_cpu_die,
+        .cpu_die                = sh73a0_cpu_die,
         .cpu_disable            = shmobile_cpu_disable,
 #endif
 };