KVM: arm64: gic-v5: Hide FEAT_GCIE from NV GICv5 guests

Currently, NV guests are not supported with GICv5. Therefore, make
sure that FEAT_GCIE is always hidden from such guests.

Signed-off-by: Sascha Bischoff <sascha.bischoff@arm.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Link: https://patch.msgid.link/20260319154937.3619520-35-sascha.bischoff@arm.com
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
index 2c43097248b21453360aab8357563be09792ab85..efd5d21c7ac7574def9f3c2ee990a5d1b07c84fa 100644 (file)
--- a/arch/arm64/kvm/nested.c
+++ b/arch/arm64/kvm/nested.c
@@ -1558,6 +1558,11 @@ u64 limit_nv_id_reg(struct kvm *kvm, u32 reg, u64 val)
                         ID_AA64PFR1_EL1_MTE);
                break;
 
+       case SYS_ID_AA64PFR2_EL1:
+               /* GICv5 is not yet supported for NV */
+               val &= ~ID_AA64PFR2_EL1_GCIE;
+               break;
+
        case SYS_ID_AA64MMFR0_EL1:
                /* Hide ExS, Secure Memory */
                val &= ~(ID_AA64MMFR0_EL1_EXS           |