korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 16:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

xtensa: use callx0 opcode in fast_coprocessor

Browse Source 
Instead of emulating call0 in fast_coprocessor use that opcode directly.
Use 'ret' instead of 'jx a0'.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Max Filippov 2022-04-13 22:50:54 -07:00
parent 9fa8c59f5f
commit 6179ef4d46
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/xtensa/kernel/coprocessor.S
View File

@ -30,7 +30,7 @@
.align 4; \ .align 4; \
.Lsave_cp_regs_cp##x: \ .Lsave_cp_regs_cp##x: \
xchal_cp##x##_store a2 a3 a4 a5 a6; \ xchal_cp##x##_store a2 a3 a4 a5 a6; \
jx a0; \ ret; \
.endif .endif
#define SAVE_CP_REGS_TAB(x) \ #define SAVE_CP_REGS_TAB(x) \
@ -47,7 +47,7 @@
.align 4; \ .align 4; \
.Lload_cp_regs_cp##x: \ .Lload_cp_regs_cp##x: \
xchal_cp##x##_load a2 a3 a4 a5 a6; \ xchal_cp##x##_load a2 a3 a4 a5 a6; \
jx a0; \ ret; \
.endif .endif
#define LOAD_CP_REGS_TAB(x) \ #define LOAD_CP_REGS_TAB(x) \
@ -163,21 +163,20 @@ ENTRY(fast_coprocessor)
s32i a5, a4, THREAD_CPENABLE s32i a5, a4, THREAD_CPENABLE
/* /*
* Get context save area and 'call' save routine. * Get context save area and call save routine.
* (a4 still holds previous owner (thread_info), a3 CP number) * (a4 still holds previous owner (thread_info), a3 CP number)
*/ */
movi a5, .Lsave_cp_regs_jump_table movi a5, .Lsave_cp_regs_jump_table
movi a0, 2f # a0: 'return' address
addx8 a3, a3, a5 # a3: coprocessor number addx8 a3, a3, a5 # a3: coprocessor number
l32i a2, a3, 4 # a2: xtregs offset l32i a2, a3, 4 # a2: xtregs offset
l32i a3, a3, 0 # a3: jump address l32i a3, a3, 0 # a3: jump address
add a2, a2, a4 add a2, a2, a4
jx a3 callx0 a3
/* Note that only a0 and a1 were preserved. */ /* Note that only a0 and a1 were preserved. */
2: rsr a3, exccause rsr a3, exccause
addi a3, a3, -EXCCAUSE_COPROCESSOR0_DISABLED addi a3, a3, -EXCCAUSE_COPROCESSOR0_DISABLED
movi a0, coprocessor_owner movi a0, coprocessor_owner
addx4 a0, a3, a0 addx4 a0, a3, a0
@ -187,19 +186,18 @@ ENTRY(fast_coprocessor)
1: GET_THREAD_INFO (a4, a1) 1: GET_THREAD_INFO (a4, a1)
s32i a4, a0, 0 s32i a4, a0, 0
/* Get context save area and 'call' load routine. */ /* Get context save area and call load routine. */
movi a5, .Lload_cp_regs_jump_table movi a5, .Lload_cp_regs_jump_table
movi a0, 1f
addx8 a3, a3, a5 addx8 a3, a3, a5
l32i a2, a3, 4 # a2: xtregs offset l32i a2, a3, 4 # a2: xtregs offset
l32i a3, a3, 0 # a3: jump address l32i a3, a3, 0 # a3: jump address
add a2, a2, a4 add a2, a2, a4
jx a3 callx0 a3
/* Restore all registers and return from exception handler. */ /* Restore all registers and return from exception handler. */
1: l32i a6, a1, PT_AREG6 l32i a6, a1, PT_AREG6
l32i a5, a1, PT_AREG5 l32i a5, a1, PT_AREG5
l32i a4, a1, PT_AREG4 l32i a4, a1, PT_AREG4