From 2a14422dcfd54d90c91f6f9be2366ee4ae1a03c8 Mon Sep 17 00:00:00 2001 From: Fuad Tabba Date: Fri, 8 Dec 2023 12:23:37 +0000 Subject: [PATCH] ANDROID: KVM: arm64: Mark PAuth as a restricted feature for protected VMs Protected VMs will only support basic PAuth (FEAT_PAuth). Mark it as restricted to ensure that later versions aren't supported for protected guests. Bug: 357781595 Change-Id: Ie8e2c73f6a7c9a1776ecfefba15892f3721af212 Signed-off-by: Fuad Tabba --- arch/arm64/include/asm/kvm_pkvm.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h index 52585f302201..14afc1211347 100644 --- a/arch/arm64/include/asm/kvm_pkvm.h +++ b/arch/arm64/include/asm/kvm_pkvm.h @@ -228,7 +228,6 @@ bool pkvm_is_hyp_created(struct kvm *kvm); #define PVM_ID_AA64ISAR2_ALLOW (\ ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_ATS1A)| \ ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_GPA3) | \ - ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_APA3) | \ ARM64_FEATURE_MASK(ID_AA64ISAR2_EL1_MOPS) \ )