KVM: arm64: Subject S1PIE/S1POE registers to HCR_EL2.{TVM,TRVM}

All the El0/EL1 S1PIE/S1POE system register are caught by the HCR_EL2
TVM and TRVM bits. Reflect this in the coarse grained trap table.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20241023145345.1613824-30-maz@kernel.org
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

diff --git a/arch/arm64/kvm/emulate-nested.c b/arch/arm64/kvm/emulate-nested.c
index ddcbaa983de36e58e0ae94c1578e4f0fa8c7a8ba..0ab0905533545b79bc290e96b94dcfd0ac67b2c9 100644 (file)
--- a/arch/arm64/kvm/emulate-nested.c
+++ b/arch/arm64/kvm/emulate-nested.c
@@ -704,6 +704,10 @@ static const struct encoding_to_trap_config encoding_to_cgt[] __initconst = {
        SR_TRAP(SYS_MAIR_EL1,           CGT_HCR_TVM_TRVM),
        SR_TRAP(SYS_AMAIR_EL1,          CGT_HCR_TVM_TRVM),
        SR_TRAP(SYS_CONTEXTIDR_EL1,     CGT_HCR_TVM_TRVM),
+       SR_TRAP(SYS_PIR_EL1,            CGT_HCR_TVM_TRVM),
+       SR_TRAP(SYS_PIRE0_EL1,          CGT_HCR_TVM_TRVM),
+       SR_TRAP(SYS_POR_EL0,            CGT_HCR_TVM_TRVM),
+       SR_TRAP(SYS_POR_EL1,            CGT_HCR_TVM_TRVM),
        SR_TRAP(SYS_TCR2_EL1,           CGT_HCR_TVM_TRVM_HCRX_TCR2En),
        SR_TRAP(SYS_DC_ZVA,             CGT_HCR_TDZ),
        SR_TRAP(SYS_DC_GVA,             CGT_HCR_TDZ),