From: Marc Zyngier <maz@kernel.org>
Date: Tue, 8 Dec 2020 19:51:49 +0000 (+0000)
Subject: KVM: arm64: Fix nVHE boot on VHE systems
X-Git-Tag: accepted/tizen/unified/20230118.172025~7642^2~225^2~26^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0cc519f85a527e1c5ad5a7f182105fe614e9ff80;p=platform%2Fkernel%2Flinux-rpi.git

KVM: arm64: Fix nVHE boot on VHE systems

Conflict resolution gone astray results in the kernel not booting
on VHE-capable HW when VHE support is disabled. Thankfully spotted
by David.

Reported-by: David Brazdil <dbrazdil@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
---

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 7eba3a1..9576830 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -515,8 +515,11 @@ SYM_INNER_LABEL(init_el2, SYM_L_LOCAL)
 	 */
 	mrs	x2, id_aa64mmfr1_el1
 	ubfx	x2, x2, #ID_AA64MMFR1_VHE_SHIFT, #4
-	cbz	x2, init_el2_nvhe
+#else
+	mov	x2, xzr
 #endif
+	cbz	x2, init_el2_nvhe
+
 	/*
 	 * When VHE _is_ in use, EL1 will not be used in the host and
 	 * requires no configuration, and all non-hyp-specific EL2 setup