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

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

s390/smp: use basic blocks for sigp inline assemblies 



Use only simple inline assemblies which consist of a single basic
block if the register asm construct is being used.

Otherwise gcc would generate broken code if the compiler option
--sanitize-coverage=trace-pc would be used.

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

arch/s390/include/asm/sigp.h

+14 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


#ifndef __ASSEMBLY__



static inline int __pcpu_sigp(u16 addr, u8 order, unsigned long parm,

static inline int ____pcpu_sigp(u16 addr, u8 order, unsigned long parm,

				u32 *status)

{

	register unsigned long reg1 asm ("1") = parm;
@@ -48,11 +48,22 @@ static inline int __pcpu_sigp(u16 addr, u8 order, unsigned long parm, 
		"	ipm	%0\n"

		"	srl	%0,28\n"

		: "=d" (cc), "+d" (reg1) : "d" (addr), "a" (order) : "cc");

	if (status && cc == 1)

	*status = reg1;

	return cc;

}



static inline int __pcpu_sigp(u16 addr, u8 order, unsigned long parm,

			      u32 *status)

{

	u32 _status;

	int cc;



	cc = ____pcpu_sigp(addr, order, parm, &_status);

	if (status && cc == 1)

		*status = _status;

	return cc;

}



#endif /* __ASSEMBLY__ */



#endif /* __S390_ASM_SIGP_H */

arch/s390/kernel/smp.c

+1 −7
Original line number Diff line number Diff line
@@ -318,17 +318,11 @@ static void pcpu_delegate(struct pcpu *pcpu, void (*func)(void *), 
 */

static int pcpu_set_smt(unsigned int mtid)

{

	register unsigned long reg1 asm ("1") = (unsigned long) mtid;

	int cc;



	if (smp_cpu_mtid == mtid)

		return 0;

	asm volatile(

		"	sigp	%1,0,%2	# sigp set multi-threading\n"

		"	ipm	%0\n"

		"	srl	%0,28\n"

		: "=d" (cc) : "d" (reg1), "K" (SIGP_SET_MULTI_THREADING)

		: "cc");

	cc = __pcpu_sigp(0, SIGP_SET_MULTI_THREADING, mtid, NULL);

	if (cc == 0) {

		smp_cpu_mtid = mtid;

		smp_cpu_mt_shift = 0;