KVM: arm64: selftests: Make dependencies on VHE-specific registers explicit

The hyp virtual timer registers only exist when VHE is present,
Similarly, VNCR_EL2 only exists when NV2 is present.

Make these dependencies explicit.

Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/tools/testing/selftests/kvm/arm64/get-reg-list.c b/tools/testing/selftests/kvm/arm64/get-reg-list.c
index 011fad9..0a4cfb3 100644 (file)
--- a/tools/testing/selftests/kvm/arm64/get-reg-list.c
+++ b/tools/testing/selftests/kvm/arm64/get-reg-list.c
@@ -65,6 +65,9 @@ static struct feature_id_reg feat_id_regs[] = {
        REG_FEAT(SCTLR2_EL1,    ID_AA64MMFR3_EL1, SCTLRX, IMP),
        REG_FEAT(VDISR_EL2,     ID_AA64PFR0_EL1, RAS, IMP),
        REG_FEAT(VSESR_EL2,     ID_AA64PFR0_EL1, RAS, IMP),
+       REG_FEAT(VNCR_EL2,      ID_AA64MMFR4_EL1, NV_frac, NV2_ONLY),
+       REG_FEAT(CNTHV_CTL_EL2, ID_AA64MMFR1_EL1, VH, IMP),
+       REG_FEAT(CNTHV_CVAL_EL2,ID_AA64MMFR1_EL1, VH, IMP),
 };
 
 bool filter_reg(__u64 reg)