From: Laszlo Ersek <lersek@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gal Hammer <ghammer@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Igor Mammedov <imammedo@redhat.com>
Subject: [Qemu-devel] [PATCH FYI 08/13] hw/i386: build UEFI ACPI Data Table for VMGENID in the dedicated blob (WIP)
Date: Sun, 13 Sep 2015 14:43:42 +0200 [thread overview]
Message-ID: <1442148227-17343-9-git-send-email-lersek@redhat.com> (raw)
In-Reply-To: <1442148227-17343-1-git-send-email-lersek@redhat.com>
Using the tools
- acpi_add_table2(),
- build_header2()
and the blob
- ACPI_BUILD_QEMUPARAM_FILE
that have been added in the previous patches, we can now implement the
UEFI ACPI Data Table (and the related linker/loader commands) that are
specified in "docs/vmgenid.txt".
At this point the UEFI ACPI Data Table becomes visible to the guest, but
it is never used, because we don't reference it yet from the AML in the
SSDT.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gal Hammer <ghammer@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
hw/i386/acpi-build.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 045015e..a742f25 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -41,6 +41,7 @@
#include "hw/acpi/memory_hotplug.h"
#include "sysemu/tpm.h"
#include "hw/acpi/tpm.h"
+#include "hw/acpi/vmgenid.h"
#include "sysemu/tpm_backend.h"
/* Supported chipsets: */
@@ -1658,6 +1659,69 @@ static bool acpi_has_iommu(void)
return intel_iommu && !ambiguous;
}
+static void
+build_qemuparam(GArray *qemuparam_blob, GArray *linker)
+{
+ AcpiQemuParamTable *param_table;
+ static const uint8_t ident[ACPI_UEFI_IDENT_SIZE] = QEMU_PARAM_TABLE_GUID;
+
+ /*
+ * The generation ID field -- which lives outside of AcpiQemuParamTable --
+ * must fit in the 4KB blob.
+ */
+ QEMU_BUILD_BUG_ON(VM_GENERATION_ID_OFFSET + VM_GENERATION_ID_SIZE > 4096);
+
+ param_table = acpi_data_push(qemuparam_blob, 4096);
+
+ /* set up the UEFI ACPI Data Table Sub-Header */
+ memcpy(param_table->identifier, ident, ACPI_UEFI_IDENT_SIZE);
+ param_table->data_offset =
+ cpu_to_le16(offsetof(AcpiQemuParamTable, data_offset) +
+ sizeof param_table->data_offset);
+
+ /* set up the QEMU parameters */
+ param_table->vmgenid_addr_base_ptr = cpu_to_le64(sizeof *param_table);
+
+ /* Prepare linker/loader commands. We handle the allocation of the blob and
+ * the relocation of the "ADDR base pointer" field here. The linking into
+ * the RSDT has already been queued by acpi_add_table2(), whereas
+ * @param_table will be checksummed by build_header2() internally.
+ */
+ bios_linker_loader_alloc(linker,
+ ACPI_BUILD_QEMUPARAM_FILE,
+ 4096, /* alloc_align */
+ false /* ie. it can be in high memory */);
+
+ bios_linker_loader_add_pointer(linker,
+ /* name of blob containing pointer */
+ ACPI_BUILD_QEMUPARAM_FILE,
+ /* name of blob being pointed to */
+ ACPI_BUILD_QEMUPARAM_FILE,
+ /* blob containing pointer */
+ qemuparam_blob,
+ /* address of pointer */
+ ¶m_table->vmgenid_addr_base_ptr,
+ /* size of pointer */
+ sizeof param_table->vmgenid_addr_base_ptr);
+
+ build_header2(/* @linker receives the ADD_CHECKSUM command */
+ linker,
+ /* the blob in which the ACPI table is embedded */
+ qemuparam_blob,
+ /* fw_cfg name of the same */
+ ACPI_BUILD_QEMUPARAM_FILE,
+ /* SDT header of ACPI table, residing in the blob */
+ (AcpiTableHeader *)param_table,
+ /* ACPI Signature */
+ "UEFI",
+ /* ACPI OEM Table ID */
+ "QEMUPARM",
+ /* size of ACPI table */
+ sizeof *param_table,
+ /* ACPI table revision */
+ 1);
+}
+
static
void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
{
@@ -1741,6 +1805,11 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
acpi_add_table(table_offsets, tables_blob);
build_dmar_q35(tables_blob, tables->linker);
}
+ if (true /* lersek: misc.vmgenid_iobase */) {
+ acpi_add_table2(table_offsets, tables->qemuparam_blob,
+ ACPI_BUILD_QEMUPARAM_FILE);
+ build_qemuparam(tables->qemuparam_blob, tables->linker);
+ }
/* Add tables supplied by user (if any) */
for (u = acpi_table_first(); u; u = acpi_table_next(u)) {
--
1.8.3.1
next prev parent reply other threads:[~2015-09-13 12:44 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-28 20:18 [Qemu-devel] [RFC] docs: describe QEMU's VMGenID design Laszlo Ersek
2015-09-01 19:47 ` Eric Blake
2015-09-01 22:05 ` Laszlo Ersek
2015-09-01 22:22 ` Eric Blake
2015-09-07 16:30 ` Paolo Bonzini
2015-09-03 13:49 ` Michael S. Tsirkin
2015-09-03 14:24 ` Laszlo Ersek
2015-09-13 11:56 ` [Qemu-devel] Windows does not support DataTableRegion at all [was: docs: describe QEMU's VMGenID design] Laszlo Ersek
2015-09-13 12:34 ` Michael S. Tsirkin
2015-09-13 12:57 ` Laszlo Ersek
2015-09-14 8:24 ` Igor Mammedov
2015-09-14 10:24 ` Laszlo Ersek
2015-09-14 16:53 ` [Qemu-devel] [edk2] " Bill Paul
2015-09-14 17:14 ` Moore, Robert
2015-09-14 17:23 ` Walz, Michael C
2015-09-14 18:04 ` Moore, Robert
2015-09-14 18:24 ` Laszlo Ersek
2015-09-15 10:49 ` Laszlo Ersek
2015-09-14 18:20 ` Laszlo Ersek
2015-09-14 21:12 ` Bill Paul
2015-09-15 10:49 ` Laszlo Ersek
2015-09-15 13:45 ` Moore, Robert
2015-09-15 14:29 ` Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 00/13] ACPI stuff for the DataTableRegion()-based VMGenID Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 01/13] docs: describe QEMU's VMGenID design Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 02/13] hw/acpi: add i386 callbacks for injecting GPE 04 when the VMGENID changes Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 03/13] hw/acpi: rename "AcpiBuildTables.table_data" to "main_blob" Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 04/13] hw/acpi: allow RSDT entries to be relocated to various fw_cfg blobs Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 05/13] hw/acpi: add more flexible acpi_add_table() and build_header() variants Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 06/13] hw/acpi: introduce ACPI_BUILD_QEMUPARAM_FILE Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 07/13] hw/acpi: introduce the AcpiQemuParamTable structure Laszlo Ersek
2015-09-13 12:43 ` Laszlo Ersek [this message]
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 09/13] hw/acpi: expose more parameters for aml_method() Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 10/13] hw/acpi: add AML generator function for DataTableRegion() Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 11/13] hw/acpi: add AML generator function for AccessAs() Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 12/13] hw/acpi: add AML generator function for CreateQWordField() Laszlo Ersek
2015-09-13 12:43 ` [Qemu-devel] [PATCH FYI 13/13] hw/i386: generate AML for the VMGENID device (WIP) Laszlo Ersek
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=1442148227-17343-9-git-send-email-lersek@redhat.com \
--to=lersek@redhat.com \
--cc=ghammer@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).