Virtualization
/
SLOF
mirror of https://gitlab.com/qemu-project/SLOF.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix inline asm for ci_write_xx 

It was clobbering r4 and not marking it as such, causing
problems among others in virtio-blk

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt 2012-01-10 22:40:12 +11:00 committed by David Gibson
parent 3a7cb8581e
commit 59f6d802f3
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
include/ppcp7/cache.h
View File

@ -20,30 +20,42 @@
#define cache_inhibited_access(type,size) \ #define cache_inhibited_access(type,size) \
static inline type ci_read_##size(type * addr) \ static inline type ci_read_##size(type * addr) \
{ \ { \
type val; \ register uint64_t arg0 asm ("r3"); \
register int bytes asm ("r4") = size / 8; \ register uint64_t arg1 asm ("r4"); \
register uint64_t _addr asm ("r5") = (long)addr; \ register uint64_t arg2 asm ("r5"); \
asm volatile(" li 3, 0x3c \n" /* H_LOGICAL_CI_LOAD */ \ \
arg0 = 0x3c; /* H_LOGICAL_CI_LOAD*/ \
arg1 = size / 8; \
arg2 = (uint64_t)addr; \
\
asm volatile( \
".long 0x44000022 \n" /* HVCALL */ \ ".long 0x44000022 \n" /* HVCALL */ \
" cmpdi cr0,3,0 \n" \ : "=&r" (arg0), "=&r"(arg1), "=&r"(arg2) \
" mr %0,4 \n" \ : "0"(arg0), "1"(arg1), "2"(arg2) \
" beq 0f \n" \ : "r0", "r6", "r7", "r8", "r9", "r10", "r11", \
" li %0,-1 \n" \ "r12", "memory", "cr0", "cr1", "cr5", \
"0:\n" \ "cr6", "cr7", "ctr", "xer"); \
: "=r"(val) \ return arg0 ? -1 : arg1; \
: "r"(bytes), "r"(_addr) \
: "r3", "memory", "cr0"); \
return val; \
} \ } \
static inline void ci_write_##size(type * addr, type data) \ static inline void ci_write_##size(type * addr, type data) \
{ \ { \
register int bytes asm ("r4") = size / 8; \ register uint64_t arg0 asm ("r3"); \
register uint64_t _addr asm ("r5") = (uint64_t)addr; \ register uint64_t arg1 asm ("r4"); \
register uint64_t _data asm ("r6") = (uint64_t)data; \ register uint64_t arg2 asm ("r5"); \
asm volatile(" li 3, 0x40 \n" /* H_LOGICAL_CI_STORE */ \ register uint64_t arg3 asm ("r6"); \
\
arg0 = 0x40; /* H_LOGICAL_CI_STORE*/ \
arg1 = size / 8; \
arg2 = (uint64_t)addr; \
arg3 = (uint64_t)data; \
\
asm volatile( \
".long 0x44000022 \n" /* HVCALL */ \ ".long 0x44000022 \n" /* HVCALL */ \
: : "r"(bytes), "r"(_addr), "r"(_data) \ : "=&r"(arg0),"=&r"(arg1),"=&r"(arg2),"=&r"(arg3) \
: "r3", "memory"); \ : "0"(arg0),"1"(arg1),"2"(arg2),"3"(arg3) \
: "r0", "r7", "r8", "r9", "r10", "r11", \
"r12", "memory", "cr0", "cr1", "cr5", \
"cr6", "cr7", "ctr", "xer"); \
} }
cache_inhibited_access(uint8_t, 8) cache_inhibited_access(uint8_t, 8)