From: Max Filippov Date: Fri, 12 May 2017 18:17:01 +0000 (-0700) Subject: target/xtensa: fix mapping direction in read/write simcalls X-Git-Tag: v2.9.1~84 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4422534796c98fe4e1b8bbef127b5eb009ac697;p=thirdparty%2Fqemu.git target/xtensa: fix mapping direction in read/write simcalls Read and write simcalls map physical memory to access I/O buffers, but 'read' simcall need to map it for writing and 'write' simcall need to map it for reading, i.e. the opposite of what they do now. Fix that. Cc: qemu-stable@nongnu.org Signed-off-by: Max Filippov (cherry picked from commit 30c2afd151cbc38c012f7b441088980807183da6) Signed-off-by: Michael Roth --- diff --git a/target/xtensa/xtensa-semi.c b/target/xtensa/xtensa-semi.c index a888a9dc7b4..98ae28ce71a 100644 --- a/target/xtensa/xtensa-semi.c +++ b/target/xtensa/xtensa-semi.c @@ -173,7 +173,7 @@ void HELPER(simcall)(CPUXtensaState *env) TARGET_PAGE_SIZE - (vaddr & (TARGET_PAGE_SIZE - 1)); uint32_t io_sz = page_left < len ? page_left : len; hwaddr sz = io_sz; - void *buf = cpu_physical_memory_map(paddr, &sz, is_write); + void *buf = cpu_physical_memory_map(paddr, &sz, !is_write); if (buf) { vaddr += io_sz; @@ -182,7 +182,7 @@ void HELPER(simcall)(CPUXtensaState *env) write(fd, buf, io_sz) : read(fd, buf, io_sz); regs[3] = errno_h2g(errno); - cpu_physical_memory_unmap(buf, sz, is_write, sz); + cpu_physical_memory_unmap(buf, sz, !is_write, sz); if (regs[2] == -1) { break; }