Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

s390/facilities: use stfl mnemonic instead of insn magic 



Now that 31 bit support is gone, the assembler always knows about the
stfl instruction. Therefore lets use a readable mnemonic.  Also remove
the not needed extable entry for the inline assembly and fix the
output constraint.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 419123f9

arch/s390/include/asm/facility.h

+2 −4
Original line number Diff line number Diff line
@@ -44,10 +44,8 @@ static inline void stfle(u64 *stfle_fac_list, int size) 


	preempt_disable();

	asm volatile(

		"	.insn s,0xb2b10000,0(0)\n" /* stfl */

		"0:\n"

		EX_TABLE(0b, 0b)

		: "+m" (S390_lowcore.stfl_fac_list));

		"	stfl	0(0)\n"

		: "=m" (S390_lowcore.stfl_fac_list));

	nr = 4; /* bytes stored by stfl */

	memcpy(stfle_fac_list, &S390_lowcore.stfl_fac_list, 4);

	if (S390_lowcore.stfl_fac_list & 0x01000000) {

arch/s390/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ ENTRY(startup_kdump) 
	mvc	__LC_LAST_UPDATE_TIMER(8),6f-.LPG0(%r13)

	xc	__LC_STFL_FAC_LIST(8),__LC_STFL_FAC_LIST

	# check capabilities against MARCH_{G5,Z900,Z990,Z9_109,Z10}

	.insn	s,0xb2b10000,0		# store facilities @ __LC_STFL_FAC_LIST

	stfl	0(%r0)			# store facilities @ __LC_STFL_FAC_LIST

	tm	__LC_STFL_FAC_LIST,0x01	# stfle available ?

	jz	0f

	la	%r0,1