Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[pandora-kernel.git] / arch / arm / mach-shmobile / smp-emev2.c

diff --git a/arch/arm/mach-shmobile/smp-emev2.c b/arch/arm/mach-shmobile/smp-emev2.c
index 030558f..f674562 100644 (file)
--- a/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@ -50,7 +50,7 @@ static void modify_scu_cpu_psr(unsigned long set, unsigned long clr)
 
 }
 
-unsigned int __init emev2_get_core_count(void)
+static unsigned int __init emev2_get_core_count(void)
 {
        if (!scu_base) {
                scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);
@@ -62,17 +62,35 @@ unsigned int __init emev2_get_core_count(void)
        return scu_base ? scu_get_core_count(scu_base) : 1;
 }
 
-int emev2_platform_cpu_kill(unsigned int cpu)
+static int emev2_platform_cpu_kill(unsigned int cpu)
 {
        return 0; /* not supported yet */
 }
 
-void __cpuinit emev2_secondary_init(unsigned int cpu)
+static int __maybe_unused emev2_cpu_kill(unsigned int cpu)
+{
+       int k;
+
+       /* 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.
+        */
+       for (k = 0; k < 1000; k++) {
+               if (shmobile_cpu_is_dead(cpu))
+                       return emev2_platform_cpu_kill(cpu);
+               mdelay(1);
+       }
+
+       return 0;
+}
+
+
+static void __cpuinit emev2_secondary_init(unsigned int cpu)
 {
        gic_secondary_init(0);
 }
 
-int __cpuinit emev2_boot_secondary(unsigned int cpu)
+static int __cpuinit emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
        cpu = cpu_logical_map(cpu);
 
@@ -86,7 +104,7 @@ int __cpuinit emev2_boot_secondary(unsigned int cpu)
        return 0;
 }
 
-void __init emev2_smp_prepare_cpus(void)
+static void __init emev2_smp_prepare_cpus(unsigned int max_cpus)
 {
        int cpu = cpu_logical_map(0);
 
@@ -95,3 +113,22 @@ void __init emev2_smp_prepare_cpus(void)
        /* enable cache coherency on CPU0 */
        modify_scu_cpu_psr(0, 3 << (cpu * 8));
 }
+
+static void __init emev2_smp_init_cpus(void)
+{
+       unsigned int ncores = emev2_get_core_count();
+
+       shmobile_smp_init_cpus(ncores);
+}
+
+struct smp_operations emev2_smp_ops __initdata = {
+       .smp_init_cpus          = emev2_smp_init_cpus,
+       .smp_prepare_cpus       = emev2_smp_prepare_cpus,
+       .smp_secondary_init     = emev2_secondary_init,
+       .smp_boot_secondary     = emev2_boot_secondary,
+#ifdef CONFIG_HOTPLUG_CPU
+       .cpu_kill               = emev2_cpu_kill,
+       .cpu_die                = shmobile_cpu_die,
+       .cpu_disable            = shmobile_cpu_disable,
+#endif
+};