Skip to content

Commit 4d4f520

Browse files
author
Marc Zyngier
committed
KVM: arm64: nv: Drop EL12 register traps that are redirected to VNCR
With FEAT_NV2, a bunch of system register writes are turned into memory writes. This is specially the fate of the EL12 registers that the guest hypervisor manipulates out of context. Remove the trap descriptors for those, as they are never going to be used again. Reviewed-by: Oliver Upton <oliver.upton@linux.dev> Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent 3ed0b51 commit 4d4f520

1 file changed

Lines changed: 0 additions & 15 deletions

File tree

arch/arm64/kvm/sys_regs.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2566,21 +2566,6 @@ static const struct sys_reg_desc sys_reg_descs[] = {
25662566
EL2_REG(CNTVOFF_EL2, access_rw, reset_val, 0),
25672567
EL2_REG(CNTHCTL_EL2, access_rw, reset_val, 0),
25682568

2569-
EL12_REG(SCTLR, access_vm_reg, reset_val, 0x00C50078),
2570-
EL12_REG(CPACR, access_rw, reset_val, 0),
2571-
EL12_REG(TTBR0, access_vm_reg, reset_unknown, 0),
2572-
EL12_REG(TTBR1, access_vm_reg, reset_unknown, 0),
2573-
EL12_REG(TCR, access_vm_reg, reset_val, 0),
2574-
{ SYS_DESC(SYS_SPSR_EL12), access_spsr},
2575-
{ SYS_DESC(SYS_ELR_EL12), access_elr},
2576-
EL12_REG(AFSR0, access_vm_reg, reset_unknown, 0),
2577-
EL12_REG(AFSR1, access_vm_reg, reset_unknown, 0),
2578-
EL12_REG(ESR, access_vm_reg, reset_unknown, 0),
2579-
EL12_REG(FAR, access_vm_reg, reset_unknown, 0),
2580-
EL12_REG(MAIR, access_vm_reg, reset_unknown, 0),
2581-
EL12_REG(AMAIR, access_vm_reg, reset_amair_el1, 0),
2582-
EL12_REG(VBAR, access_rw, reset_val, 0),
2583-
EL12_REG(CONTEXTIDR, access_vm_reg, reset_val, 0),
25842569
EL12_REG(CNTKCTL, access_rw, reset_val, 0),
25852570

25862571
EL2_REG(SP_EL2, NULL, reset_unknown, 0),

0 commit comments

Comments
 (0)