OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

dma: Let dma_memory_rw_relaxed() take MemTxAttrs argument

Browse Source 
We will add the MemTxAttrs argument to dma_memory_rw() in
the next commit. Since dma_memory_rw_relaxed() is only used
by dma_memory_rw(), modify it first in a separate commit to
keep the next commit easier to review.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20211223115554.3155328-4-philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-09-03 09:30:10 +02:00
parent 7a36e42d91
commit 4afd0f2f22
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/sysemu/dma.h
View File

@ -83,9 +83,10 @@ static inline bool dma_memory_valid(AddressSpace *as,
static inline MemTxResult dma_memory_rw_relaxed(AddressSpace *as, static inline MemTxResult dma_memory_rw_relaxed(AddressSpace *as,
dma_addr_t addr, dma_addr_t addr,
void *buf, dma_addr_t len, void *buf, dma_addr_t len,
DMADirection dir) DMADirection dir,
MemTxAttrs attrs)
{ {
return address_space_rw(as, addr, MEMTXATTRS_UNSPECIFIED, return address_space_rw(as, addr, attrs,
buf, len, dir == DMA_DIRECTION_FROM_DEVICE); buf, len, dir == DMA_DIRECTION_FROM_DEVICE);
} }
@ -93,7 +94,9 @@ static inline MemTxResult dma_memory_read_relaxed(AddressSpace *as,
dma_addr_t addr, dma_addr_t addr,
void *buf, dma_addr_t len) void *buf, dma_addr_t len)
{ {
return dma_memory_rw_relaxed(as, addr, buf, len, DMA_DIRECTION_TO_DEVICE); return dma_memory_rw_relaxed(as, addr, buf, len,
DMA_DIRECTION_TO_DEVICE,
MEMTXATTRS_UNSPECIFIED);
} }
static inline MemTxResult dma_memory_write_relaxed(AddressSpace *as, static inline MemTxResult dma_memory_write_relaxed(AddressSpace *as,
@ -102,7 +105,8 @@ static inline MemTxResult dma_memory_write_relaxed(AddressSpace *as,
dma_addr_t len) dma_addr_t len)
{ {
return dma_memory_rw_relaxed(as, addr, (void *)buf, len, return dma_memory_rw_relaxed(as, addr, (void *)buf, len,
DMA_DIRECTION_FROM_DEVICE); DMA_DIRECTION_FROM_DEVICE,
MEMTXATTRS_UNSPECIFIED);
} }
/** /**
@ -124,7 +128,8 @@ static inline MemTxResult dma_memory_rw(AddressSpace *as, dma_addr_t addr,
{ {
dma_barrier(as, dir); dma_barrier(as, dir);
return dma_memory_rw_relaxed(as, addr, buf, len, dir); return dma_memory_rw_relaxed(as, addr, buf, len, dir,
MEMTXATTRS_UNSPECIFIED);
} }
/** /**