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

dma: Let dma_buf_write() take MemTxAttrs argument

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

Keep the default MEMTXATTRS_UNSPECIFIED in the few callers.

Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20211223115554.3155328-12-philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2021-12-15 23:02:21 +01:00
parent 959384e74e
commit 392e48af34
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ide/ahci.c
View File

@ -1381,8 +1381,10 @@ static void ahci_pio_transfer(const IDEDMA *dma)
has_sglist ? "" : "o"); has_sglist ? "" : "o");
if (has_sglist && size) { if (has_sglist && size) {
const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED;
if (is_write) { if (is_write) {
dma_buf_write(s->data_ptr, size, &s->sg); dma_buf_write(s->data_ptr, size, &s->sg, attrs);
} else { } else {
dma_buf_read(s->data_ptr, size, &s->sg); dma_buf_read(s->data_ptr, size, &s->sg);
} }
@ -1479,7 +1481,7 @@ static int ahci_dma_rw_buf(const IDEDMA *dma, bool is_write)
if (is_write) { if (is_write) {
dma_buf_read(p, l, &s->sg); dma_buf_read(p, l, &s->sg);
} else { } else {
dma_buf_write(p, l, &s->sg); dma_buf_write(p, l, &s->sg, MEMTXATTRS_UNSPECIFIED);
} }
/* free sglist, update byte count */ /* free sglist, update byte count */

3
hw/nvme/ctrl.c
View File

@ -1146,10 +1146,11 @@ static uint16_t nvme_tx(NvmeCtrl *n, NvmeSg *sg, uint8_t *ptr, uint32_t len,
assert(sg->flags & NVME_SG_ALLOC); assert(sg->flags & NVME_SG_ALLOC);
if (sg->flags & NVME_SG_DMA) { if (sg->flags & NVME_SG_DMA) {
const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED;
uint64_t residual; uint64_t residual;
if (dir == NVME_TX_DIRECTION_TO_DEVICE) { if (dir == NVME_TX_DIRECTION_TO_DEVICE) {
residual = dma_buf_write(ptr, len, &sg->qsg); residual = dma_buf_write(ptr, len, &sg->qsg, attrs);
} else { } else {
residual = dma_buf_read(ptr, len, &sg->qsg); residual = dma_buf_read(ptr, len, &sg->qsg);
} }

2
hw/scsi/megasas.c
View File

@ -1465,7 +1465,7 @@ static int megasas_dcmd_set_properties(MegasasState *s, MegasasCmd *cmd)
dcmd_size); dcmd_size);
return MFI_STAT_INVALID_PARAMETER; return MFI_STAT_INVALID_PARAMETER;
} }
dma_buf_write(&info, dcmd_size, &cmd->qsg); dma_buf_write(&info, dcmd_size, &cmd->qsg, MEMTXATTRS_UNSPECIFIED);
trace_megasas_dcmd_unsupported(cmd->index, cmd->iov_size); trace_megasas_dcmd_unsupported(cmd->index, cmd->iov_size);
return MFI_STAT_OK; return MFI_STAT_OK;
} }

2
hw/scsi/scsi-bus.c
View File

@ -1423,7 +1423,7 @@ void scsi_req_data(SCSIRequest *req, int len)
if (req->cmd.mode == SCSI_XFER_FROM_DEV) { if (req->cmd.mode == SCSI_XFER_FROM_DEV) {
req->resid = dma_buf_read(buf, len, req->sg); req->resid = dma_buf_read(buf, len, req->sg);
} else { } else {
req->resid = dma_buf_write(buf, len, req->sg); req->resid = dma_buf_write(buf, len, req->sg, MEMTXATTRS_UNSPECIFIED);
} }
scsi_req_continue(req); scsi_req_continue(req);
} }

2
include/sysemu/dma.h
View File

@ -303,7 +303,7 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk,
QEMUSGList *sg, uint64_t offset, uint32_t align, QEMUSGList *sg, uint64_t offset, uint32_t align,
BlockCompletionFunc *cb, void *opaque); BlockCompletionFunc *cb, void *opaque);
uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg); uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg);
uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg); uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs attrs);
void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie,
QEMUSGList *sg, enum BlockAcctType type); QEMUSGList *sg, enum BlockAcctType type);

5
softmmu/dma-helpers.c
View File

@ -322,10 +322,9 @@ uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg)
MEMTXATTRS_UNSPECIFIED); MEMTXATTRS_UNSPECIFIED);
} }
uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg) uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg, MemTxAttrs attrs)
{ {
return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE, return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE, attrs);
MEMTXATTRS_UNSPECIFIED);
} }
void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie, void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie,