From: Li Liu <john.liuli@huawei.com>
Date: Tue, 1 Jul 2014 10:01:50 +0000 (+0800)
Subject: ARM: virt: fix wrong HSCTLR.EE bit setting
X-Git-Tag: v3.17-rc1~87^2~11^2~24
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=af92394efc8be73edd2301fc15f9b57fd430cd18;p=~emulex%2Finfiniband.git

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>
---

diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S
index 797b1a6a490..7e666cfda63 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