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>

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 3eae841..cdfc79c 100644 (file)
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -2566,21 +2566,6 @@ static const struct sys_reg_desc sys_reg_descs[] = {
        EL2_REG(CNTVOFF_EL2, access_rw, reset_val, 0),
        EL2_REG(CNTHCTL_EL2, access_rw, reset_val, 0),
 
-       EL12_REG(SCTLR, access_vm_reg, reset_val, 0x00C50078),
-       EL12_REG(CPACR, access_rw, reset_val, 0),
-       EL12_REG(TTBR0, access_vm_reg, reset_unknown, 0),
-       EL12_REG(TTBR1, access_vm_reg, reset_unknown, 0),
-       EL12_REG(TCR, access_vm_reg, reset_val, 0),
-       { SYS_DESC(SYS_SPSR_EL12), access_spsr},
-       { SYS_DESC(SYS_ELR_EL12), access_elr},
-       EL12_REG(AFSR0, access_vm_reg, reset_unknown, 0),
-       EL12_REG(AFSR1, access_vm_reg, reset_unknown, 0),
-       EL12_REG(ESR, access_vm_reg, reset_unknown, 0),
-       EL12_REG(FAR, access_vm_reg, reset_unknown, 0),
-       EL12_REG(MAIR, access_vm_reg, reset_unknown, 0),
-       EL12_REG(AMAIR, access_vm_reg, reset_amair_el1, 0),
-       EL12_REG(VBAR, access_rw, reset_val, 0),
-       EL12_REG(CONTEXTIDR, access_vm_reg, reset_val, 0),
        EL12_REG(CNTKCTL, access_rw, reset_val, 0),
 
        EL2_REG(SP_EL2, NULL, reset_unknown, 0),