| Message ID | 20200904154439.643272-12-philmd@redhat.com |
|---|---|
| State | New |
| 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_rw(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > include/hw/pci/pci.h | 3 ++- > include/sysemu/dma.h | 11 ++++++----- > dma-helpers.c | 3 ++- > hw/intc/spapr_xive.c | 3 ++- > hw/usb/hcd-ohci.c | 10 ++++++---- > 5 files changed, 18 insertions(+), 12 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
Philippe Mathieu-Daudé <philmd@redhat.com> 于2020年9月4日周五 下午11:53写道： > > Let devices specify transaction attributes when calling > dma_memory_rw(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > include/hw/pci/pci.h | 3 ++- > include/sysemu/dma.h | 11 ++++++----- > dma-helpers.c | 3 ++- > hw/intc/spapr_xive.c | 3 ++- > hw/usb/hcd-ohci.c | 10 ++++++---- > 5 files changed, 18 insertions(+), 12 deletions(-) > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index 896cef9ad47..0c3217e019c 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -788,7 +788,8 @@ static inline AddressSpace *pci_get_address_space(PCIDevice *dev) > static inline int pci_dma_rw(PCIDevice *dev, dma_addr_t addr, > void *buf, dma_addr_t len, DMADirection dir) > { > - return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); > + return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, > + dir, MEMTXATTRS_UNSPECIFIED); > } > > static inline int pci_dma_read(PCIDevice *dev, dma_addr_t addr, > diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h > index 59331ec0bd3..0695d430119 100644 > --- a/include/sysemu/dma.h > +++ b/include/sysemu/dma.h > @@ -121,15 +121,15 @@ static inline MemTxResult dma_memory_write_relaxed(AddressSpace *as, > * @buf: buffer with the data transferred > * @len: the number of bytes to read or write > * @dir: indicates the transfer direction > + * @attrs: memory transaction attributes > */ > static inline MemTxResult dma_memory_rw(AddressSpace *as, dma_addr_t addr, > void *buf, dma_addr_t len, > - DMADirection dir) > + DMADirection dir, MemTxAttrs attrs) > { > dma_barrier(as, dir); > > - return dma_memory_rw_relaxed(as, addr, buf, len, dir, > - MEMTXATTRS_UNSPECIFIED); > + return dma_memory_rw_relaxed(as, addr, buf, len, dir, attrs); > } > > /** > @@ -147,7 +147,8 @@ static inline MemTxResult dma_memory_rw(AddressSpace *as, dma_addr_t addr, > static inline MemTxResult dma_memory_read(AddressSpace *as, dma_addr_t addr, > void *buf, dma_addr_t len) > { > - return dma_memory_rw(as, addr, buf, len, DMA_DIRECTION_TO_DEVICE); > + return dma_memory_rw(as, addr, buf, len, > + DMA_DIRECTION_TO_DEVICE, MEMTXATTRS_UNSPECIFIED); > } > > /** > @@ -166,7 +167,7 @@ static inline MemTxResult dma_memory_write(AddressSpace *as, dma_addr_t addr, > const void *buf, dma_addr_t len) > { > return dma_memory_rw(as, addr, (void *)buf, len, > - DMA_DIRECTION_FROM_DEVICE); > + DMA_DIRECTION_FROM_DEVICE, MEMTXATTRS_UNSPECIFIED); > } > > /** > diff --git a/dma-helpers.c b/dma-helpers.c > index 6a9735386dc..6c3b2200f16 100644 > --- a/dma-helpers.c > +++ b/dma-helpers.c > @@ -305,7 +305,8 @@ static uint64_t dma_buf_rw(uint8_t *ptr, int32_t len, QEMUSGList *sg, > while (len > 0) { > ScatterGatherEntry entry = sg->sg[sg_cur_index++]; > int32_t xfer = MIN(len, entry.len); > - dma_memory_rw(sg->as, entry.base, ptr, xfer, dir); > + dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, > + MEMTXATTRS_UNSPECIFIED); > ptr += xfer; > len -= xfer; > resid -= xfer; > diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c > index 4bd0d606ba1..dbf73a8bf47 100644 > --- a/hw/intc/spapr_xive.c > +++ b/hw/intc/spapr_xive.c > @@ -1666,7 +1666,8 @@ static target_ulong h_int_esb(PowerPCCPU *cpu, > mmio_addr = xive->vc_base + xive_source_esb_mgmt(xsrc, lisn) + offset; > > if (dma_memory_rw(&address_space_memory, mmio_addr, &data, 8, > - (flags & SPAPR_XIVE_ESB_STORE))) { > + (flags & SPAPR_XIVE_ESB_STORE), > + MEMTXATTRS_UNSPECIFIED)) { > qemu_log_mask(LOG_GUEST_ERROR, "XIVE: failed to access ESB @0x%" > HWADDR_PRIx "\n", mmio_addr); > return H_HARDWARE; > diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c > index 1e6e85e86a8..bac1adf439c 100644 > --- a/hw/usb/hcd-ohci.c > +++ b/hw/usb/hcd-ohci.c > @@ -586,7 +586,8 @@ static int ohci_copy_td(OHCIState *ohci, struct ohci_td *td, > if (n > len) > n = len; > > - if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, n, dir)) { > + if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, > + n, dir, MEMTXATTRS_UNSPECIFIED)) { > return -1; > } > if (n == len) { > @@ -595,7 +596,7 @@ static int ohci_copy_td(OHCIState *ohci, struct ohci_td *td, > ptr = td->be & ~0xfffu; > buf += n; > if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, > - len - n, dir)) { > + len - n, dir, MEMTXATTRS_UNSPECIFIED)) { > return -1; > } > return 0; > @@ -613,7 +614,8 @@ static int ohci_copy_iso_td(OHCIState *ohci, > if (n > len) > n = len; > > - if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, n, dir)) { > + if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, > + n, dir, MEMTXATTRS_UNSPECIFIED)) { > return -1; > } > if (n == len) { > @@ -622,7 +624,7 @@ static int ohci_copy_iso_td(OHCIState *ohci, > ptr = end_addr & ~0xfffu; > buf += n; > if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, > - len - n, dir)) { > + len - n, dir, MEMTXATTRS_UNSPECIFIED)) { > return -1; > } > return 0; > -- > 2.26.2 > >
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 896cef9ad47..0c3217e019c 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -788,7 +788,8 @@ static inline AddressSpace *pci_get_address_space(PCIDevice *dev) static inline int pci_dma_rw(PCIDevice *dev, dma_addr_t addr, void *buf, dma_addr_t len, DMADirection dir) { - return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); + return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, + dir, MEMTXATTRS_UNSPECIFIED); } static inline int pci_dma_read(PCIDevice *dev, dma_addr_t addr, diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 59331ec0bd3..0695d430119 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -121,15 +121,15 @@ static inline MemTxResult dma_memory_write_relaxed(AddressSpace *as, * @buf: buffer with the data transferred * @len: the number of bytes to read or write * @dir: indicates the transfer direction + * @attrs: memory transaction attributes */ static inline MemTxResult dma_memory_rw(AddressSpace *as, dma_addr_t addr, void *buf, dma_addr_t len, - DMADirection dir) + DMADirection dir, MemTxAttrs attrs) { dma_barrier(as, dir); - return dma_memory_rw_relaxed(as, addr, buf, len, dir, - MEMTXATTRS_UNSPECIFIED); + return dma_memory_rw_relaxed(as, addr, buf, len, dir, attrs); } /** @@ -147,7 +147,8 @@ static inline MemTxResult dma_memory_rw(AddressSpace *as, dma_addr_t addr, static inline MemTxResult dma_memory_read(AddressSpace *as, dma_addr_t addr, void *buf, dma_addr_t len) { - return dma_memory_rw(as, addr, buf, len, DMA_DIRECTION_TO_DEVICE); + return dma_memory_rw(as, addr, buf, len, + DMA_DIRECTION_TO_DEVICE, MEMTXATTRS_UNSPECIFIED); } /** @@ -166,7 +167,7 @@ static inline MemTxResult dma_memory_write(AddressSpace *as, dma_addr_t addr, const void *buf, dma_addr_t len) { return dma_memory_rw(as, addr, (void *)buf, len, - DMA_DIRECTION_FROM_DEVICE); + DMA_DIRECTION_FROM_DEVICE, MEMTXATTRS_UNSPECIFIED); } /** diff --git a/dma-helpers.c b/dma-helpers.c index 6a9735386dc..6c3b2200f16 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -305,7 +305,8 @@ static uint64_t dma_buf_rw(uint8_t *ptr, int32_t len, QEMUSGList *sg, while (len > 0) { ScatterGatherEntry entry = sg->sg[sg_cur_index++]; int32_t xfer = MIN(len, entry.len); - dma_memory_rw(sg->as, entry.base, ptr, xfer, dir); + dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, + MEMTXATTRS_UNSPECIFIED); ptr += xfer; len -= xfer; resid -= xfer; diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 4bd0d606ba1..dbf73a8bf47 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -1666,7 +1666,8 @@ static target_ulong h_int_esb(PowerPCCPU *cpu, mmio_addr = xive->vc_base + xive_source_esb_mgmt(xsrc, lisn) + offset; if (dma_memory_rw(&address_space_memory, mmio_addr, &data, 8, - (flags & SPAPR_XIVE_ESB_STORE))) { + (flags & SPAPR_XIVE_ESB_STORE), + MEMTXATTRS_UNSPECIFIED)) { qemu_log_mask(LOG_GUEST_ERROR, "XIVE: failed to access ESB @0x%" HWADDR_PRIx "\n", mmio_addr); return H_HARDWARE; diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 1e6e85e86a8..bac1adf439c 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -586,7 +586,8 @@ static int ohci_copy_td(OHCIState *ohci, struct ohci_td *td, if (n > len) n = len; - if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, n, dir)) { + if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, + n, dir, MEMTXATTRS_UNSPECIFIED)) { return -1; } if (n == len) { @@ -595,7 +596,7 @@ static int ohci_copy_td(OHCIState *ohci, struct ohci_td *td, ptr = td->be & ~0xfffu; buf += n; if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, - len - n, dir)) { + len - n, dir, MEMTXATTRS_UNSPECIFIED)) { return -1; } return 0; @@ -613,7 +614,8 @@ static int ohci_copy_iso_td(OHCIState *ohci, if (n > len) n = len; - if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, n, dir)) { + if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, + n, dir, MEMTXATTRS_UNSPECIFIED)) { return -1; } if (n == len) { @@ -622,7 +624,7 @@ static int ohci_copy_iso_td(OHCIState *ohci, ptr = end_addr & ~0xfffu; buf += n; if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf, - len - n, dir)) { + len - n, dir, MEMTXATTRS_UNSPECIFIED)) { return -1; } return 0;
Let devices specify transaction attributes when calling dma_memory_rw(). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- include/hw/pci/pci.h | 3 ++- include/sysemu/dma.h | 11 ++++++----- dma-helpers.c | 3 ++- hw/intc/spapr_xive.c | 3 ++- hw/usb/hcd-ohci.c | 10 ++++++---- 5 files changed, 18 insertions(+), 12 deletions(-)