[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 4/6] Enable fw_cfg DMA interface for ARM
From: |
Marc Marí |
Subject: |
[Qemu-devel] [PATCH v5 4/6] Enable fw_cfg DMA interface for ARM |
Date: |
Thu, 8 Oct 2015 17:02:56 +0200 |
Enable the fw_cfg DMA interface for the ARM virt machine.
Based on Gerd Hoffman's initial implementation.
Signed-off-by: Marc Marí <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
---
hw/arm/virt.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 7ae984f..0a39087 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -119,7 +119,7 @@ static const MemMapEntry a15memmap[] = {
[VIRT_GIC_REDIST] = { 0x080A0000, 0x00F60000 },
[VIRT_UART] = { 0x09000000, 0x00001000 },
[VIRT_RTC] = { 0x09010000, 0x00001000 },
- [VIRT_FW_CFG] = { 0x09020000, 0x0000000a },
+ [VIRT_FW_CFG] = { 0x09020000, 0x00000018 },
[VIRT_MMIO] = { 0x0a000000, 0x00000200 },
/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
[VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
@@ -677,13 +677,13 @@ static void create_flash(const VirtBoardInfo *vbi)
g_free(nodename);
}
-static void create_fw_cfg(const VirtBoardInfo *vbi)
+static void create_fw_cfg(const VirtBoardInfo *vbi, AddressSpace *as)
{
hwaddr base = vbi->memmap[VIRT_FW_CFG].base;
hwaddr size = vbi->memmap[VIRT_FW_CFG].size;
char *nodename;
- fw_cfg_init_mem_wide(base + 8, base, 8, 0, NULL);
+ fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, as);
nodename = g_strdup_printf("/address@hidden" PRIx64, base);
qemu_fdt_add_subnode(vbi->fdt, nodename);
@@ -1026,7 +1026,7 @@ static void machvirt_init(MachineState *machine)
*/
create_virtio_devices(vbi, pic);
- create_fw_cfg(vbi);
+ create_fw_cfg(vbi, &address_space_memory);
rom_set_fw(fw_cfg_find());
guest_info->smp_cpus = smp_cpus;
--
2.4.3
- [Qemu-devel] [cross-post] QEMU fw_cfg DMA interface, Marc Marí, 2015/10/08
- [Qemu-devel] [PATCH v5 0/6] fw_cfg DMA interface, Marc Marí, 2015/10/08
- [Qemu-devel] [PATCH v5 5/6] Enable fw_cfg DMA interface for x86, Marc Marí, 2015/10/08
- [Qemu-devel] [PATCH v5 3/6] Implement fw_cfg DMA interface, Marc Marí, 2015/10/08
- [Qemu-devel] [PATCH v5 2/6] fw_cfg DMA interface documentation, Marc Marí, 2015/10/08
- Re: [Qemu-devel] [PATCH v5 0/6] fw_cfg DMA interface, Gerd Hoffmann, 2015/10/09
- [Qemu-devel] [PATCH v5 1/6] fw_cfg: document fw_cfg_modify_iXX() update functions, Marc Marí, 2015/10/09
- [Qemu-devel] [PATCH v5 4/6] Enable fw_cfg DMA interface for ARM,
Marc Marí <=
- [Qemu-devel] [PATCH v5 6/6] fw_cfg: Define a static signature to be returned on DMA port reads, Marc Marí, 2015/10/09