[PATCH v2 2/8] KVM: arm64: nv: Add CGT description for FEAT_PoPS instructions

[Oliver Upton <oupton@kernel.org>]

The DC CIVAPS and DC CIGDVAPS instructions are both affected by
HCR_EL2.TPCP. Add the missing CGT descriptors.

Fixes: a7484c80e5ca ("KVM: arm64: Allow userspace to request KVM_ARM_VCPU_EL2*")
Reviewed-by: Leonardo Bras <leo.bras@arm.com>
Signed-off-by: Oliver Upton <oupton@kernel.org>
---
 arch/arm64/kvm/emulate-nested.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/kvm/emulate-nested.c b/arch/arm64/kvm/emulate-nested.c
index 2bec81668361..d04ac5203454 100644
--- a/arch/arm64/kvm/emulate-nested.c
+++ b/arch/arm64/kvm/emulate-nested.c
@@ -747,6 +747,8 @@ static const struct encoding_to_trap_config encoding_to_cgt[] __initconst = {
 	SR_TRAP(SYS_DC_CGDVAP,		CGT_HCR_TPC),
 	SR_TRAP(SYS_DC_CGVADP,		CGT_HCR_TPC),
 	SR_TRAP(SYS_DC_CGDVADP,		CGT_HCR_TPC),
+	SR_TRAP(SYS_DC_CIVAPS,		CGT_HCR_TPC),
+	SR_TRAP(SYS_DC_CIGDVAPS,	CGT_HCR_TPC),
 	SR_TRAP(SYS_IC_IVAU,		CGT_HCR_TPU_TOCU),
 	SR_TRAP(SYS_IC_IALLU,		CGT_HCR_TPU_TOCU),
 	SR_TRAP(SYS_IC_IALLUIS,		CGT_HCR_TPU_TICAB),
-- 
2.47.3