]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: EXYNOS: Use wfi macro in platform_do_lowpower
authorLeela Krishna Amudala <leela.krishna@linaro.org>
Tue, 27 May 2014 15:43:21 +0000 (00:43 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 27 May 2014 15:43:42 +0000 (00:43 +0900)
This patch is originally based on commit b3377d186572 ("ARM: 7064/1:
vexpress: Use wfi macro in platform_do_lowpower.")

Current Exynos CPU hotplug code includes a hardcoded WFI instruction,
in ARM encoding. When the kernel is compiled in Thumb-2 mode, this
is invalid and causes the machine to hang hard when a CPU is offlined.

Use wfi macro instead of the hardcoded WFI instruction.

Signed-off-by: Leela Krishna Amudala <leela.krishna@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/mach-exynos/hotplug.c

index 5eead530c6f8fa57ab8444911b19b684ef1e84fc..03cdcd39f71c79a97b2e6eb76083966f7ed32873 100644 (file)
@@ -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)) {
                        /*