KVM: arm64: Add FEAT_FGT2 registers to the VNCR page

The FEAT_FGT2 registers are part of the VNCR page. Describe the
corresponding offsets and add them to the vcpu sysreg enumeration.

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 628cff7..70bf28e 100644 (file)
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -562,6 +562,11 @@ enum vcpu_sysreg {
        VNCR(HDFGRTR_EL2),
        VNCR(HDFGWTR_EL2),
        VNCR(HAFGRTR_EL2),
+       VNCR(HFGRTR2_EL2),
+       VNCR(HFGWTR2_EL2),
+       VNCR(HFGITR2_EL2),
+       VNCR(HDFGRTR2_EL2),
+       VNCR(HDFGWTR2_EL2),
 
        VNCR(CNTVOFF_EL2),
        VNCR(CNTV_CVAL_EL0),

diff --git a/arch/arm64/include/asm/vncr_mapping.h b/arch/arm64/include/asm/vncr_mapping.h
index 4f9bbd4..6f556e9 100644 (file)
--- a/arch/arm64/include/asm/vncr_mapping.h
+++ b/arch/arm64/include/asm/vncr_mapping.h
@@ -35,6 +35,8 @@
 #define VNCR_CNTP_CTL_EL0       0x180
 #define VNCR_SCXTNUM_EL1        0x188
 #define VNCR_TFSR_EL1          0x190
+#define VNCR_HDFGRTR2_EL2      0x1A0
+#define VNCR_HDFGWTR2_EL2      0x1B0
 #define VNCR_HFGRTR_EL2                0x1B8
 #define VNCR_HFGWTR_EL2                0x1C0
 #define VNCR_HFGITR_EL2                0x1C8
@@ -52,6 +54,9 @@
 #define VNCR_PIRE0_EL1         0x290
 #define VNCR_PIR_EL1           0x2A0
 #define VNCR_POR_EL1           0x2A8
+#define VNCR_HFGRTR2_EL2       0x2C0
+#define VNCR_HFGWTR2_EL2       0x2C8
+#define VNCR_HFGITR2_EL2       0x310
 #define VNCR_ICH_LR0_EL2        0x400
 #define VNCR_ICH_LR1_EL2        0x408
 #define VNCR_ICH_LR2_EL2        0x410