OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens 2016-06-20 14:03:25 +02:00 committed by Martin Schwidefsky
parent eb090ad2ad
commit 7b411ac6b7
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/s390/pci/pci_insn.c
View File

@ -99,7 +99,7 @@ void zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc)
} }
/* PCI Load */ /* 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 __req asm("2") = req;
register u64 __offset asm("3") = offset; register u64 __offset asm("3") = offset;
@ -116,6 +116,16 @@ static inline int __pcilg(u64 *data, u64 req, u64 offset, u8 *status)
: "d" (__offset) : "d" (__offset)
: "cc"); : "cc");
*status = __req >> 24 & 0xff; *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) if (!cc)
*data = __data; *data = __data;