From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH RESEND v2 09/16] dma: Let dma_memory_set() take MemTxAttrs argument
Date: Thu, 1 Oct 2020 19:25:12 +0200 [thread overview]
Message-ID: <20201001172519.1620782-10-philmd@redhat.com> (raw)
In-Reply-To: <20201001172519.1620782-1-philmd@redhat.com>
Let devices specify transaction attributes when calling
dma_memory_set().
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>
---
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 ed28db6604..a8d6c55953 100644
--- a/include/hw/ppc/spapr_vio.h
+++ b/include/hw/ppc/spapr_vio.h
@@ -111,7 +111,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 a5cd7a98ff..608393d1b6 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 host virtual address.
diff --git a/dma-helpers.c b/dma-helpers.c
index 4a9e37d6d0..6a9735386d 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 0e95d057fd..b10e05f527 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
next prev parent reply other threads:[~2020-10-01 17:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 17:25 [PATCH RESEND v2 00/16] hw: Let DMA/PCI API take MemTxAttrs argument and propagate MemTxResult Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 01/16] pci: pass along the return value of dma_memory_rw Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 02/16] docs/devel/loads-stores: Add regexp for DMA functions Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 03/16] dma: Document address_space_map/address_space_unmap() prototypes Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 04/16] dma: Let dma_memory_set() propagate MemTxResult Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 05/16] dma: Let dma_memory_rw() " Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 06/16] dma: Let dma_memory_read() " Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 07/16] dma: Let dma_memory_write() " Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 08/16] dma: Let dma_memory_valid() take MemTxAttrs argument Philippe Mathieu-Daudé
2020-10-01 17:25 ` Philippe Mathieu-Daudé [this message]
2020-10-01 17:25 ` [PATCH RESEND v2 10/16] dma: Let dma_memory_rw_relaxed() " Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 11/16] dma: Let dma_memory_rw() " Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 12/16] dma: Let dma_memory_read/write() " Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 13/16] dma: Let dma_memory_map() " Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 14/16] pci: Let pci_dma_rw() propagate MemTxResult Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 15/16] pci: Let pci_dma_read() " Philippe Mathieu-Daudé
2020-10-01 17:25 ` [PATCH RESEND v2 16/16] pci: Let pci_dma_write() " Philippe Mathieu-Daudé
2020-10-22 14:44 ` [PATCH RESEND v2 00/16] hw: Let DMA/PCI API take MemTxAttrs argument and " Philippe Mathieu-Daudé
2020-10-23 15:09 ` Philippe Mathieu-Daudé
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=20201001172519.1620782-10-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=pbonzini@redhat.com \
--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).