summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Liu <john.liuli@huawei.com>2014-07-01 10:01:50 (GMT)
committerChristoffer Dall <christoffer.dall@linaro.org>2014-07-11 11:57:38 (GMT)
commitaf92394efc8be73edd2301fc15f9b57fd430cd18 (patch)
treeecfd30b4ac8e96ceed0e7efc5edc9cae6aadf11c
parent67b2abfedb7b861bead93400fa315c5c30879d51 (diff)
downloadlinux-af92394efc8be73edd2301fc15f9b57fd430cd18.tar.xz
ARM: virt: fix wrong HSCTLR.EE bit setting
HSCTLR.EE is defined as bit[25] referring to arm manual DDI0606C.b(p1590). Reviewed-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Li Liu <john.liuli@huawei.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-rw-r--r--arch/arm/kernel/hyp-stub.S4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S
index 797b1a6..7e666cf 100644
--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
@@ -134,9 +134,7 @@ ENTRY(__hyp_stub_install_secondary)
mcr p15, 4, r7, c1, c1, 3 @ HSTR
THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE
-#ifdef CONFIG_CPU_BIG_ENDIAN
- orr r7, #(1 << 9) @ HSCTLR.EE
-#endif
+ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE
mcr p15, 4, r7, c1, c0, 0 @ HSCTLR
mrc p15, 4, r7, c1, c1, 1 @ HDCR