When converting the CP15 registers from a struct to an array, the TTBR registers have been accidently converted from a u64 to a u32. This introduced a subtle regression preventing an LPAE guest from booting, and possibly some other side effects. Add two placeholders in the cp15_regs union to reserve additionnal entries in the cp15 register arrau. Signed-off-by: Marc Zyngier <marc.zyngier at arm.com> --- arch/arm/include/asm/kvm_host.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 42e57a1..06521b4 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -70,7 +70,9 @@ enum cp15_regs { c1_ACTLR, /* Auxilliary Control Register */ c1_CPACR, /* Coprocessor Access Control */ c2_TTBR0, /* Translation Table Base Register 0 */ + c2_TTBR0_high, /* TTBR0 top 32bits */ c2_TTBR1, /* Translation Table Base Register 1 */ + c2_TTBR1_high, /* TTBR1 top 32bits */ c2_TTBCR, /* Translation Table Base Control R. */ c3_DACR, /* Domain Access Control Register */ c10_PRRR, /* Primary Region Remap Register */ -- 1.7.7.1