KVM: arm64: Add ICH_HCR_EL2 to the vcpu state

As we are about to describe the trap routing for ICH_HCR_EL2, add
the register to the vcpu state in its VNCR form, as well as reset

Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20240827152517.3909653-7-maz@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index a33f5996ca9f1d45502d769bb40656b901815af0..16cd59362b3d5574301f4a9ef941edc804d28c95 100644 (file)
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -530,6 +530,8 @@ enum vcpu_sysreg {
        VNCR(CNTP_CVAL_EL0),
        VNCR(CNTP_CTL_EL0),
 
+       VNCR(ICH_HCR_EL2),
+
        NR_SYS_REGS     /* Nothing after this line! */
 };
 

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index e9d8e916e3af498443a7e82127b893e74a30fab5..a57374de69686ad423fd95a8bd8639cf3b3c6cd7 100644 (file)
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -2797,6 +2797,8 @@ static const struct sys_reg_desc sys_reg_descs[] = {
        EL2_REG(RVBAR_EL2, access_rw, reset_val, 0),
        { SYS_DESC(SYS_RMR_EL2), trap_undef },
 
+       EL2_REG_VNCR(ICH_HCR_EL2, reset_val, 0),
+
        EL2_REG(CONTEXTIDR_EL2, access_rw, reset_val, 0),
        EL2_REG(TPIDR_EL2, access_rw, reset_val, 0),