From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHa1n-00030c-Su for qemu-devel@nongnu.org; Tue, 21 Jul 2015 12:04:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHa1m-00031A-SL for qemu-devel@nongnu.org; Tue, 21 Jul 2015 12:04:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHa1m-00030w-Nv for qemu-devel@nongnu.org; Tue, 21 Jul 2015 12:04:22 -0400 From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Tue, 21 Jul 2015 18:03:43 +0200 Message-Id: <1437494626-3773-5-git-send-email-markmb@redhat.com> In-Reply-To: <1437494626-3773-1-git-send-email-markmb@redhat.com> References: <1437494626-3773-1-git-send-email-markmb@redhat.com> Subject: [Qemu-devel] [RFC 4/7] enable fw_cfg dma for arm virt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , 'Kevin O'Connor' , Gerd Hoffmann , Stefan Hajnoczi From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- docs/specs/fw_cfg.txt | 6 ++++++ hw/arm/virt.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/specs/fw_cfg.txt b/docs/specs/fw_cfg.txt index 64d9192..eac83a1 100644 --- a/docs/specs/fw_cfg.txt +++ b/docs/specs/fw_cfg.txt @@ -167,6 +167,12 @@ If a partial transfer happened before an error occured the address and length registers indicate how much data has been transfered successfully. +== Register Locations == + +=== arm === + +classic fw_cfg base + 16 + = Host-side API = The following functions are available to the QEMU programmer for adding diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 374660c..d05f6a4 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -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("/fw-cfg@%" 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