From: "Gabriel L. Somlo" <somlo@cmu.edu>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, ehabkost@redhat.com, mst@redhat.com,
matt@codeblueprint.co.uk, stefanha@gmail.com,
ard.biesheuvel@linaro.org, leif.lindholm@linaro.org,
luto@amacapital.net, qemu-arm@nongnu.org, kraxel@redhat.com,
pbonzini@redhat.com, imammedo@redhat.com, lersek@redhat.com,
rth@twiddle.net
Subject: [Qemu-devel] [PATCH v9 4/5] acpi: arm: add fw_cfg device node to dsdt
Date: Fri, 19 Feb 2016 13:20:28 -0500 [thread overview]
Message-ID: <1455906029-25565-5-git-send-email-somlo@cmu.edu> (raw)
In-Reply-To: <1455906029-25565-1-git-send-email-somlo@cmu.edu>
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 <somlo@cmu.edu>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Marc Marí <markmb@redhat.com>
---
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 8cf9a21..7d7998b 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -81,6 +81,20 @@ static void acpi_dsdt_add_uart(Aml *scope, const MemMapEntry *uart_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;
@@ -548,6 +562,7 @@ build_dsdt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
acpi_dsdt_add_uart(scope, &memmap[VIRT_UART],
(irqmap[VIRT_UART] + ARM_SPI_BASE));
acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]);
+ acpi_dsdt_add_fw_cfg(scope, &memmap[VIRT_FW_CFG]);
acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO],
(irqmap[VIRT_MMIO] + ARM_SPI_BASE), NUM_VIRTIO_TRANSPORTS);
acpi_dsdt_add_pci(scope, memmap, (irqmap[VIRT_PCIE] + ARM_SPI_BASE),
--
2.4.3
next prev parent reply other threads:[~2016-02-19 18:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-19 18:20 [Qemu-devel] [PATCH v9 0/5] add ACPI node for fw_cfg on pc and arm Gabriel L. Somlo
2016-02-19 18:20 ` [Qemu-devel] [PATCH v9 1/5] fw_cfg: expose control register size in fw_cfg.h Gabriel L. Somlo
2016-02-19 18:20 ` [Qemu-devel] [PATCH v9 2/5] pc: fw_cfg: move ioport base constant to pc.h Gabriel L. Somlo
2016-02-19 18:20 ` [Qemu-devel] [PATCH v9 3/5] acpi: pc: add fw_cfg device node to dsdt Gabriel L. Somlo
2016-02-22 12:26 ` Igor Mammedov
2016-02-23 9:51 ` Michael S. Tsirkin
2016-02-19 18:20 ` Gabriel L. Somlo [this message]
2016-02-20 13:02 ` [Qemu-devel] [PATCH v9 4/5] acpi: arm: " Shannon Zhao
2016-02-23 9:51 ` Michael S. Tsirkin
2016-02-19 18:20 ` [Qemu-devel] [PATCH v9 5/5] fw_cfg: document ACPI device node information Gabriel L. Somlo
2016-02-23 9:51 ` Michael S. Tsirkin
2016-02-22 12:30 ` [Qemu-devel] [PATCH v9 0/5] add ACPI node for fw_cfg on pc and arm Igor Mammedov
2016-02-23 8:51 ` Gerd Hoffmann
2016-02-23 9:48 ` Igor Mammedov
2016-02-23 10:39 ` Gerd Hoffmann
2016-02-23 10:56 ` Michael S. Tsirkin
2016-02-23 15:52 ` Igor Mammedov
2016-02-23 15:54 ` Michael S. Tsirkin
2016-02-23 16:25 ` Igor Mammedov
2016-02-23 9:53 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455906029-25565-5-git-send-email-somlo@cmu.edu \
--to=somlo@cmu.edu \
--cc=ard.biesheuvel@linaro.org \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=kraxel@redhat.com \
--cc=leif.lindholm@linaro.org \
--cc=lersek@redhat.com \
--cc=luto@amacapital.net \
--cc=matt@codeblueprint.co.uk \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=stefanha@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).