From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWL79-0005HE-Kz for qemu-devel@nongnu.org; Mon, 31 Aug 2015 05:10:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZWL78-0007UM-GM for qemu-devel@nongnu.org; Mon, 31 Aug 2015 05:10:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44054) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWL78-0007U8-6V for qemu-devel@nongnu.org; Mon, 31 Aug 2015 05:10:54 -0400 From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Mon, 31 Aug 2015 11:10:16 +0200 Message-Id: <1441012217-8213-5-git-send-email-markmb@redhat.com> In-Reply-To: <1441012217-8213-1-git-send-email-markmb@redhat.com> References: <1441012133-8154-1-git-send-email-markmb@redhat.com> <1441012217-8213-1-git-send-email-markmb@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 4/5] Enable fw_cfg DMA interface for ARM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Drew , Stefan Hajnoczi , Kevin O'Connor , Gerd Hoffmann , =?UTF-8?q?Marc=20Mar=C3=AD?= , Laszlo Enable the fw_cfg DMA interface for the ARM virt machine. Based on Gerd Hoffman's initial implementation. Signed-off-by: Marc Mar=C3=AD --- 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 b88c104..54d5f54 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -111,7 +111,7 @@ static const MemMapEntry a15memmap[] =3D { [VIRT_GIC_V2M] =3D { 0x08020000, 0x00001000 }, [VIRT_UART] =3D { 0x09000000, 0x00001000 }, [VIRT_RTC] =3D { 0x09010000, 0x00001000 }, - [VIRT_FW_CFG] =3D { 0x09020000, 0x0000000a }, + [VIRT_FW_CFG] =3D { 0x09020000, 0x00000014 }, [VIRT_MMIO] =3D { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that s= ize */ [VIRT_PLATFORM_BUS] =3D { 0x0c000000, 0x02000000 }, @@ -614,13 +614,13 @@ static void create_flash(const VirtBoardInfo *vbi) g_free(nodename); } =20 -static void create_fw_cfg(const VirtBoardInfo *vbi) +static void create_fw_cfg(AddressSpace *as, const VirtBoardInfo *vbi) { hwaddr base =3D vbi->memmap[VIRT_FW_CFG].base; hwaddr size =3D vbi->memmap[VIRT_FW_CFG].size; char *nodename; =20 - fw_cfg_init_mem_wide(base + 8, base, 8, 0, NULL); + fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, as); =20 nodename =3D g_strdup_printf("/fw-cfg@%" PRIx64, base); qemu_fdt_add_subnode(vbi->fdt, nodename); @@ -808,6 +808,7 @@ static void machvirt_init(MachineState *machine) VirtGuestInfoState *guest_info_state =3D g_malloc0(sizeof *guest_inf= o_state); VirtGuestInfo *guest_info =3D &guest_info_state->info; char **cpustr; + AddressSpace *as =3D NULL; =20 if (!cpu_model) { cpu_model =3D "cortex-a15"; @@ -845,6 +846,10 @@ static void machvirt_init(MachineState *machine) } cpuobj =3D object_new(object_class_get_name(oc)); =20 + if (!as) { + as =3D CPU(cpuobj)->as; + } + /* Handle any CPU options specified by the user */ cc->parse_features(CPU(cpuobj), cpuopts, &err); g_free(cpuopts); @@ -897,7 +902,7 @@ static void machvirt_init(MachineState *machine) */ create_virtio_devices(vbi, pic); =20 - create_fw_cfg(vbi); + create_fw_cfg(as, vbi); rom_set_fw(fw_cfg_find()); =20 guest_info->smp_cpus =3D smp_cpus; --=20 2.4.3