From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH RESEND v2 04/16] dma: Let dma_memory_set() propagate MemTxResult
Date: Thu, 1 Oct 2020 19:25:07 +0200 [thread overview]
Message-ID: <20201001172519.1620782-5-philmd@redhat.com> (raw)
In-Reply-To: <20201001172519.1620782-1-philmd@redhat.com>
address_space_write() returns a MemTxResult type.
Do not discard it, return it to the caller.
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/sysemu/dma.h | 15 ++++++++++++++-
dma-helpers.c | 7 ++++---
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index c6e12b4c24..37cd9f1121 100644
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -123,7 +123,20 @@ static inline int dma_memory_write(AddressSpace *as, dma_addr_t addr,
DMA_DIRECTION_FROM_DEVICE);
}
-int dma_memory_set(AddressSpace *as, dma_addr_t addr, uint8_t c, dma_addr_t len);
+/**
+ * dma_memory_set: Fill memory with a constant byte from DMA controller.
+ *
+ * Return a MemTxResult indicating whether the operation succeeded
+ * or failed (eg unassigned memory, device rejected the transaction,
+ * IOMMU fault).
+ *
+ * @as: #AddressSpace to be accessed
+ * @addr: address within that address space
+ * @c: constant byte to fill the memory
+ * @len: the number of bytes to fill with the constant byte
+ */
+MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr,
+ uint8_t c, dma_addr_t len);
/**
* address_space_map: Map a physical memory region into a host virtual address.
diff --git a/dma-helpers.c b/dma-helpers.c
index 41ef24a63b..4a9e37d6d0 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -1,7 +1,7 @@
/*
* DMA helper functions
*
- * Copyright (c) 2009 Red Hat
+ * Copyright (c) 2009,2020 Red Hat
*
* This work is licensed under the terms of the GNU General Public License
* (GNU GPL), version 2 or later.
@@ -18,14 +18,15 @@
/* #define DEBUG_IOMMU */
-int dma_memory_set(AddressSpace *as, dma_addr_t addr, uint8_t c, dma_addr_t len)
+MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr,
+ uint8_t c, dma_addr_t len)
{
dma_barrier(as, DMA_DIRECTION_FROM_DEVICE);
#define FILLBUF_SIZE 512
uint8_t fillbuf[FILLBUF_SIZE];
int l;
- bool error = false;
+ MemTxResult error = MEMTX_OK;
memset(fillbuf, c, FILLBUF_SIZE);
while (len > 0) {
--
2.26.2
next prev parent reply other threads:[~2020-10-01 17:30 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 ` Philippe Mathieu-Daudé [this message]
2020-10-01 17:25 ` [PATCH RESEND v2 05/16] dma: Let dma_memory_rw() propagate MemTxResult 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 ` [PATCH RESEND v2 09/16] dma: Let dma_memory_set() " Philippe Mathieu-Daudé
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-5-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).