[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 5/7] Enable fw_cfg DMA interface for ARM
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v2 5/7] Enable fw_cfg DMA interface for ARM |
Date: |
Tue, 20 Oct 2015 08:11:30 +0200 |
From: Marc MarĂ <address@hidden>
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>
Signed-off-by: Gerd Hoffmann <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 b670bc6..5d38c47 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);
@@ -1031,7 +1031,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;
--
1.8.3.1
- [Qemu-devel] [PULL v2 0/7] fw_cfg: add dma interface, add strings via cmdline., Gerd Hoffmann, 2015/10/20
- [Qemu-devel] [PULL v2 6/7] Enable fw_cfg DMA interface for x86, Gerd Hoffmann, 2015/10/20
- [Qemu-devel] [PULL v2 1/7] fw_cfg: insert string blobs via qemu cmdline, Gerd Hoffmann, 2015/10/20
- [Qemu-devel] [PULL v2 2/7] fw_cfg: document fw_cfg_modify_iXX() update functions, Gerd Hoffmann, 2015/10/20
- [Qemu-devel] [PULL v2 3/7] fw_cfg DMA interface documentation, Gerd Hoffmann, 2015/10/20
- [Qemu-devel] [PULL v2 7/7] fw_cfg: Define a static signature to be returned on DMA port reads, Gerd Hoffmann, 2015/10/20
- [Qemu-devel] [PULL v2 5/7] Enable fw_cfg DMA interface for ARM,
Gerd Hoffmann <=
- [Qemu-devel] [PULL v2 4/7] Implement fw_cfg DMA interface, Gerd Hoffmann, 2015/10/20
- Re: [Qemu-devel] [PULL v2 0/7] fw_cfg: add dma interface, add strings via cmdline., Peter Maydell, 2015/10/20