GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-22 07:04:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

s390/cio: use basic blocks for i/o inline assemblies

Browse source 
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:52 +02:00 • committed by Martin Schwidefsky
parent 7b4ff87cbf
commit a4d9b97cc3
1 changed files with 82 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
drivers/s390/cio/ioasm.c
View file

@ -12,7 +12,7 @@
#include "orb.h" #include "orb.h"
#include "cio.h" #include "cio.h"
int stsch(struct subchannel_id schid, struct schib *addr) static inline int __stsch(struct subchannel_id schid, struct schib *addr)
{ {
register struct subchannel_id reg1 asm ("1") = schid; register struct subchannel_id reg1 asm ("1") = schid;
int ccode = -EIO; int ccode = -EIO;
@ -26,13 +26,21 @@ int stsch(struct subchannel_id schid, struct schib *addr)
: "+d" (ccode), "=m" (*addr) : "+d" (ccode), "=m" (*addr)
: "d" (reg1), "a" (addr) : "d" (reg1), "a" (addr)
: "cc"); : "cc");
return ccode;
}
int stsch(struct subchannel_id schid, struct schib *addr)
{
int ccode;
ccode = __stsch(schid, addr);
trace_s390_cio_stsch(schid, addr, ccode); trace_s390_cio_stsch(schid, addr, ccode);
return ccode; return ccode;
} }
EXPORT_SYMBOL(stsch); EXPORT_SYMBOL(stsch);
int msch(struct subchannel_id schid, struct schib *addr) static inline int __msch(struct subchannel_id schid, struct schib *addr)
{ {
register struct subchannel_id reg1 asm ("1") = schid; register struct subchannel_id reg1 asm ("1") = schid;
int ccode = -EIO; int ccode = -EIO;
@ -46,12 +54,20 @@ int msch(struct subchannel_id schid, struct schib *addr)
: "+d" (ccode) : "+d" (ccode)
: "d" (reg1), "a" (addr), "m" (*addr) : "d" (reg1), "a" (addr), "m" (*addr)
: "cc"); : "cc");
return ccode;
}
int msch(struct subchannel_id schid, struct schib *addr)
{
int ccode;
ccode = __msch(schid, addr);
trace_s390_cio_msch(schid, addr, ccode); trace_s390_cio_msch(schid, addr, ccode);
return ccode; return ccode;
} }
int tsch(struct subchannel_id schid, struct irb *addr) static inline int __tsch(struct subchannel_id schid, struct irb *addr)
{ {
register struct subchannel_id reg1 asm ("1") = schid; register struct subchannel_id reg1 asm ("1") = schid;
int ccode; int ccode;
@ -63,12 +79,20 @@ int tsch(struct subchannel_id schid, struct irb *addr)
: "=d" (ccode), "=m" (*addr) : "=d" (ccode), "=m" (*addr)
: "d" (reg1), "a" (addr) : "d" (reg1), "a" (addr)
: "cc"); : "cc");
return ccode;
}
int tsch(struct subchannel_id schid, struct irb *addr)
{
int ccode;
ccode = __tsch(schid, addr);
trace_s390_cio_tsch(schid, addr, ccode); trace_s390_cio_tsch(schid, addr, ccode);
return ccode; return ccode;
} }
int ssch(struct subchannel_id schid, union orb *addr) static inline int __ssch(struct subchannel_id schid, union orb *addr)
{ {
register struct subchannel_id reg1 asm("1") = schid; register struct subchannel_id reg1 asm("1") = schid;
int ccode = -EIO; int ccode = -EIO;
@ -82,13 +106,21 @@ int ssch(struct subchannel_id schid, union orb *addr)
: "+d" (ccode) : "+d" (ccode)
: "d" (reg1), "a" (addr), "m" (*addr) : "d" (reg1), "a" (addr), "m" (*addr)
: "cc", "memory"); : "cc", "memory");
return ccode;
}
int ssch(struct subchannel_id schid, union orb *addr)
{
int ccode;
ccode = __ssch(schid, addr);
trace_s390_cio_ssch(schid, addr, ccode); trace_s390_cio_ssch(schid, addr, ccode);
return ccode; return ccode;
} }
EXPORT_SYMBOL(ssch); EXPORT_SYMBOL(ssch);
int csch(struct subchannel_id schid) static inline int __csch(struct subchannel_id schid)
{ {
register struct subchannel_id reg1 asm("1") = schid; register struct subchannel_id reg1 asm("1") = schid;
int ccode; int ccode;
@ -100,6 +132,14 @@ int csch(struct subchannel_id schid)
: "=d" (ccode) : "=d" (ccode)
: "d" (reg1) : "d" (reg1)
: "cc"); : "cc");
return ccode;
}
int csch(struct subchannel_id schid)
{
int ccode;
ccode = __csch(schid);
trace_s390_cio_csch(schid, ccode); trace_s390_cio_csch(schid, ccode);
return ccode; return ccode;
@ -140,7 +180,7 @@ int chsc(void *chsc_area)
} }
EXPORT_SYMBOL(chsc); EXPORT_SYMBOL(chsc);
int rchp(struct chp_id chpid) static inline int __rchp(struct chp_id chpid)
{ {
register struct chp_id reg1 asm ("1") = chpid; register struct chp_id reg1 asm ("1") = chpid;
int ccode; int ccode;
@ -151,12 +191,20 @@ int rchp(struct chp_id chpid)
" ipm %0\n" " ipm %0\n"
" srl %0,28" " srl %0,28"
: "=d" (ccode) : "d" (reg1) : "cc"); : "=d" (ccode) : "d" (reg1) : "cc");
return ccode;
}
int rchp(struct chp_id chpid)
{
int ccode;
ccode = __rchp(chpid);
trace_s390_cio_rchp(chpid, ccode); trace_s390_cio_rchp(chpid, ccode);
return ccode; return ccode;
} }
int rsch(struct subchannel_id schid) static inline int __rsch(struct subchannel_id schid)
{ {
register struct subchannel_id reg1 asm("1") = schid; register struct subchannel_id reg1 asm("1") = schid;
int ccode; int ccode;
@ -168,12 +216,21 @@ int rsch(struct subchannel_id schid)
: "=d" (ccode) : "=d" (ccode)
: "d" (reg1) : "d" (reg1)
: "cc", "memory"); : "cc", "memory");
return ccode;
}
int rsch(struct subchannel_id schid)
{
int ccode;
ccode = __rsch(schid);
trace_s390_cio_rsch(schid, ccode); trace_s390_cio_rsch(schid, ccode);
return ccode; return ccode;
} }
int hsch(struct subchannel_id schid) static inline int __hsch(struct subchannel_id schid)
{ {
register struct subchannel_id reg1 asm("1") = schid; register struct subchannel_id reg1 asm("1") = schid;
int ccode; int ccode;
@ -185,12 +242,20 @@ int hsch(struct subchannel_id schid)
: "=d" (ccode) : "=d" (ccode)
: "d" (reg1) : "d" (reg1)
: "cc"); : "cc");
return ccode;
}
int hsch(struct subchannel_id schid)
{
int ccode;
ccode = __hsch(schid);
trace_s390_cio_hsch(schid, ccode); trace_s390_cio_hsch(schid, ccode);
return ccode; return ccode;
} }
int xsch(struct subchannel_id schid) static inline int __xsch(struct subchannel_id schid)
{ {
register struct subchannel_id reg1 asm("1") = schid; register struct subchannel_id reg1 asm("1") = schid;
int ccode; int ccode;
@ -202,6 +267,14 @@ int xsch(struct subchannel_id schid)
: "=d" (ccode) : "=d" (ccode)
: "d" (reg1) : "d" (reg1)
: "cc"); : "cc");
return ccode;
}
int xsch(struct subchannel_id schid)
{
int ccode;
ccode = __xsch(schid);
trace_s390_cio_xsch(schid, ccode); trace_s390_cio_xsch(schid, ccode);
return ccode; return ccode;