aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2013-03-08 15:59:44 +0530
committerAndrey Konovalov <andrey.konovalov@linaro.org>2014-03-11 22:20:29 +0400
commitd3740b7aa028de2fd12b3cb2322148d789a207b7 (patch)
tree32f66a04a135e3c65829520bf75e012335d9499d
parent46d95e916531005c4c7e9fd4e60b26a114a23008 (diff)
ARM: EXYNOS: Use wfi macro in platform_do_lowpower
As per commit b3377d186572 ("ARM: 7064/1: vexpress: Use wfi macro in platform_do_lowpower."), wfi macro should be used instead of the hardcoded WFI instruction. This fixes following oops with a kernel compiled in Thumb-2 mode. $ reboot reboot Disabling non-boot CPUs ... IRQ153 no longer affine to CPU1 CPU1: shutdown Internal error: Oops - undefined instruction: 0 [#1] PREEMPT SMP THUMB2 Modules linked in: CPU: 1 Not tainted (3.9.0-rc1-00015-gce76372 #1) PC is at 0xc065858e LR is at exynos_cpu_die+0x53/0xc0 Tested on EXYNOS5250 based Arndale board. Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r--arch/arm/mach-exynos/hotplug.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c
index 5eead530c6f8..03cdcd39f71c 100644
--- a/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@ -98,13 +98,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
if (cpu == 1)
__raw_writel(0, S5P_ARM_CORE1_CONFIGURATION);
- /*
- * here's the WFI
- */
- asm(".word 0xe320f003\n"
- :
- :
- : "memory", "cc");
+ wfi();
if (pen_release == cpu_logical_map(cpu)) {
/*