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, 49 insertions, 0 deletions

diff --git a/arch/arm/mach-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S
index a9d212498987..55017f507e96 100644
--- a/arch/arm/mach-shmobile/headsmp.S
+++ b/arch/arm/mach-shmobile/headsmp.S
@@ -36,3 +36,52 @@ shmobile_boot_fn:
         .globl  shmobile_boot_arg
 shmobile_boot_arg:
 2:      .space  4
+
+/*
+ * Per-CPU SMP boot function/argument selection code based on MPIDR
+ */
+
+ENTRY(shmobile_smp_boot)
+                                                @ r0 = MPIDR_HWID_BITMASK
+        mrc     p15, 0, r1, c0, c0, 5           @ r1 = MPIDR
+        and     r0, r1, r0                      @ r0 = cpu_logical_map() value
+        mov     r1, #0                          @ r1 = CPU index
+        adr     r5, 1f                          @ array of per-cpu mpidr values
+        adr     r6, 2f                          @ array of per-cpu functions
+        adr     r7, 3f                          @ array of per-cpu arguments
+
+shmobile_smp_boot_find_mpidr:
+        ldr     r8, [r5, r1, lsl #2]
+        cmp     r8, r0
+        bne     shmobile_smp_boot_next
+
+        ldr     r9, [r6, r1, lsl #2]
+        cmp     r9, #0
+        bne     shmobile_smp_boot_found
+
+shmobile_smp_boot_next:
+        add     r1, r1, #1
+        cmp     r1, #CONFIG_NR_CPUS
+        blo     shmobile_smp_boot_find_mpidr
+
+        b       shmobile_smp_sleep
+
+shmobile_smp_boot_found:
+        ldr     r0, [r7, r1, lsl #2]
+        mov     pc, r9
+ENDPROC(shmobile_smp_boot)
+
+ENTRY(shmobile_smp_sleep)
+        wfi
+        b       shmobile_smp_boot
+ENDPROC(shmobile_smp_sleep)
+
+        .globl  shmobile_smp_mpidr
+shmobile_smp_mpidr:
+1:      .space  CONFIG_NR_CPUS * 4
+        .globl  shmobile_smp_fn
+shmobile_smp_fn:
+2:      .space  CONFIG_NR_CPUS * 4
+        .globl  shmobile_smp_arg
+shmobile_smp_arg:
+3:      .space  CONFIG_NR_CPUS * 4