From 697fe62abb8419d884dff9961e062417d44a169a Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Mon, 16 May 2022 22:41:51 +0100 Subject: [PATCH] ANDROID: KVM: arm64: Advertise GICv3 sysreg interface to protected guests Advertise the system register GICv3 CPU interface to protected guests as that is the only supported configuration under pKVM. Signed-off-by: Will Deacon Signed-off-by: Will Deacon Bug: 233587962 Change-Id: Iea2aeaae7776424727f6833c21597b6236284796 --- arch/arm64/include/asm/kvm_pkvm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h index 0d0a0d151bd9..2da3f274fe11 100644 --- a/arch/arm64/include/asm/kvm_pkvm.h +++ b/arch/arm64/include/asm/kvm_pkvm.h @@ -43,11 +43,13 @@ void pkvm_destroy_hyp_vm(struct kvm *kvm); /* * Allow for protected VMs: * - Floating-point and Advanced SIMD + * - GICv3(+) system register interface * - Data Independent Timing */ #define PVM_ID_AA64PFR0_ALLOW (\ ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_FP) | \ ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_AdvSIMD) | \ + ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_GIC) | \ ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_DIT) \ )