Skip to content

Commit 6908f8f

Browse files
svens-s390Vasily Gorbik
authored andcommitted
s390/entry: Add base register to SIEEXIT macro
In preparation of having lowcore at different address than zero, add the base register to SIEEXIT. No functional change, because %r0 is passed to the macro. Reviewed-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Sven Schnelle <svens@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent ca2f0a2 commit 6908f8f

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

arch/s390/kernel/entry.S

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ _LPP_OFFSET = __LC_LPP
121121
.endm
122122

123123
#if IS_ENABLED(CONFIG_KVM)
124-
.macro SIEEXIT sie_control
125-
lg %r9,\sie_control # get control block pointer
126-
ni __SIE_PROG0C+3(%r9),0xfe # no longer in SIE
127-
lctlg %c1,%c1,__LC_KERNEL_ASCE # load primary asce
128-
lg %r9,__LC_CURRENT
124+
.macro SIEEXIT sie_control,lowcore
125+
lg %r9,\sie_control # get control block pointer
126+
ni __SIE_PROG0C+3(%r9),0xfe # no longer in SIE
127+
lctlg %c1,%c1,__LC_KERNEL_ASCE(\lowcore) # load primary asce
128+
lg %r9,__LC_CURRENT(\lowcore)
129129
mvi __TI_sie(%r9),0
130130
larl %r9,sie_exit # skip forward to sie_exit
131131
.endm
@@ -349,7 +349,7 @@ SYM_CODE_START(pgm_check_handler)
349349
clc __GMAP_ASCE(8,%r12), __PT_CR1(%r11)
350350
jne 5f
351351
BPENTER __SF_SIE_FLAGS(%r10),_TIF_ISOLATE_BP_GUEST
352-
SIEEXIT __SF_SIE_CONTROL(%r10)
352+
SIEEXIT __SF_SIE_CONTROL(%r10),%r0
353353
#endif
354354
5: stmg %r8,%r9,__PT_PSW(%r11)
355355
# clear user controlled registers to prevent speculative use
@@ -404,7 +404,7 @@ SYM_CODE_START(\name)
404404
tm __TI_sie(%r10),0xff
405405
jz 0f
406406
BPENTER __SF_SIE_FLAGS(%r15),_TIF_ISOLATE_BP_GUEST
407-
SIEEXIT __SF_SIE_CONTROL(%r15)
407+
SIEEXIT __SF_SIE_CONTROL(%r15),%r0
408408
#endif
409409
0: CHECK_STACK __LC_SAVE_AREA_ASYNC
410410
aghi %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
@@ -491,7 +491,7 @@ SYM_CODE_START(mcck_int_handler)
491491
lg %r10,__LC_PCPU
492492
oi __PCPU_FLAGS+7(%r10), _CIF_MCCK_GUEST
493493
4: BPENTER __SF_SIE_FLAGS(%r15),_TIF_ISOLATE_BP_GUEST
494-
SIEEXIT __SF_SIE_CONTROL(%r15)
494+
SIEEXIT __SF_SIE_CONTROL(%r15),%r0
495495
#endif
496496
.Lmcck_user:
497497
lg %r15,__LC_MCCK_STACK

0 commit comments

Comments
 (0)