From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgsKg-00036v-M5 for qemu-devel@nongnu.org; Tue, 29 Sep 2015 06:40:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgsKd-00089n-DS for qemu-devel@nongnu.org; Tue, 29 Sep 2015 06:40:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48595) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgsKd-00089j-6x for qemu-devel@nongnu.org; Tue, 29 Sep 2015 06:40:23 -0400 References: <1443389342-2186-1-git-send-email-somlo@cmu.edu> <1443389342-2186-5-git-send-email-somlo@cmu.edu> From: Laszlo Ersek Message-ID: <560A6A90.3070807@redhat.com> Date: Tue, 29 Sep 2015 12:40:16 +0200 MIME-Version: 1.0 In-Reply-To: <1443389342-2186-5-git-send-email-somlo@cmu.edu> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 4/5] acpi: arm: add fw_cfg device node to dsdt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Gabriel L. Somlo" , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, drjones@redhat.com, matt.fleming@intel.com, ehabkost@redhat.com, mst@redhat.com, zhaoshenglong@huawei.com, leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, kevin@koconnor.net, kraxel@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, markmb@redhat.com, rth@twiddle.net On 09/27/15 23:29, Gabriel L. Somlo wrote: > Add a fw_cfg device node to the ACPI DSDT. This is mostly > informational, as the authoritative fw_cfg MMIO region(s) > are listed in the Device Tree. However, since we are building > ACPI tables, we might as well be thorough while at it... > > Signed-off-by: Gabriel Somlo > --- > hw/arm/virt-acpi-build.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 1aaff1f..f314132 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -110,6 +110,20 @@ static void acpi_dsdt_add_rtc(Aml *scope, const MemMapEntry *rtc_memmap, > aml_append(scope, dev); > } > > +static void acpi_dsdt_add_fw_cfg(Aml *scope, const MemMapEntry *fw_cfg_memmap) > +{ > + Aml *dev = aml_device("FWCF"); > + aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002"))); > + /* device present, functioning, decoding, not shown in UI */ > + aml_append(dev, aml_name_decl("_STA", aml_int(0xB))); > + > + Aml *crs = aml_resource_template(); > + aml_append(crs, aml_memory32_fixed(fw_cfg_memmap->base, > + fw_cfg_memmap->size, AML_READ_WRITE)); > + aml_append(dev, aml_name_decl("_CRS", crs)); > + aml_append(scope, dev); > +} > + > static void acpi_dsdt_add_flash(Aml *scope, const MemMapEntry *flash_memmap) > { > Aml *dev, *crs; > @@ -529,6 +543,7 @@ build_dsdt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info) > (irqmap[VIRT_UART] + ARM_SPI_BASE)); > acpi_dsdt_add_rtc(scope, &memmap[VIRT_RTC], > (irqmap[VIRT_RTC] + ARM_SPI_BASE)); > + acpi_dsdt_add_fw_cfg(scope, &memmap[VIRT_FW_CFG]); > acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]); > acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO], > (irqmap[VIRT_MMIO] + ARM_SPI_BASE), NUM_VIRTIO_TRANSPORTS); > Looks sane to me. Did you test this with an aarch64 Linux guest (acpidump -b; iasl -d; cat /proc/iomem?) I can help with that, if you'd like. Reviewed-by: Laszlo Ersek Thanks Laszlo