Skip to content

Commit 5f8d5a1

Browse files
Marc Zyngieroupton
authored andcommitted
KVM: arm64: Add PIR{,E0}_EL2 to the sysreg arrays
Add the FEAT_S1PIE EL2 registers to the per-vcpu sysreg register array. Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Oliver Upton <[email protected]>
1 parent 5055938 commit 5f8d5a1

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

arch/arm64/include/asm/kvm_host.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,8 @@ enum vcpu_sysreg {
478478
TTBR0_EL2, /* Translation Table Base Register 0 (EL2) */
479479
TTBR1_EL2, /* Translation Table Base Register 1 (EL2) */
480480
TCR_EL2, /* Translation Control Register (EL2) */
481+
PIRE0_EL2, /* Permission Indirection Register 0 (EL2) */
482+
PIR_EL2, /* Permission Indirection Register 1 (EL2) */
481483
SPSR_EL2, /* EL2 saved program status register */
482484
ELR_EL2, /* EL2 exception link register */
483485
AFSR0_EL2, /* Auxiliary Fault Status Register 0 (EL2) */

arch/arm64/kvm/sys_regs.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ static bool get_el2_to_el1_mapping(unsigned int reg,
135135
MAPPED_EL2_SYSREG(FAR_EL2, FAR_EL1, NULL );
136136
MAPPED_EL2_SYSREG(MAIR_EL2, MAIR_EL1, NULL );
137137
MAPPED_EL2_SYSREG(TCR2_EL2, TCR2_EL1, NULL );
138+
MAPPED_EL2_SYSREG(PIR_EL2, PIR_EL1, NULL );
139+
MAPPED_EL2_SYSREG(PIRE0_EL2, PIRE0_EL1, NULL );
138140
MAPPED_EL2_SYSREG(AMAIR_EL2, AMAIR_EL1, NULL );
139141
MAPPED_EL2_SYSREG(ELR_EL2, ELR_EL1, NULL );
140142
MAPPED_EL2_SYSREG(SPSR_EL2, SPSR_EL1, NULL );

0 commit comments

Comments
 (0)