Commit eb546195 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/sigp: use sigp order code defines in assembly code 



Use sigp order code defines in assembly code as well.
With this change all places that use sigp constants should
have been converted to use self describing defines instead
of directly using constants.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent a095a8a9

arch/s390/kernel/base.S

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/linkage.h>

#include <asm/asm-offsets.h>

#include <asm/ptrace.h>

#include <asm/sigp.h>



#ifdef CONFIG_64BIT
@@ -100,7 +101,7 @@ ENTRY(diag308_reset) 
.Lrestart_part2:

	lhi	%r0,0			# Load r0 with zero

	lhi	%r1,2			# Use mode 2 = ESAME (dump)

	sigp	%r1,%r0,0x12		# Switch to ESAME mode

	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE	# Switch to ESAME mode

	sam64				# Switch to 64 bit addressing mode

	larl	%r4,.Lctlregs		# Restore control registers

	lctlg	%c0,%c15,0(%r4)

arch/s390/kernel/entry.S

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/asm-offsets.h>

#include <asm/unistd.h>

#include <asm/page.h>

#include <asm/sigp.h>



__PT_R0      =	__PT_GPRS

__PT_R1      =	__PT_GPRS + 4
@@ -726,12 +727,12 @@ ENTRY(restart_int_handler) 
	lm	%r1,%r3,__LC_RESTART_FN		# load fn, parm & source cpu

	ltr	%r3,%r3				# test source cpu address

	jm	1f				# negative -> skip source stop

0:	sigp	%r4,%r3,1			# sigp sense to source cpu

0:	sigp	%r4,%r3,SIGP_SENSE		# sigp sense to source cpu

	brc	10,0b				# wait for status stored

1:	basr	%r14,%r1			# call function

	stap	__SF_EMPTY(%r15)		# store cpu address

	lh	%r3,__SF_EMPTY(%r15)

2:	sigp	%r4,%r3,5			# sigp stop to current cpu

2:	sigp	%r4,%r3,SIGP_STOP		# sigp stop to current cpu

	brc	2,2b

3:	j	3b

arch/s390/kernel/entry64.S

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/asm-offsets.h>

#include <asm/unistd.h>

#include <asm/page.h>

#include <asm/sigp.h>



__PT_R0      =	__PT_GPRS

__PT_R1      =	__PT_GPRS + 8
@@ -753,12 +754,12 @@ ENTRY(restart_int_handler) 
	lmg	%r1,%r3,__LC_RESTART_FN		# load fn, parm & source cpu

	ltgr	%r3,%r3				# test source cpu address

	jm	1f				# negative -> skip source stop

0:	sigp	%r4,%r3,1			# sigp sense to source cpu

0:	sigp	%r4,%r3,SIGP_SENSE		# sigp sense to source cpu

	brc	10,0b				# wait for status stored

1:	basr	%r14,%r1			# call function

	stap	__SF_EMPTY(%r15)		# store cpu address

	llgh	%r3,__SF_EMPTY(%r15)

2:	sigp	%r4,%r3,5			# sigp stop to current cpu

2:	sigp	%r4,%r3,SIGP_STOP		# sigp stop to current cpu

	brc	2,2b

3:	j	3b

arch/s390/kernel/head_kdump.S

+4 −2
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
 * Author(s): Michael Holzheu <holzheu@linux.vnet.ibm.com>

 */



#include <asm/sigp.h>



#define DATAMOVER_ADDR	0x4000

#define COPY_PAGE_ADDR	0x6000
@@ -19,7 +21,7 @@ 
.align 2

.Lep_startup_kdump:

	lhi	%r1,2				# mode 2 = esame (dump)

	sigp	%r1,%r0,0x12			# Switch to esame mode

	sigp	%r1,%r0,SIGP_SET_ARCHITECTURE	# Switch to esame mode

	sam64					# Switch to 64 bit addressing

	basr	%r13,0

.Lbase:
@@ -88,7 +90,7 @@ startup_kdump_relocated: 
	sam31					# Switch to 31 bit addr mode

	sr	%r1,%r1				# Erase register r1

	sr	%r2,%r2				# Erase register r2

	sigp	%r1,%r2,0x12			# Switch to 31 bit arch mode

	sigp	%r1,%r2,SIGP_SET_ARCHITECTURE	# Switch to 31 bit arch mode

	lpsw	0				# Start new kernel...

.align	8

.Lrestart_psw:

arch/s390/kernel/reipl.S

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/linkage.h>

#include <asm/asm-offsets.h>

#include <asm/sigp.h>



#

# store_status: Empty implementation until kdump is supported on 31 bit
@@ -60,7 +61,7 @@ ENTRY(do_reipl_asm) 
		bas	%r14,.Ldisab-.Lpg0(%r13)

.L003:		st	%r1,__LC_SUBCHANNEL_ID

		lpsw	0

		sigp	0,0,0(6)

		sigp	0,0,SIGP_RESTART

.Ldisab:	st	%r14,.Ldispsw+4-.Lpg0(%r13)

		lpsw	.Ldispsw-.Lpg0(%r13)

		.align	8

CRA Git | Maintained and supported by SUSTech CRA and CCSE