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

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

s390/pci: use basic blocks for pci 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>
Acked-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent eb090ad2

arch/s390/pci/pci_insn.c

+11 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ void zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc) 
}



/* PCI Load */

static inline int __pcilg(u64 *data, u64 req, u64 offset, u8 *status)

static inline int ____pcilg(u64 *data, u64 req, u64 offset, u8 *status)

{

	register u64 __req asm("2") = req;

	register u64 __offset asm("3") = offset;
@@ -116,6 +116,16 @@ static inline int __pcilg(u64 *data, u64 req, u64 offset, u8 *status) 
		:  "d" (__offset)

		: "cc");

	*status = __req >> 24 & 0xff;

	*data = __data;

	return cc;

}



static inline int __pcilg(u64 *data, u64 req, u64 offset, u8 *status)

{

	u64 __data;

	int cc;



	cc = ____pcilg(&__data, req, offset, status);

	if (!cc)

		*data = __data;