Patch "ARM: virt: fix wrong HSCTLR.EE bit setting" has been added to the 3.14-stable tree

Patch "ARM: virt: fix wrong HSCTLR.EE bit setting" has been added to the 3.14-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    ARM: virt: fix wrong HSCTLR.EE bit setting

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-virt-fix-wrong-hsctlr.ee-bit-setting.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From af92394efc8be73edd2301fc15f9b57fd430cd18 Mon Sep 17 00:00:00 2001
From: Li Liu <john.liuli@huawei.com>
Date: Tue, 1 Jul 2014 18:01:50 +0800
Subject: ARM: virt: fix wrong HSCTLR.EE bit setting

From: Li Liu <john.liuli@huawei.com>

commit af92394efc8be73edd2301fc15f9b57fd430cd18 upstream.

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>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/arm/kernel/hyp-stub.S |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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


Patches currently in stable-queue which might be from john.liuli@huawei.com are

queue-3.14/arm-virt-fix-wrong-hsctlr.ee-bit-setting.patch