SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dma: Let dma_memory_set() take MemTxAttrs argument

Browse Source 
Let devices specify transaction attributes when calling
dma_memory_set().

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-3-philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-09-03 10:28:32 +02:00
parent 7ccb391ccd
commit 7a36e42d91
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/nvram/fw_cfg.c
View File

@ -399,7 +399,8 @@ static void fw_cfg_dma_transfer(FWCfgState *s)
* tested before. * tested before.
*/ */
if (read) { if (read) {
if (dma_memory_set(s->dma_as, dma.address, 0, len)) { if (dma_memory_set(s->dma_as, dma.address, 0, len,
MEMTXATTRS_UNSPECIFIED)) {
dma.control |= FW_CFG_DMA_CTL_ERROR; dma.control |= FW_CFG_DMA_CTL_ERROR;
} }
} }

3
include/hw/ppc/spapr_vio.h
View File

@ -111,7 +111,8 @@ static inline int spapr_vio_dma_write(SpaprVioDevice *dev, uint64_t taddr,
static inline int spapr_vio_dma_set(SpaprVioDevice *dev, uint64_t taddr, static inline int spapr_vio_dma_set(SpaprVioDevice *dev, uint64_t taddr,
uint8_t c, uint32_t size) uint8_t c, uint32_t size)
{ {
return (dma_memory_set(&dev->as, taddr, c, size) != 0) ? return (dma_memory_set(&dev->as, taddr,
c, size, MEMTXATTRS_UNSPECIFIED) != 0) ?
H_DEST_PARM : H_SUCCESS; H_DEST_PARM : H_SUCCESS;
} }

3
include/sysemu/dma.h
View File

@ -175,9 +175,10 @@ static inline MemTxResult dma_memory_write(AddressSpace *as, dma_addr_t addr,
* @addr: address within that address space * @addr: address within that address space
* @c: constant byte to fill the memory * @c: constant byte to fill the memory
* @len: the number of bytes to fill with the constant byte * @len: the number of bytes to fill with the constant byte
* @attrs: memory transaction attributes
*/ */
MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr, MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr,
uint8_t c, dma_addr_t len); uint8_t c, dma_addr_t len, MemTxAttrs attrs);
/** /**
* address_space_map: Map a physical memory region into a host virtual address. * address_space_map: Map a physical memory region into a host virtual address.

5
softmmu/dma-helpers.c
View File

@ -19,7 +19,7 @@
/* #define DEBUG_IOMMU */ /* #define DEBUG_IOMMU */
MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr, MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr,
uint8_t c, dma_addr_t len) uint8_t c, dma_addr_t len, MemTxAttrs attrs)
{ {
dma_barrier(as, DMA_DIRECTION_FROM_DEVICE); dma_barrier(as, DMA_DIRECTION_FROM_DEVICE);
@ -31,8 +31,7 @@ MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr,
memset(fillbuf, c, FILLBUF_SIZE); memset(fillbuf, c, FILLBUF_SIZE);
while (len > 0) { while (len > 0) {
l = len < FILLBUF_SIZE ? len : FILLBUF_SIZE; l = len < FILLBUF_SIZE ? len : FILLBUF_SIZE;
error |= address_space_write(as, addr, MEMTXATTRS_UNSPECIFIED, error |= address_space_write(as, addr, attrs, fillbuf, l);
fillbuf, l);
len -= l; len -= l;
addr += l; addr += l;
} }