dma: Let dma_memory_rw() take MemTxAttrs argument
Let devices specify transaction attributes when calling dma_memory_rw(). 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-5-philmd@redhat.com>
This commit is contained in:
parent
4afd0f2f22
commit
23faf5694f
|
@ -1684,7 +1684,8 @@ static target_ulong h_int_esb(PowerPCCPU *cpu,
|
||||||
mmio_addr = xive->vc_base + xive_source_esb_mgmt(xsrc, lisn) + offset;
|
mmio_addr = xive->vc_base + xive_source_esb_mgmt(xsrc, lisn) + offset;
|
||||||
|
|
||||||
if (dma_memory_rw(&address_space_memory, mmio_addr, &data, 8,
|
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%"
|
qemu_log_mask(LOG_GUEST_ERROR, "XIVE: failed to access ESB @0x%"
|
||||||
HWADDR_PRIx "\n", mmio_addr);
|
HWADDR_PRIx "\n", mmio_addr);
|
||||||
return H_HARDWARE;
|
return H_HARDWARE;
|
||||||
|
|
|
@ -586,7 +586,8 @@ static int ohci_copy_td(OHCIState *ohci, struct ohci_td *td,
|
||||||
if (n > len)
|
if (n > len)
|
||||||
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;
|
return -1;
|
||||||
}
|
}
|
||||||
if (n == len) {
|
if (n == len) {
|
||||||
|
@ -595,7 +596,7 @@ static int ohci_copy_td(OHCIState *ohci, struct ohci_td *td,
|
||||||
ptr = td->be & ~0xfffu;
|
ptr = td->be & ~0xfffu;
|
||||||
buf += n;
|
buf += n;
|
||||||
if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf,
|
if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf,
|
||||||
len - n, dir)) {
|
len - n, dir, MEMTXATTRS_UNSPECIFIED)) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -613,7 +614,8 @@ static int ohci_copy_iso_td(OHCIState *ohci,
|
||||||
if (n > len)
|
if (n > len)
|
||||||
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;
|
return -1;
|
||||||
}
|
}
|
||||||
if (n == len) {
|
if (n == len) {
|
||||||
|
@ -622,7 +624,7 @@ static int ohci_copy_iso_td(OHCIState *ohci,
|
||||||
ptr = end_addr & ~0xfffu;
|
ptr = end_addr & ~0xfffu;
|
||||||
buf += n;
|
buf += n;
|
||||||
if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf,
|
if (dma_memory_rw(ohci->as, ptr + ohci->localmem_base, buf,
|
||||||
len - n, dir)) {
|
len - n, dir, MEMTXATTRS_UNSPECIFIED)) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -808,7 +808,8 @@ static inline MemTxResult pci_dma_rw(PCIDevice *dev, dma_addr_t addr,
|
||||||
void *buf, dma_addr_t len,
|
void *buf, dma_addr_t len,
|
||||||
DMADirection dir)
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -121,15 +121,15 @@ static inline MemTxResult dma_memory_write_relaxed(AddressSpace *as,
|
||||||
* @buf: buffer with the data transferred
|
* @buf: buffer with the data transferred
|
||||||
* @len: the number of bytes to read or write
|
* @len: the number of bytes to read or write
|
||||||
* @dir: indicates the transfer direction
|
* @dir: indicates the transfer direction
|
||||||
|
* @attrs: memory transaction attributes
|
||||||
*/
|
*/
|
||||||
static inline MemTxResult dma_memory_rw(AddressSpace *as, dma_addr_t addr,
|
static inline MemTxResult dma_memory_rw(AddressSpace *as, dma_addr_t addr,
|
||||||
void *buf, dma_addr_t len,
|
void *buf, dma_addr_t len,
|
||||||
DMADirection dir)
|
DMADirection dir, MemTxAttrs attrs)
|
||||||
{
|
{
|
||||||
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, attrs);
|
||||||
MEMTXATTRS_UNSPECIFIED);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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,
|
static inline MemTxResult dma_memory_read(AddressSpace *as, dma_addr_t addr,
|
||||||
void *buf, dma_addr_t len)
|
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)
|
const void *buf, dma_addr_t len)
|
||||||
{
|
{
|
||||||
return dma_memory_rw(as, addr, (void *)buf, len,
|
return dma_memory_rw(as, addr, (void *)buf, len,
|
||||||
DMA_DIRECTION_FROM_DEVICE);
|
DMA_DIRECTION_FROM_DEVICE, MEMTXATTRS_UNSPECIFIED);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -305,7 +305,8 @@ static uint64_t dma_buf_rw(uint8_t *ptr, int32_t len, QEMUSGList *sg,
|
||||||
while (len > 0) {
|
while (len > 0) {
|
||||||
ScatterGatherEntry entry = sg->sg[sg_cur_index++];
|
ScatterGatherEntry entry = sg->sg[sg_cur_index++];
|
||||||
int32_t xfer = MIN(len, entry.len);
|
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;
|
ptr += xfer;
|
||||||
len -= xfer;
|
len -= xfer;
|
||||||
resid -= xfer;
|
resid -= xfer;
|
||||||
|
|
Loading…
Reference in New Issue