ugly pile of hacks
Signed-off-by: Marc Zyngier <maz@kernel.org>
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 904a51ae..f10aca4 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -509,7 +509,7 @@
eret
SYM_INNER_LABEL(init_el2, SYM_L_LOCAL)
- mov_q x0, HCR_HOST_NVHE_FLAGS
+ mov_q x0, HCR_HOST_NVHE_FLAGS | HCR_E2H
msr hcr_el2, x0
isb
diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c
index 9df007e..4d8b55d 100644
--- a/arch/arm64/kernel/idreg-override.c
+++ b/arch/arm64/kernel/idreg-override.c
@@ -37,6 +37,7 @@
* the user was trying to force nVHE on us, proceed with
* attitude adjustment.
*/
+ /* FIXME: not working anymore with M1 */
return !(is_kernel_in_hyp_mode() && val == 0);
}
