Merge tag 'renesas-smp-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/renesas

From Simon Horman:
Renesas ARM based SoC SMP updates for v3.12

* Per-CPU SMP boot and sleep code on SoCs that use SCU
* Shared SCU CPU Hotplug code on r8a7779 and sh73a0 SoCs
* Shared SCU CPU boot code on emev2, r8a7779 and sh73a0 SoCs

* tag 'renesas-smp-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Per-CPU SMP boot / sleep code for SCU SoCs
  ARM: shmobile: Introduce per-CPU SMP boot / sleep code
  ARM: shmobile: Use shared SCU CPU Hotplug code on r8a7779
  ARM: shmobile: Use shared SCU CPU Hotplug code on sh73a0
  ARM: shmobile: Add shared SCU CPU Hotplug code
  ARM: shmobile: Use shared SCU SMP boot code on emev2
  ARM: shmobile: Use shared SCU SMP boot code on r8a7779
  ARM: shmobile: Use shared SCU SMP boot code on sh73a0
  ARM: shmobile: Introduce shared SCU SMP boot code

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 10 insertions, 9 deletions

diff --git a/arch/arm/mach-shmobile/smp-emev2.c b/arch/arm/mach-shmobile/smp-emev2.c
index 78e84c582453..522de5ebb55f 100644
--- a/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@ -34,6 +34,12 @@
 
 static int emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
+        int ret;
+
+        ret = shmobile_smp_scu_boot_secondary(cpu, idle);
+        if (ret)
+                return ret;
+
         arch_send_wakeup_ipi_mask(cpumask_of(cpu_logical_map(cpu)));
         return 0;
 }
@@ -42,21 +48,16 @@ static void __init emev2_smp_prepare_cpus(unsigned int max_cpus)
 {
         void __iomem *smu;
 
-        /* setup EMEV2 specific SCU base, enable */
-        shmobile_scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);
-        scu_enable(shmobile_scu_base);
-
-        /* Tell ROM loader about our vector (in headsmp-scu.S, headsmp.S) */
+        /* Tell ROM loader about our vector (in headsmp.S) */
         smu = ioremap(EMEV2_SMU_BASE, PAGE_SIZE);
         if (smu) {
                 iowrite32(__pa(shmobile_boot_vector), smu + SMU_GENERAL_REG0);
                 iounmap(smu);
         }
-        shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);
-        shmobile_boot_arg = (unsigned long)shmobile_scu_base;
 
-        /* enable cache coherency on booting CPU */
-        scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
+        /* setup EMEV2 specific SCU bits */
+        shmobile_scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);
+        shmobile_smp_scu_prepare_cpus(max_cpus);
 }
 
 struct smp_operations emev2_smp_ops __initdata = {