117 lines
3.8 KiB
Diff
117 lines
3.8 KiB
Diff
From d9a1de34f34c853dc8596ba64b5d9c5d33c2f0cd Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
Date: Sat, 15 Jan 2022 21:37:23 +0100
|
|
Subject: [PATCH 1/5] exec/memory: Extract address_space_set() from
|
|
dma_memory_set()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
dma_memory_set() does a DMA barrier, set the address space with
|
|
a constant value. The constant value filling code is not specific
|
|
to DMA and can be used for AddressSpace. Extract it as a new
|
|
helper: address_space_set().
|
|
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
|
|
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
[lv: rebase]
|
|
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
Message-Id: <20220115203725.3834712-2-laurent@vivier.eu>
|
|
Signed-off-by: zhangxinhao <zhangxinhao1@huawei.com>
|
|
---
|
|
include/exec/memory.h | 16 ++++++++++++++++
|
|
softmmu/dma-helpers.c | 15 +--------------
|
|
softmmu/physmem.c | 19 +++++++++++++++++++
|
|
3 files changed, 36 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/include/exec/memory.h b/include/exec/memory.h
|
|
index 3e84d62e40..afa6039a9f 100644
|
|
--- a/include/exec/memory.h
|
|
+++ b/include/exec/memory.h
|
|
@@ -2966,6 +2966,22 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr,
|
|
}
|
|
}
|
|
|
|
+/**
|
|
+ * address_space_set: Fill address space with a constant byte.
|
|
+ *
|
|
+ * 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
|
|
+ * @attrs: memory transaction attributes
|
|
+ */
|
|
+MemTxResult address_space_set(AddressSpace *as, hwaddr addr,
|
|
+ uint8_t c, hwaddr len, MemTxAttrs attrs);
|
|
+
|
|
#ifdef NEED_CPU_H
|
|
/* enum device_endian to MemOp. */
|
|
static inline MemOp devend_memop(enum device_endian end)
|
|
diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c
|
|
index b0be156479..c2028b6585 100644
|
|
--- a/softmmu/dma-helpers.c
|
|
+++ b/softmmu/dma-helpers.c
|
|
@@ -23,20 +23,7 @@ MemTxResult dma_memory_set(AddressSpace *as, dma_addr_t addr,
|
|
{
|
|
dma_barrier(as, DMA_DIRECTION_FROM_DEVICE);
|
|
|
|
-#define FILLBUF_SIZE 512
|
|
- uint8_t fillbuf[FILLBUF_SIZE];
|
|
- int l;
|
|
- MemTxResult error = MEMTX_OK;
|
|
-
|
|
- memset(fillbuf, c, FILLBUF_SIZE);
|
|
- while (len > 0) {
|
|
- l = len < FILLBUF_SIZE ? len : FILLBUF_SIZE;
|
|
- error |= address_space_write(as, addr, attrs, fillbuf, l);
|
|
- len -= l;
|
|
- addr += l;
|
|
- }
|
|
-
|
|
- return error;
|
|
+ return address_space_set(as, addr, c, len, attrs);
|
|
}
|
|
|
|
void qemu_sglist_init(QEMUSGList *qsg, DeviceState *dev, int alloc_hint,
|
|
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
|
|
index be39a49ceb..0e709ae384 100644
|
|
--- a/softmmu/physmem.c
|
|
+++ b/softmmu/physmem.c
|
|
@@ -2983,6 +2983,25 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,
|
|
}
|
|
}
|
|
|
|
+MemTxResult address_space_set(AddressSpace *as, hwaddr addr,
|
|
+ uint8_t c, hwaddr len, MemTxAttrs attrs)
|
|
+{
|
|
+#define FILLBUF_SIZE 512
|
|
+ uint8_t fillbuf[FILLBUF_SIZE];
|
|
+ int l;
|
|
+ MemTxResult error = MEMTX_OK;
|
|
+
|
|
+ memset(fillbuf, c, FILLBUF_SIZE);
|
|
+ while (len > 0) {
|
|
+ l = len < FILLBUF_SIZE ? len : FILLBUF_SIZE;
|
|
+ error |= address_space_write(as, addr, attrs, fillbuf, l);
|
|
+ len -= l;
|
|
+ addr += l;
|
|
+ }
|
|
+
|
|
+ return error;
|
|
+}
|
|
+
|
|
void cpu_physical_memory_rw(hwaddr addr, void *buf,
|
|
hwaddr len, bool is_write)
|
|
{
|
|
--
|
|
2.27.0
|
|
|