leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/32: Add a prepare_transfer_to_handler macro for exception prologs

Browse Source 
In order to increase flexibility, add a macro that will for now
call transfer_to_handler.

As transfer_to_handler doesn't do the actual transfer anymore,
also name it prepare_transfer_to_handler. The following patches
will progressively remove the use of transfer_to_handler label.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/7f757c52518ab1d7b27ad5113b10f860e803f467.1615552867.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2021-03-12 12:50:39 +00:00 committed by Michael Ellerman
parent 719e7e212c
commit bce4c26a4e
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/kernel/entry_32.S
View File

@ -86,6 +86,8 @@ _ASM_NOKPROBE_SYMBOL(transfer_to_handler_full)
.globl transfer_to_handler .globl transfer_to_handler
transfer_to_handler: transfer_to_handler:
.globl prepare_transfer_to_handler
prepare_transfer_to_handler:
SAVE_NVGPRS(r11) SAVE_NVGPRS(r11)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
stw r2,GPR2(r11) stw r2,GPR2(r11)
@ -133,6 +135,7 @@ transfer_to_handler_cont:
lwz r2, GPR2(r11) lwz r2, GPR2(r11)
b fast_exception_return b fast_exception_return
#endif #endif
_ASM_NOKPROBE_SYMBOL(prepare_transfer_to_handler)
_ASM_NOKPROBE_SYMBOL(transfer_to_handler) _ASM_NOKPROBE_SYMBOL(transfer_to_handler)
_ASM_NOKPROBE_SYMBOL(transfer_to_handler_cont) _ASM_NOKPROBE_SYMBOL(transfer_to_handler_cont)

4
arch/powerpc/kernel/head_32.h
View File

@ -115,6 +115,10 @@
_ASM_NOKPROBE_SYMBOL(\name\()_virt) _ASM_NOKPROBE_SYMBOL(\name\()_virt)
.endm .endm
.macro prepare_transfer_to_handler
bl prepare_transfer_to_handler
.endm
.macro SYSCALL_ENTRY trapno .macro SYSCALL_ENTRY trapno
mfspr r9, SPRN_SRR1 mfspr r9, SPRN_SRR1
mfspr r10, SPRN_SRR0 mfspr r10, SPRN_SRR0

4
arch/powerpc/kernel/head_booke.h
View File

@ -87,6 +87,10 @@ END_BTB_FLUSH_SECTION
SAVE_4GPRS(3, r11); \ SAVE_4GPRS(3, r11); \
SAVE_2GPRS(7, r11) SAVE_2GPRS(7, r11)
.macro prepare_transfer_to_handler
bl prepare_transfer_to_handler
.endm
.macro SYSCALL_ENTRY trapno intno srr1 .macro SYSCALL_ENTRY trapno intno srr1
mfspr r10, SPRN_SPRG_THREAD mfspr r10, SPRN_SPRG_THREAD
#ifdef CONFIG_KVM_BOOKE_HV #ifdef CONFIG_KVM_BOOKE_HV