Skip to content

Commit f757553

Browse files
Marc Zyngieroupton
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Oliver Upton <[email protected]>
1 parent b17d8aa commit f757553

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm64/kvm/emulate-nested.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,10 @@ static const struct encoding_to_trap_config encoding_to_cgt[] __initconst = {
704704
SR_TRAP(SYS_MAIR_EL1, CGT_HCR_TVM_TRVM),
705705
SR_TRAP(SYS_AMAIR_EL1, CGT_HCR_TVM_TRVM),
706706
SR_TRAP(SYS_CONTEXTIDR_EL1, CGT_HCR_TVM_TRVM),
707+
SR_TRAP(SYS_PIR_EL1, CGT_HCR_TVM_TRVM),
708+
SR_TRAP(SYS_PIRE0_EL1, CGT_HCR_TVM_TRVM),
709+
SR_TRAP(SYS_POR_EL0, CGT_HCR_TVM_TRVM),
710+
SR_TRAP(SYS_POR_EL1, CGT_HCR_TVM_TRVM),
707711
SR_TRAP(SYS_TCR2_EL1, CGT_HCR_TVM_TRVM_HCRX_TCR2En),
708712
SR_TRAP(SYS_DC_ZVA, CGT_HCR_TDZ),
709713
SR_TRAP(SYS_DC_GVA, CGT_HCR_TDZ),

0 commit comments

Comments
 (0)