qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Klaus Jensen" <k.jensen@samsung.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>
Subject: [PULL 11/22] dma: Let dma_buf_rw() take MemTxAttrs argument
Date: Fri, 31 Dec 2021 01:55:35 +0100	[thread overview]
Message-ID: <20211231005546.723396-12-philmd@redhat.com> (raw)
In-Reply-To: <20211231005546.723396-1-philmd@redhat.com>

Let devices specify transaction attributes when calling dma_buf_rw().

Keep the default MEMTXATTRS_UNSPECIFIED in the 2 callers.

Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20211223115554.3155328-11-philmd@redhat.com>
---
 softmmu/dma-helpers.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c
index 7f37548394e..fa81d2b386c 100644
--- a/softmmu/dma-helpers.c
+++ b/softmmu/dma-helpers.c
@@ -295,7 +295,7 @@ BlockAIOCB *dma_blk_write(BlockBackend *blk,
 
 
 static uint64_t dma_buf_rw(void *buf, int32_t len, QEMUSGList *sg,
-                           DMADirection dir)
+                           DMADirection dir, MemTxAttrs attrs)
 {
     uint8_t *ptr = buf;
     uint64_t resid;
@@ -307,8 +307,7 @@ static uint64_t dma_buf_rw(void *buf, 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,
-                      MEMTXATTRS_UNSPECIFIED);
+        dma_memory_rw(sg->as, entry.base, ptr, xfer, dir, attrs);
         ptr += xfer;
         len -= xfer;
         resid -= xfer;
@@ -319,12 +318,14 @@ static uint64_t dma_buf_rw(void *buf, int32_t len, QEMUSGList *sg,
 
 uint64_t dma_buf_read(void *ptr, int32_t len, QEMUSGList *sg)
 {
-    return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_FROM_DEVICE);
+    return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_FROM_DEVICE,
+                      MEMTXATTRS_UNSPECIFIED);
 }
 
 uint64_t dma_buf_write(void *ptr, int32_t len, QEMUSGList *sg)
 {
-    return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE);
+    return dma_buf_rw(ptr, len, sg, DMA_DIRECTION_TO_DEVICE,
+                      MEMTXATTRS_UNSPECIFIED);
 }
 
 void dma_acct_start(BlockBackend *blk, BlockAcctCookie *cookie,
-- 
2.33.1



  parent reply	other threads:[~2021-12-31  1:09 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-31  0:55 [PULL 00/22] Memory API patches for 2021-12-31 Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 01/22] hw/scsi/megasas: Use uint32_t for reply queue head/tail values Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 02/22] dma: Let dma_memory_valid() take MemTxAttrs argument Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 03/22] dma: Let dma_memory_set() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 04/22] dma: Let dma_memory_rw_relaxed() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 05/22] dma: Let dma_memory_rw() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 06/22] dma: Let dma_memory_read/write() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 07/22] dma: Let dma_memory_map() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 08/22] dma: Have dma_buf_rw() take a void pointer Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 09/22] dma: Have dma_buf_read() / dma_buf_write() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 10/22] pci: Let pci_dma_rw() take MemTxAttrs argument Philippe Mathieu-Daudé
2021-12-31  0:55 ` Philippe Mathieu-Daudé [this message]
2021-12-31  0:55 ` [PULL 12/22] dma: Let dma_buf_write() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 13/22] dma: Let dma_buf_read() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 14/22] dma: Let dma_buf_rw() propagate MemTxResult Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 15/22] dma: Let st*_dma() take MemTxAttrs argument Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 16/22] dma: Let ld*_dma() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 17/22] dma: Let st*_dma() propagate MemTxResult Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 18/22] dma: Let ld*_dma() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 19/22] pci: Let st*_pci_dma() take MemTxAttrs argument Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 20/22] pci: Let ld*_pci_dma() " Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 21/22] pci: Let st*_pci_dma() propagate MemTxResult Philippe Mathieu-Daudé
2021-12-31  0:55 ` [PULL 22/22] pci: Let ld*_pci_dma() " Philippe Mathieu-Daudé
2021-12-31  5:22 ` [PULL 00/22] Memory API patches for 2021-12-31 Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211231005546.723396-12-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=k.jensen@samsung.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).