Skip to content

Commit 4064b71

Browse files
svens-s390Vasily Gorbik
authored andcommitted
s390/entry: Make restart_int_handler() ready for lowcore relocation
In preparation of having lowcore at different address than zero, add the base register to all lowcore accesses in restart_int_handler(). Reviewed-by: Heiko Carstens <[email protected]> Signed-off-by: Sven Schnelle <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 0001b7b commit 4064b71

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

arch/s390/kernel/entry.S

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -573,15 +573,17 @@ SYM_CODE_START(restart_int_handler)
573573
0: larl %r15,daton_psw
574574
lpswe 0(%r15) # turn dat on, keep irqs off
575575
.Ldaton:
576-
lg %r15,__LC_RESTART_STACK
576+
GET_LC %r15
577+
lg %r15,__LC_RESTART_STACK(%r15)
577578
xc STACK_FRAME_OVERHEAD(__PT_SIZE,%r15),STACK_FRAME_OVERHEAD(%r15)
578579
stmg %r0,%r14,STACK_FRAME_OVERHEAD+__PT_R0(%r15)
579-
mvc STACK_FRAME_OVERHEAD+__PT_R15(8,%r15),__LC_SAVE_AREA_RESTART
580-
mvc STACK_FRAME_OVERHEAD+__PT_PSW(16,%r15),__LC_RST_OLD_PSW
580+
GET_LC %r13
581+
mvc STACK_FRAME_OVERHEAD+__PT_R15(8,%r15),__LC_SAVE_AREA_RESTART(%r13)
582+
mvc STACK_FRAME_OVERHEAD+__PT_PSW(16,%r15),__LC_RST_OLD_PSW(%r13)
581583
xc 0(STACK_FRAME_OVERHEAD,%r15),0(%r15)
582-
lg %r1,__LC_RESTART_FN # load fn, parm & source cpu
583-
lg %r2,__LC_RESTART_DATA
584-
lgf %r3,__LC_RESTART_SOURCE
584+
lg %r1,__LC_RESTART_FN(%r13) # load fn, parm & source cpu
585+
lg %r2,__LC_RESTART_DATA(%r13)
586+
lgf %r3,__LC_RESTART_SOURCE(%r13)
585587
ltgr %r3,%r3 # test source cpu address
586588
jm 1f # negative -> skip source stop
587589
0: sigp %r4,%r3,SIGP_SENSE # sigp sense to source cpu

0 commit comments

Comments
 (0)