diff options
| author | Magnus Damm <damm@opensource.se> | 2013-08-01 03:38:27 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 18:07:26 +0900 |
| commit | 1d33a354bbb618ba578bb372ebc18fe58457f6f3 (patch) | |
| tree | ec6562a3e2fd3e53de0dded982d4825bb53d86ef /arch/arm/mach-shmobile/platsmp-scu.c | |
| parent | cc61591e45c0457139ddd4cd7e57f75928acaaf2 (diff) | |
ARM: shmobile: Per-CPU SMP boot / sleep code for SCU SoCs
Hook in the per-CPU boot and sleep code in the shared
mach-shmobile SCU code. CPUs may be kept in the asm
routine until ->boot_secondary() when the per-CPU
boot vector is installed. At the end of ->die() the
asm sleep routine is invoked.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/platsmp-scu.c')
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp-scu.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c index 7a0c066df686..c96f50160be6 100644 --- a/arch/arm/mach-shmobile/platsmp-scu.c +++ b/arch/arm/mach-shmobile/platsmp-scu.c @@ -18,8 +18,9 @@ void __init shmobile_smp_scu_prepare_cpus(unsigned int max_cpus) { - shmobile_boot_fn = virt_to_phys(shmobile_boot_scu); - shmobile_boot_arg = (unsigned long)shmobile_scu_base; + /* install boot code shared by all CPUs */ + shmobile_boot_fn = virt_to_phys(shmobile_smp_boot); + shmobile_boot_arg = MPIDR_HWID_BITMASK; /* enable SCU and cache coherency on booting CPU */ scu_enable(shmobile_scu_base); @@ -28,22 +29,26 @@ void __init shmobile_smp_scu_prepare_cpus(unsigned int max_cpus) int shmobile_smp_scu_boot_secondary(unsigned int cpu, struct task_struct *idle) { - /* do nothing for now */ + /* For this particular CPU register SCU boot vector */ + shmobile_smp_hook(cpu, virt_to_phys(shmobile_boot_scu), + (unsigned long)shmobile_scu_base); return 0; } #ifdef CONFIG_HOTPLUG_CPU void shmobile_smp_scu_cpu_die(unsigned int cpu) { + /* For this particular CPU deregister boot vector */ + shmobile_smp_hook(cpu, 0, 0); + dsb(); flush_cache_all(); /* disable cache coherency */ scu_power_mode(shmobile_scu_base, SCU_PM_POWEROFF); - /* Endless loop until reset */ - while (1) - cpu_do_idle(); + /* jump to shared mach-shmobile sleep / reset code */ + shmobile_smp_sleep(); } static int shmobile_smp_scu_psr_core_disabled(int cpu) |