[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/5] Enable fw_cfg DMA interface for ARM
From: |
Marc Marí |
Subject: |
[Qemu-devel] [PATCH 4/5] Enable fw_cfg DMA interface for ARM |
Date: |
Thu, 6 Aug 2015 13:01:17 +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>
---
hw/arm/virt.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 374660c..eaad274 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -109,7 +109,7 @@ static const MemMapEntry a15memmap[] = {
[VIRT_GIC_V2M] = { 0x08020000, 0x00001000 },
[VIRT_UART] = { 0x09000000, 0x00001000 },
[VIRT_RTC] = { 0x09010000, 0x00001000 },
- [VIRT_FW_CFG] = { 0x09020000, 0x0000000a },
+ [VIRT_FW_CFG] = { 0x09020000, 0x00000012 },
[VIRT_MMIO] = { 0x0a000000, 0x00000200 },
/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
[VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
@@ -606,13 +606,13 @@ static void create_flash(const VirtBoardInfo *vbi)
g_free(nodename);
}
-static void create_fw_cfg(const VirtBoardInfo *vbi)
+static void create_fw_cfg(AddressSpace *as, const VirtBoardInfo *vbi)
{
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, 16, as);
nodename = g_strdup_printf("/address@hidden" PRIx64, base);
qemu_fdt_add_subnode(vbi->fdt, nodename);
@@ -800,6 +800,7 @@ static void machvirt_init(MachineState *machine)
VirtGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state);
VirtGuestInfo *guest_info = &guest_info_state->info;
char **cpustr;
+ AddressSpace *as = NULL;
if (!cpu_model) {
cpu_model = "cortex-a15";
@@ -837,6 +838,10 @@ static void machvirt_init(MachineState *machine)
}
cpuobj = object_new(object_class_get_name(oc));
+ if (!as) {
+ as = CPU(cpuobj)->as;
+ }
+
/* Handle any CPU options specified by the user */
cc->parse_features(CPU(cpuobj), cpuopts, &err);
g_free(cpuopts);
@@ -889,7 +894,7 @@ static void machvirt_init(MachineState *machine)
*/
create_virtio_devices(vbi, pic);
- create_fw_cfg(vbi);
+ create_fw_cfg(as, vbi);
rom_set_fw(fw_cfg_find());
guest_info->smp_cpus = smp_cpus;
--
2.4.3
- [Qemu-devel] [PATCH 3/5] Implement fw_cfg DMA interface, (continued)
- Re: [Qemu-devel] [PATCH 3/5] Implement fw_cfg DMA interface, Laszlo Ersek, 2015/08/06
- Re: [Qemu-devel] [PATCH 3/5] Implement fw_cfg DMA interface, Marc Marí, 2015/08/06
- Re: [Qemu-devel] [PATCH 3/5] Implement fw_cfg DMA interface, Laszlo Ersek, 2015/08/06
- Re: [Qemu-devel] [PATCH 3/5] Implement fw_cfg DMA interface, Marc Marí, 2015/08/07
- Re: [Qemu-devel] [PATCH 3/5] Implement fw_cfg DMA interface, Eric Blake, 2015/08/07
[Qemu-devel] [PATCH 4/5] Enable fw_cfg DMA interface for ARM,
Marc Marí <=
[Qemu-devel] [PATCH 5/5] Enable fw_cfg DMA interface for x86, Marc Marí, 2015/08/06
Re: [Qemu-devel] QEMU fw_cfg DMA interface, Stefan Hajnoczi, 2015/08/06
- Re: [Qemu-devel] QEMU fw_cfg DMA interface, Marc Marí, 2015/08/06
- Re: [Qemu-devel] QEMU fw_cfg DMA interface, Stefan Hajnoczi, 2015/08/06
- Re: [Qemu-devel] QEMU fw_cfg DMA interface, Kevin O'Connor, 2015/08/06
- Re: [Qemu-devel] QEMU fw_cfg DMA interface, Marc Marí, 2015/08/06
- Re: [Qemu-devel] QEMU fw_cfg DMA interface, Kevin O'Connor, 2015/08/07
- Re: [Qemu-devel] QEMU fw_cfg DMA interface, Gerd Hoffmann, 2015/08/18
[Qemu-devel] QEMU fw_cfg DMA interface, Marc Marí, 2015/08/31