KVM: arm64: remove all traces of the ThumbEE registers
PATCH 1/1 KVM: arm64: remove all traces of the ThumbEE registers
Although the ThumbEE registers and traps were present in earlier versions of the v8 architecture, it was retrospectively removed and so we can do the same.
--- arch/arm64/include/asm/kvm_arm.h | 1 - arch/arm64/include/asm/kvm_asm.h | 4 +--- arch/arm64/kvm/hyp.S | 22 ++++------------------ arch/arm64/kvm/sys_regs.c | 7 ------- 4 files changed, 5 insertions(+), 29 deletions(-)
arch/arm64/include/asm/kvm_arm.h +0 -1
@@ -168,7 +168,6 @@#define VTTBR_VMID_MASK (UL(0xFF) << VTTBR_VMID_SHIFT)/* Hyp System Trap Register */ -#define HSTR_EL2_TTEE (1 << 16)#define HSTR_EL2_T (x) (1 << x)/* Hyp Coproccessor Trap Register Shifts */
arch/arm64/include/asm/kvm_asm.h +1 -3
@@ -53,9 +53,7 @@#define IFSR32_EL2 25/* Instruction Fault Status Register */ #define FPEXC32_EL2 26/* Floating-Point Exception Control Register */ #define DBGVCR32_EL2 27/* Debug Vector Catch Register */ -#define TEECR32_EL1 28/* ThumbEE Configuration Register */ -#define TEEHBR32_EL1 29/* ThumbEE Handler Base Register */ -#define NR_SYS_REGS 30 +#define NR_SYS_REGS 28/* 32bit mapping */ #define c0_MPIDR (MPIDR_EL1 * 2)/* MultiProcessor ID Register */
arch/arm64/kvm/hyp.S +4 -18
@@ -433,20 +433,13 @@ mrs x5, ifsr32_el2 stp x4, x5, [x3] - skip_fpsimd_state x8, 3f + skip_fpsimd_state x8, 2f mrs x6, fpexc32_el2 str x6, [x3, #16] -3: - skip_debug_state x8, 2f +2: + skip_debug_state x8, 1f mrs x7, dbgvcr32_el2 str x7, [x3, #24] -2: - skip_tee_state x8, 1f - - add x3, x2, #CPU_SYSREG_OFFSET(TEECR32_EL1) - mrs x4, teecr32_el1 - mrs x5, teehbr32_el1 - stp x4, x5, [x3] 1: .endm
@@ -466,16 +459,9 @@ msr dacr32_el2, x4 msr ifsr32_el2, x5 - skip_debug_state x8, 2f + skip_debug_state x8, 1f ldr x7, [x3, #24] msr dbgvcr32_el2, x7 -2: - skip_tee_state x8, 1f - - add x3, x2, #CPU_SYSREG_OFFSET(TEECR32_EL1) - ldp x4, x5, [x3] - msr teecr32_el1, x4 - msr teehbr32_el1, x5 1: .endm
arch/arm64/kvm/sys_regs.c +0 -7
@@ -539,13 +539,6 @@ static const struct sys_reg_desc sys_reg_descs[] = { {Op0 (0b10 ),Op1 (0b000 ),CRn (0b0111 ),CRm (0b1110 ),Op2 (0b110 ), trap_dbgauthstatus_el1 }, -/* TEECR32_EL1 */ - { Op0(0b10), Op1(0b010), CRn(0b0000), CRm(0b0000), Op2(0b000), - NULL, reset_val, TEECR32_EL1, 0 }, -/* TEEHBR32_EL1 */ - { Op0(0b10), Op1(0b010), CRn(0b0001), CRm(0b0000), Op2(0b000), - NULL, reset_val, TEEHBR32_EL1, 0 }, -/* MDCCSR_EL1 */ { Op0(0b10), Op1(0b011), CRn(0b0000), CRm(0b0001), Op2(0b000), trap_raz_wi },
Signature · 1 line
2.1.4
Quoted 12 lines · Will Deacon
Although the ThumbEE registers and traps were present in earlier versions of the v8 architecture, it was retrospectively removed and so we can do the same.
Cc Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>arch/arm64/kvm/sys_regs.c +0
-0
arch/arm64/kvm/sys_regs.c static const struct sys_reg_desc sys_reg_descs[] = { · line 548
Quoted 10 lines
arch/arm64/kvm/sys_regs.c +0
-7@@ -539,13 +539,6 @@ static const struct sys_reg_desc sys_reg_descs[] = { {Op0 (0b10 ),Op1 (0b000 ),CRn (0b0111 ),CRm (0b1110 ),Op2 (0b110 ), trap_dbgauthstatus_el1 }, -/* TEECR32_EL1 */ - { Op0(0b10), Op1(0b010), CRn(0b0000), CRm(0b0000), Op2(0b000), - NULL, reset_val, TEECR32_EL1, 0 }, -/* TEEHBR32_EL1 */ - { Op0(0b10), Op1(0b010), CRn(0b0001), CRm(0b0000), Op2(0b000), - NULL, reset_val, TEEHBR32_EL1, 0 }, -
I guess this is a VM migration compatibility break between kernels without this patch and kernels with it? I think that's OK at this point, but it would be nice to mention it in the commit message.
thanks
-- PMM
Quoted 16 lines · Peter Maydell
Quoted 15 lines · Will Deacon
Although the ThumbEE registers and traps were present in earlier versions of the v8 architecture, it was retrospectively removed and so we can do the same.
Cc Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>arch/arm64/kvm/sys_regs.c +0
-0@@ -539,13 +539,6 @@ static const struct sys_reg_desc sys_reg_descs[] = { {Op0 (0b10 ),Op1 (0b000 ),CRn (0b0111 ),CRm (0b1110 ),Op2 (0b110 ), trap_dbgauthstatus_el1 },
Quoted 11 lines
arch/arm64/kvm/sys_regs.c static const struct sys_reg_desc sys_reg_descs[] = { · line 548
Quoted 7 lines
arch/arm64/kvm/sys_regs.c +0
-7-/* TEECR32_EL1 */ - {Op0 (0b10 ),Op1 (0b010 ),CRn (0b0000 ),CRm (0b0000 ),Op2 (0b000 ), - NULL, reset_val, TEECR32_EL1, 0 }, -/* TEEHBR32_EL1 */ - { Op0(0b10), Op1(0b010), CRn(0b0001), CRm(0b0000), Op2(0b000), - NULL, reset_val, TEEHBR32_EL1, 0 }, -I guess this is a VM migration compatibility break between kernels without this patch and kernels with it? I think that's OK at this point, but it would be nice to mention it in the commit message.
I'll add comment to that effect.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...