diff options
author | Martin Bogomolni <martin@calxeda.com> | 2011-06-13 17:50:33 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:14:04 -0400 |
commit | 9680b3d04d27ed90479eb84d2054ddd3deb83d5e (patch) | |
tree | 01a4e6e83174fcf3c78df901a8f8aacee7c7285e /arch/arm/mach-highbank | |
parent | 6738845783e9113feec22f20834d0e956808da3b (diff) |
ARM: highbank: Add cpu hotplug support
This adds cpu hotplug for highbank. On highbank, a core is always reset and
boots up the same path as a cold boot.
Signed-off-by: Martin Bogomolni <martin@calxeda.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Reviewed-by: Jamie Iles <jamie@jamieiles.com>
Reviewed-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-highbank')
-rw-r--r-- | arch/arm/mach-highbank/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-highbank/hotplug.c | 56 |
2 files changed, 57 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile index 89c736ff047f..c45078f820ae 100644 --- a/arch/arm/mach-highbank/Makefile +++ b/arch/arm/mach-highbank/Makefile | |||
@@ -2,3 +2,4 @@ obj-y := clock.o highbank.o system.o | |||
2 | obj-$(CONFIG_DEBUG_HIGHBANK_UART) += lluart.o | 2 | obj-$(CONFIG_DEBUG_HIGHBANK_UART) += lluart.o |
3 | obj-$(CONFIG_SMP) += platsmp.o | 3 | obj-$(CONFIG_SMP) += platsmp.o |
4 | obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o | 4 | obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o |
5 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o | ||
diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c new file mode 100644 index 000000000000..977cebbea580 --- /dev/null +++ b/arch/arm/mach-highbank/hotplug.c | |||
@@ -0,0 +1,56 @@ | |||
1 | /* | ||
2 | * Copyright 2011 Calxeda, Inc. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms and conditions of the GNU General Public License, | ||
6 | * version 2, as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License along with | ||
14 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #include <linux/kernel.h> | ||
17 | #include <linux/errno.h> | ||
18 | #include <linux/smp.h> | ||
19 | |||
20 | #include <asm/smp_scu.h> | ||
21 | #include <asm/cacheflush.h> | ||
22 | |||
23 | #include "core.h" | ||
24 | |||
25 | extern void secondary_startup(void); | ||
26 | |||
27 | int platform_cpu_kill(unsigned int cpu) | ||
28 | { | ||
29 | return 1; | ||
30 | } | ||
31 | |||
32 | /* | ||
33 | * platform-specific code to shutdown a CPU | ||
34 | * | ||
35 | */ | ||
36 | void platform_cpu_die(unsigned int cpu) | ||
37 | { | ||
38 | flush_cache_all(); | ||
39 | |||
40 | highbank_set_cpu_jump(cpu, secondary_startup); | ||
41 | scu_power_mode(scu_base_addr, SCU_PM_POWEROFF); | ||
42 | |||
43 | cpu_do_idle(); | ||
44 | |||
45 | /* We should never return from idle */ | ||
46 | panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu); | ||
47 | } | ||
48 | |||
49 | int platform_cpu_disable(unsigned int cpu) | ||
50 | { | ||
51 | /* | ||
52 | * CPU0 should not be shut down via hotplug. cpu_idle can WFI | ||
53 | * or a proper shutdown or hibernate should be used. | ||
54 | */ | ||
55 | return cpu == 0 ? -EPERM : 0; | ||
56 | } | ||