diff options
author | Victor Kamensky <victor.kamensky@linaro.org> | 2014-03-28 16:57:08 -0700 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-04-16 23:24:42 +0400 |
commit | 041fa155e0a7a49d4084be684f855e2a32c17324 (patch) | |
tree | 7a9da9b82839e09d1f49b0116c422585a56ebff2 | |
parent | 1139eb241778c4b28201e39e2567e9dda010e4d9 (diff) |
ARM: EXYNOS: Fix hotplug BE image mon and hyp mode BE switchtracking-ll-misc-fixes-ll-20140416.0
In monitor and hypervisor mode first thing we need to do in
case of BE image is to switch CPU into BE mode.
Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org>
-rw-r--r-- | arch/arm/mach-exynos/headsmp.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S index 08d3d3f53283..11684f628bd1 100644 --- a/arch/arm/mach-exynos/headsmp.S +++ b/arch/arm/mach-exynos/headsmp.S @@ -39,11 +39,14 @@ mon_vectors: W(b) . /* fiq */ /* Return directly back to the caller without leaving Hyp mode: */ -1: mrs lr, elr_hyp +1: +ARM_BE8(setend be) + mrs lr, elr_hyp mov pc, lr /* In monitor mode, set up HVBAR and SCR then return to caller in NS-SVC. */ 2: +ARM_BE8(setend be) mrc p15, 0, r1, c1, c1, 0 @ SCR /* * Set SCR.NS=1(needed for setting HVBAR and also returning to NS state) |