| From 5481c5987c45b2c5592b3665c130897c08ebef3e Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Wed, 31 Jul 2013 16:07:12 +0900 |
| Subject: ARM: shmobile: Introduce shared SCU SMP boot code |
| |
| Add SMP boot functions for SCU equipped mach-shmobile SoCs. |
| |
| At this point shmobile_smp_scu_prepare_cpus() controls the SCU and |
| installs boot fn and arg, while shmobile_smp_scu_boot_secondary() |
| currently does nothing. In the future the boot function and arg |
| install code will be reworked, so the empty function is ground |
| work for that. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit c970d4ef3ac6d56f5fd02902ad2ad80377c0bca1) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/include/mach/common.h | 3 +++ |
| arch/arm/mach-shmobile/platsmp-scu.c | 31 ++++++++++++++++++++++++++++ |
| 2 files changed, 34 insertions(+) |
| create mode 100644 arch/arm/mach-shmobile/platsmp-scu.c |
| |
| diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h |
| index 18a76f91..08d7cacc 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/common.h |
| +++ b/arch/arm/mach-shmobile/include/mach/common.h |
| @@ -10,6 +10,9 @@ extern void shmobile_boot_vector(void); |
| extern unsigned long shmobile_boot_fn; |
| extern unsigned long shmobile_boot_arg; |
| extern void shmobile_boot_scu(void); |
| +extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus); |
| +extern int shmobile_smp_scu_boot_secondary(unsigned int cpu, |
| + struct task_struct *idle); |
| struct clk; |
| extern int shmobile_clk_init(void); |
| extern void shmobile_handle_irq_intc(struct pt_regs *); |
| diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c |
| new file mode 100644 |
| index 00000000..8f478e4d |
| --- /dev/null |
| +++ b/arch/arm/mach-shmobile/platsmp-scu.c |
| @@ -0,0 +1,31 @@ |
| +/* |
| + * SMP support for SoCs with SCU covered by mach-shmobile |
| + * |
| + * Copyright (C) 2013 Magnus Damm |
| + * |
| + * This program is free software; you can redistribute it and/or modify |
| + * it under the terms of the GNU General Public License version 2 as |
| + * published by the Free Software Foundation. |
| + */ |
| +#include <linux/init.h> |
| +#include <linux/io.h> |
| +#include <linux/smp.h> |
| +#include <asm/smp_plat.h> |
| +#include <asm/smp_scu.h> |
| +#include <mach/common.h> |
| + |
| +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; |
| + |
| + /* enable SCU and cache coherency on booting CPU */ |
| + scu_enable(shmobile_scu_base); |
| + scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL); |
| +} |
| + |
| +int shmobile_smp_scu_boot_secondary(unsigned int cpu, struct task_struct *idle) |
| +{ |
| + /* do nothing for now */ |
| + return 0; |
| +} |
| -- |
| 1.8.4.3.gca3854a |
| |
