leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/cpumf: use basic block for ecctr inline assembly

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>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens 2016-06-20 14:06:54 +02:00 committed by Martin Schwidefsky
parent e030c1125e
commit e238c15e52
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/s390/include/asm/cpu_mf.h
View File

@ -169,16 +169,27 @@ static inline int lcctl(u64 ctl)
} }
/* Extract CPU counter */ /* Extract CPU counter */
static inline int ecctr(u64 ctr, u64 *val) static inline int __ecctr(u64 ctr, u64 *content)
{ {
register u64 content asm("4") = 0; register u64 _content asm("4") = 0;
int cc; int cc;
asm volatile ( asm volatile (
" .insn rre,0xb2e40000,%0,%2\n" " .insn rre,0xb2e40000,%0,%2\n"
" ipm %1\n" " ipm %1\n"
" srl %1,28\n" " srl %1,28\n"
: "=d" (content), "=d" (cc) : "d" (ctr) : "cc"); : "=d" (_content), "=d" (cc) : "d" (ctr) : "cc");
*content = _content;
return cc;
}
/* Extract CPU counter */
static inline int ecctr(u64 ctr, u64 *val)
{
u64 content;
int cc;
cc = __ecctr(ctr, &content);
if (!cc) if (!cc)
*val = content; *val = content;
return cc; return cc;