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 v7 3/5] acpi: pc: add fw_cfg device node to ssdt
Date: Wed, 10 Feb 2016 15:41:38 -0500 [thread overview]
Message-ID: <1455136900-22334-4-git-send-email-somlo@cmu.edu> (raw)
In-Reply-To: <1455136900-22334-1-git-send-email-somlo@cmu.edu>
Add a fw_cfg device node to the ACPI SSDT. While the guest-side
firmware can't utilize this information (since it has to access
the hard-coded fw_cfg device to extract ACPI tables to begin with),
having fw_cfg listed in ACPI will help the guest kernel keep a more
accurate inventory of in-use IO port regions.
Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Marc Marí <markmb@redhat.com>
---
hw/i386/acpi-build.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 4554eb8..4762fd2 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2190,6 +2190,35 @@ build_dsdt(GArray *table_data, GArray *linker,
aml_append(scope, aml_name_decl("_S5", pkg));
aml_append(dsdt, scope);
+ /* create fw_cfg node, unconditionally */
+ {
+ /* when using port i/o, the 8-bit data register *always* overlaps
+ * with half of the 16-bit control register. Hence, the total size
+ * of the i/o region used is FW_CFG_CTL_SIZE; when using DMA, the
+ * DMA control register is located at FW_CFG_DMA_IO_BASE + 4 */
+ uint8_t io_size = object_property_get_bool(OBJECT(pcms->fw_cfg),
+ "dma_enabled", NULL) ?
+ ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr_t) :
+ FW_CFG_CTL_SIZE;
+
+ scope = aml_scope("\\_SB");
+ 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)));
+
+ crs = aml_resource_template();
+ aml_append(crs,
+ aml_io(AML_DECODE16, FW_CFG_IO_BASE, FW_CFG_IO_BASE, 0x01, io_size)
+ );
+ aml_append(dev, aml_name_decl("_CRS", crs));
+
+ aml_append(scope, dev);
+ aml_append(dsdt, scope);
+ }
+
if (misc->applesmc_io_base) {
scope = aml_scope("\\_SB.PCI0.ISA");
dev = aml_device("SMC");
--
2.4.3
next prev parent reply other threads:[~2016-02-10 20:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 20:41 [Qemu-devel] [PATCH v7 0/5] add ACPI node for fw_cfg on pc and arm Gabriel L. Somlo
2016-02-10 20:41 ` [Qemu-devel] [PATCH v7 1/5] fw_cfg: expose control register size in fw_cfg.h Gabriel L. Somlo
2016-02-10 20:41 ` [Qemu-devel] [PATCH v7 2/5] pc: fw_cfg: move ioport base constant to pc.h Gabriel L. Somlo
2016-02-10 20:41 ` Gabriel L. Somlo [this message]
2016-02-11 15:19 ` [Qemu-devel] [PATCH v7 3/5] acpi: pc: add fw_cfg device node to ssdt Igor Mammedov
2016-02-11 16:19 ` Gabriel L. Somlo
2016-02-10 20:41 ` [Qemu-devel] [PATCH v7 4/5] acpi: arm: add fw_cfg device node to dsdt Gabriel L. Somlo
2016-02-10 20:41 ` [Qemu-devel] [PATCH v7 5/5] fw_cfg: document ACPI device node information Gabriel L. Somlo
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=1455136900-22334-4-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).