arm64: KVM: initialize HYP mode following the kernel endianness

Force SCTLR_EL2.EE to 1 if the kernel is compiled as BE.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/arm64/kvm/hyp-init.S b/arch/arm64/kvm/hyp-init.S
index ba84e6705e20..2b0244d65c16 100644
--- a/arch/arm64/kvm/hyp-init.S
+++ b/arch/arm64/kvm/hyp-init.S
@@ -74,7 +74,10 @@ __do_hyp_init:
         msr     mair_el2, x4
         isb
 
-        mov     x4, #SCTLR_EL2_FLAGS
+        mrs     x4, sctlr_el2
+        and     x4, x4, #SCTLR_EL2_EE   // preserve endianness of EL2
+        ldr     x5, =SCTLR_EL2_FLAGS
+        orr     x4, x4, x5
         msr     sctlr_el2, x4
         isb