From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>,
Sergio Lopez <slp@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH 02/13] acpi: factor out acpi_dsdt_add_fw_cfg()
Date: Thu, 19 Mar 2020 09:01:06 +0100 [thread overview]
Message-ID: <20200319080117.7725-3-kraxel@redhat.com> (raw)
In-Reply-To: <20200319080117.7725-1-kraxel@redhat.com>
Add helper function to add fw_cfg device.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/i386/acpi-build.c | 50 ++++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 23 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 1b0684c433e3..9c98b07116cc 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1822,6 +1822,32 @@ static void build_smb0(Aml *table, I2CBus *smbus, int devnr, int func)
aml_append(table, scope);
}
+static void acpi_dsdt_add_fw_cfg(Aml *scope, Object *fw_cfg)
+{
+ /*
+ * 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(fw_cfg, "dma_enabled", NULL) ?
+ ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr_t) :
+ FW_CFG_CTL_SIZE;
+ Aml *dev = aml_device("FWCF");
+ Aml *crs = aml_resource_template();
+
+ 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_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);
+}
+
static void
build_dsdt(GArray *table_data, BIOSLinker *linker,
AcpiPmInfo *pm, AcpiMiscInfo *misc,
@@ -2101,30 +2127,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
/* 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(x86ms->fw_cfg),
- "dma_enabled", NULL) ?
- ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr_t) :
- FW_CFG_CTL_SIZE;
-
scope = aml_scope("\\_SB.PCI0");
- 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);
+ acpi_dsdt_add_fw_cfg(scope, OBJECT(x86ms->fw_cfg));
aml_append(dsdt, scope);
}
--
2.18.2
next prev parent reply other threads:[~2020-03-19 8:02 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-19 8:01 [PATCH 00/13] microvm: add acpi support Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 01/13] acpi: make build_madt() more generic Gerd Hoffmann
2020-03-19 9:34 ` Philippe Mathieu-Daudé
2020-03-19 8:01 ` Gerd Hoffmann [this message]
2020-03-19 9:36 ` [PATCH 02/13] acpi: factor out acpi_dsdt_add_fw_cfg() Philippe Mathieu-Daudé
2020-03-19 12:16 ` Igor Mammedov
2020-03-19 8:01 ` [PATCH 03/13] microvm: add isa-acpi device Gerd Hoffmann
2020-03-19 13:42 ` Igor Mammedov
2020-03-20 8:22 ` Gerd Hoffmann
2020-03-20 14:54 ` Igor Mammedov
2020-03-19 8:01 ` [PATCH 04/13] microvm: add minimal acpi support Gerd Hoffmann
2020-03-19 14:00 ` Igor Mammedov
2020-03-25 9:04 ` Gerd Hoffmann
2020-03-25 18:59 ` Igor Mammedov
2020-03-19 8:01 ` [PATCH 05/13] microvm: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-03-19 14:30 ` Igor Mammedov
2020-03-20 8:19 ` Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 06/13] microvm: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 07/13] [testing] seabios: update submodule to experimental microvm branch Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 08/13] [testing] seabios: update config & build rules Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 09/13] [testing] seabios: update binaries to experimental microvm branch Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 10/13] microvm/acpi: add rtc Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 11/13] microvm/acpi: add serial Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 12/13] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 13/13] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-03-20 15:30 ` Konrad Rzeszutek Wilk
2020-03-23 10:23 ` Gerd Hoffmann
2020-03-19 8:19 ` [PATCH 00/13] microvm: add acpi support no-reply
2020-03-19 8:23 ` no-reply
2020-03-19 8:24 ` no-reply
2020-03-19 8:49 ` Paolo Bonzini
2020-03-19 9:33 ` Gerd Hoffmann
2020-03-19 9:59 ` Paolo Bonzini
2020-03-19 11:28 ` Gerd Hoffmann
2020-03-19 13:40 ` Gerd Hoffmann
2020-03-19 17:34 ` Paolo Bonzini
2020-03-20 8:32 ` Gerd Hoffmann
2020-03-20 10:41 ` Paolo Bonzini
2020-03-23 10:51 ` Michael S. Tsirkin
2020-03-23 12:09 ` Gerd Hoffmann
2020-03-23 12:16 ` Igor Mammedov
2020-03-25 9:16 ` Gerd Hoffmann
2020-03-25 9:53 ` Igor Mammedov
2020-03-25 18:56 ` Igor Mammedov
2020-03-25 12:32 ` Igor Mammedov
2020-03-25 15:03 ` Gerd Hoffmann
2020-03-25 18:44 ` Igor Mammedov
2020-03-26 7:33 ` Michael S. Tsirkin
2020-03-26 10:59 ` Igor Mammedov
2020-03-27 12:06 ` Gerd Hoffmann
2020-03-27 14:05 ` Igor Mammedov
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=20200319080117.7725-3-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=slp@redhat.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).