Since the very beginning of KVM/arm64, we represented the system register file using a dual view: on one side the AArch64 state, on the other a bizarre mapping of the AArch32 state onto the Aarch64 registers. It was nice at the time as it allowed us to share some code with the 32bit port, and to come up with some creative bugs. But is was always a hack, and we are now in a position to simplify the whole thing. This series goes through the whole of the AArch32 cp14/15 register file, and point each of them directly at their 64bit equivalent. For the few cases where two 32bit registers share a 64bit counterpart, we define which half of the register they map. Finally, we drop a large number of definitions and state that have become useless. This series applies on top of the exception injection rework previously posted [2]. * From v1 [1]: - Added initial patch to deal with TTBCR2 - Fixed TCR_EL1 handling in inject_abt32() - Optimise for 64bit handling of sysreg access - Make most 32bit cp14 registers access the full 64bit register [1] https://lore.kernel.org/r/20201102191609.265711-1-maz@xxxxxxxxxx [2] https://lore.kernel.org/r/20201102164045.264512-1-maz@xxxxxxxxxx Marc Zyngier (9): KVM: arm64: Introduce handling of AArch32 TTBCR2 traps KVM: arm64: Move AArch32 exceptions over to AArch64 sysregs KVM: arm64: Add AArch32 mapping annotation KVM: arm64: Map AArch32 cp15 register to AArch64 sysregs KVM: arm64: Map AArch32 cp14 register to AArch64 sysregs KVM: arm64: Drop is_32bit trap attribute KVM: arm64: Drop is_aarch32 trap attribute KVM: arm64: Drop legacy copro shadow register KVM: arm64: Drop kvm_coproc.h arch/arm64/include/asm/kvm_coproc.h | 38 ----- arch/arm64/include/asm/kvm_host.h | 73 +++------ arch/arm64/kvm/arm.c | 3 +- arch/arm64/kvm/guest.c | 1 - arch/arm64/kvm/handle_exit.c | 1 - arch/arm64/kvm/inject_fault.c | 62 +++----- arch/arm64/kvm/reset.c | 1 - arch/arm64/kvm/sys_regs.c | 233 +++++++++++++--------------- arch/arm64/kvm/sys_regs.h | 9 +- arch/arm64/kvm/vgic-sys-reg-v3.c | 4 - 10 files changed, 151 insertions(+), 274 deletions(-) delete mode 100644 arch/arm64/include/asm/kvm_coproc.h -- 2.28.0
