Commit ac0c06a1 authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390/amode31: use SYM* macros instead of ENTRY(), etc. 



Consistently use the SYM* family of macros instead of the
deprecated ENTRY(), ENDPROC(), etc. family of macros.

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 45769052

arch/s390/kernel/text_amode31.S

+31 −44
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
/*

 * int _diag14_amode31(unsigned long rx, unsigned long ry1, unsigned long subcode)

 */

ENTRY(_diag14_amode31)

SYM_FUNC_START(_diag14_amode31)

	lgr	%r1,%r2

	lgr	%r2,%r3

	lgr	%r3,%r4
@@ -42,12 +42,12 @@ ENTRY(_diag14_amode31) 
	lgfr	%r2,%r5

	BR_EX_AMODE31_r14

	EX_TABLE_AMODE31(.Ldiag14_ex, .Ldiag14_fault)

ENDPROC(_diag14_amode31)

SYM_FUNC_END(_diag14_amode31)



/*

 * int _diag210_amode31(struct diag210 *addr)

 */

ENTRY(_diag210_amode31)

SYM_FUNC_START(_diag210_amode31)

	lgr	%r1,%r2

	lhi	%r2,-1

	sam31
@@ -60,12 +60,12 @@ ENTRY(_diag210_amode31) 
	lgfr	%r2,%r2

	BR_EX_AMODE31_r14

	EX_TABLE_AMODE31(.Ldiag210_ex, .Ldiag210_fault)

ENDPROC(_diag210_amode31)

SYM_FUNC_END(_diag210_amode31)



/*

 * int diag8c(struct diag8c *addr, struct ccw_dev_id *devno, size_t len)

*/

ENTRY(_diag8c_amode31)

SYM_FUNC_START(_diag8c_amode31)

	llgf	%r3,0(%r3)

	sam31

	diag	%r2,%r4,0x8c
@@ -74,11 +74,11 @@ ENTRY(_diag8c_amode31) 
	lgfr	%r2,%r3

	BR_EX_AMODE31_r14

	EX_TABLE_AMODE31(.Ldiag8c_ex, .Ldiag8c_ex)

ENDPROC(_diag8c_amode31)

SYM_FUNC_END(_diag8c_amode31)

/*

 * int _diag26c_amode31(void *req, void *resp, enum diag26c_sc subcode)

 */

ENTRY(_diag26c_amode31)

SYM_FUNC_START(_diag26c_amode31)

	lghi	%r5,-EOPNOTSUPP

	sam31

	diag	%r2,%r4,0x26c
@@ -87,42 +87,42 @@ ENTRY(_diag26c_amode31) 
	lgfr	%r2,%r5

	BR_EX_AMODE31_r14

	EX_TABLE_AMODE31(.Ldiag26c_ex, .Ldiag26c_ex)

ENDPROC(_diag26c_amode31)

SYM_FUNC_END(_diag26c_amode31)



/*

 * void _diag0c_amode31(struct hypfs_diag0c_entry *entry)

 */

ENTRY(_diag0c_amode31)

SYM_FUNC_START(_diag0c_amode31)

	sam31

	diag	%r2,%r2,0x0c

	sam64

	BR_EX_AMODE31_r14

ENDPROC(_diag0c_amode31)

SYM_FUNC_END(_diag0c_amode31)



/*

 * void _diag308_reset_amode31(void)

 *

 * Calls diag 308 subcode 1 and continues execution

 */

ENTRY(_diag308_reset_amode31)

	larl	%r4,.Lctlregs		# Save control registers

SYM_FUNC_START(_diag308_reset_amode31)

	larl	%r4,ctlregs		# Save control registers

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

	lg	%r2,0(%r4)		# Disable lowcore protection

	nilh	%r2,0xefff

	larl	%r4,.Lctlreg0

	larl	%r4,ctlreg0

	stg	%r2,0(%r4)

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

	larl	%r4,.Lfpctl		# Floating point control register

	larl	%r4,fpctl		# Floating point control register

	stfpc	0(%r4)

	larl	%r4,.Lprefix		# Save prefix register

	larl	%r4,prefix		# Save prefix register

	stpx	0(%r4)

	larl	%r4,.Lprefix_zero	# Set prefix register to 0

	larl	%r4,prefix_zero	# Set prefix register to 0

	spx	0(%r4)

	larl	%r4,.Lcontinue_psw	# Save PSW flags

	larl	%r4,continue_psw	# Save PSW flags

	epsw	%r2,%r3

	stm	%r2,%r3,0(%r4)

	larl	%r4,.Lrestart_part2	# Setup restart PSW at absolute 0

	larl	%r3,.Lrestart_diag308_psw

	larl	%r3,restart_diag308_psw

	og	%r4,0(%r3)		# Save PSW

	lghi	%r3,0

	sturg	%r4,%r3			# Use sturg, because of large pages
@@ -134,39 +134,26 @@ ENTRY(_diag308_reset_amode31) 
	lhi	%r1,2			# Use mode 2 = ESAME (dump)

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

	sam64				# Switch to 64 bit addressing mode

	larl	%r4,.Lctlregs		# Restore control registers

	larl	%r4,ctlregs		# Restore control registers

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

	larl	%r4,.Lfpctl		# Restore floating point ctl register

	larl	%r4,fpctl		# Restore floating point ctl register

	lfpc	0(%r4)

	larl	%r4,.Lprefix		# Restore prefix register

	larl	%r4,prefix		# Restore prefix register

	spx	0(%r4)

	larl	%r4,.Lcontinue_psw	# Restore PSW flags

	larl	%r4,continue_psw	# Restore PSW flags

	larl	%r2,.Lcontinue

	stg	%r2,8(%r4)

	lpswe	0(%r4)

.Lcontinue:

	BR_EX_AMODE31_r14

ENDPROC(_diag308_reset_amode31)

SYM_FUNC_END(_diag308_reset_amode31)



	.section .amode31.data,"aw",@progbits

.align	8

.Lrestart_diag308_psw:

	.long	0x00080000,0x80000000



.align 8

.Lcontinue_psw:

	.quad	0,0



.align 8

.Lctlreg0:

	.quad	0

.Lctlregs:

	.rept	16

	.quad	0

	.endr

.Lfpctl:

	.long	0

.Lprefix:

	.long	0

.Lprefix_zero:

	.long	0
 
	.balign	8

SYM_DATA_LOCAL(restart_diag308_psw,	.long 0x00080000,0x80000000)

SYM_DATA_LOCAL(continue_psw,		.quad 0,0)

SYM_DATA_LOCAL(ctlreg0,			.quad 0)

SYM_DATA_LOCAL(ctlregs,			.fill 16,8,0)

SYM_DATA_LOCAL(fpctl,			.long 0)

SYM_DATA_LOCAL(prefix,			.long 0)

SYM_DATA_LOCAL(prefix_zero,		.long 0)