| Message ID | 20200904154439.643272-10-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dma: Let the DMA API take MemTxAttrs argument and propagate MemTxResult | expand |
On 9/4/20 8:44 AM, Philippe Mathieu-Daudé wrote: > Let devices specify transaction attributes when calling > dma_memory_set(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > include/hw/ppc/spapr_vio.h | 3 ++- > include/sysemu/dma.h | 3 ++- > dma-helpers.c | 5 ++--- > hw/nvram/fw_cfg.c | 3 ++- > 4 files changed, 8 insertions(+), 6 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
Philippe Mathieu-Daudé <philmd@redhat.com> 于2020年9月4日周五 下午11:49写道： > > Let devices specify transaction attributes when calling > dma_memory_set(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > include/hw/ppc/spapr_vio.h | 3 ++- > include/sysemu/dma.h | 3 ++- > dma-helpers.c | 5 ++--- > hw/nvram/fw_cfg.c | 3 ++- > 4 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h > index f134f6cf574..6e5c0840248 100644 > --- a/include/hw/ppc/spapr_vio.h > +++ b/include/hw/ppc/spapr_vio.h > @@ -116,7 +116,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, > 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; > } > > diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h > index b322aa5947b..d0381f9ae9b 100644 > --- a/include/sysemu/dma.h > +++ b/include/sysemu/dma.h > @@ -175,9 +175,10 @@ static inline MemTxResult dma_memory_write(AddressSpace *as, dma_addr_t addr, > * @addr: address within that address space > * @c: constant byte to fill the memory > * @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, > - 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 DMA controller > diff --git a/dma-helpers.c b/dma-helpers.c > index 4a9e37d6d06..6a9735386dc 100644 > --- a/dma-helpers.c > +++ b/dma-helpers.c > @@ -19,7 +19,7 @@ > /* #define DEBUG_IOMMU */ > > 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); > > @@ -31,8 +31,7 @@ MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr, > memset(fillbuf, c, FILLBUF_SIZE); > while (len > 0) { > l = len < FILLBUF_SIZE ? len : FILLBUF_SIZE; > - error |= address_space_write(as, addr, MEMTXATTRS_UNSPECIFIED, > - fillbuf, l); > + error |= address_space_write(as, addr, attrs, fillbuf, l); > len -= l; > addr += l; > } > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index f3a4728288e..a15de06a10c 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -397,7 +397,8 @@ static void fw_cfg_dma_transfer(FWCfgState *s) > * tested before. > */ > 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; > } > } > -- > 2.26.2 > >
diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h index f134f6cf574..6e5c0840248 100644 --- a/include/hw/ppc/spapr_vio.h +++ b/include/hw/ppc/spapr_vio.h @@ -116,7 +116,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, 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; } diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index b322aa5947b..d0381f9ae9b 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -175,9 +175,10 @@ static inline MemTxResult dma_memory_write(AddressSpace *as, dma_addr_t addr, * @addr: address within that address space * @c: constant byte to fill the memory * @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, - 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 DMA controller diff --git a/dma-helpers.c b/dma-helpers.c index 4a9e37d6d06..6a9735386dc 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -19,7 +19,7 @@ /* #define DEBUG_IOMMU */ 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); @@ -31,8 +31,7 @@ MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr, memset(fillbuf, c, FILLBUF_SIZE); while (len > 0) { l = len < FILLBUF_SIZE ? len : FILLBUF_SIZE; - error |= address_space_write(as, addr, MEMTXATTRS_UNSPECIFIED, - fillbuf, l); + error |= address_space_write(as, addr, attrs, fillbuf, l); len -= l; addr += l; } diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index f3a4728288e..a15de06a10c 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -397,7 +397,8 @@ static void fw_cfg_dma_transfer(FWCfgState *s) * tested before. */ 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; } }
Let devices specify transaction attributes when calling dma_memory_set(). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- include/hw/ppc/spapr_vio.h | 3 ++- include/sysemu/dma.h | 3 ++- dma-helpers.c | 5 ++--- hw/nvram/fw_cfg.c | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-)