From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60577)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1Zhf4T-0003ek-18
	for qemu-devel@nongnu.org; Thu, 01 Oct 2015 10:43:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1Zhf4S-0000Bl-6e
	for qemu-devel@nongnu.org; Thu, 01 Oct 2015 10:42:56 -0400
Received: from mx1.redhat.com ([209.132.183.28]:38131)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1Zhf4S-0000BZ-1R
	for qemu-devel@nongnu.org; Thu, 01 Oct 2015 10:42:56 -0400
References: <1443701677-13629-1-git-send-email-markmb@redhat.com>
	<1443701819-13855-1-git-send-email-markmb@redhat.com>
	<1443701819-13855-5-git-send-email-markmb@redhat.com>
From: Laszlo Ersek <lersek@redhat.com>
Message-ID: <560D466C.1000301@redhat.com>
Date: Thu, 1 Oct 2015 16:42:52 +0200
MIME-Version: 1.0
In-Reply-To: <1443701819-13855-5-git-send-email-markmb@redhat.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH v4 4/7] Enable fw_cfg DMA interface for ARM
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: =?UTF-8?Q?Marc_Mar=c3=ad?= <markmb@redhat.com>, qemu-devel@nongnu.org
Cc: "Gabriel L. Somlo" <somlo@cmu.edu>, Stefan Hajnoczi <stefanha@gmail.com>, Drew <drjones@redhat.com>, Kevin O'Connor <kevin@koconnor.net>, Gerd Hoffmann <kraxel@redhat.com>

On 10/01/15 14:16, Marc Mar=C3=AD wrote:
> Enable the fw_cfg DMA interface for the ARM virt machine.
>=20
> Based on Gerd Hoffman's initial implementation.
>=20
> Signed-off-by: Marc Mar=C3=AD <markmb@redhat.com>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/arm/virt.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>=20
> 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[] =3D {
>      [VIRT_GIC_REDIST] =3D         { 0x080A0000, 0x00F60000 },
>      [VIRT_UART] =3D               { 0x09000000, 0x00001000 },
>      [VIRT_RTC] =3D                { 0x09010000, 0x00001000 },
> -    [VIRT_FW_CFG] =3D             { 0x09020000, 0x0000000a },
> +    [VIRT_FW_CFG] =3D             { 0x09020000, 0x00000018 },
>      [VIRT_MMIO] =3D               { 0x0a000000, 0x00000200 },
>      /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that=
 size */
>      [VIRT_PLATFORM_BUS] =3D       { 0x0c000000, 0x02000000 },
> @@ -677,13 +677,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(const VirtBoardInfo *vbi, AddressSpace *as)
>  {
>      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);
> @@ -1026,7 +1026,7 @@ static void machvirt_init(MachineState *machine)
>       */
>      create_virtio_devices(vbi, pic);
> =20
> -    create_fw_cfg(vbi);
> +    create_fw_cfg(vbi, &address_space_memory);
>      rom_set_fw(fw_cfg_find());
> =20
>      guest_info->smp_cpus =3D smp_cpus;
>=20

Reviewed-by: Laszlo Ersek <lersek@redhat.com>