[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 28/31] hw: arm: Support both legacy and current RSDP
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 28/31] hw: arm: Support both legacy and current RSDP build |
Date: |
Mon, 17 Dec 2018 23:18:35 -0500 |
From: Samuel Ortiz <address@hidden>
We add the ability to build legacy or current RSDP tables, based on the
AcpiRsdpData revision field passed to build_rsdp().
Although arm/virt only uses RSDP v2, adding that capability to
build_rsdp will allow us to share the RSDP build code between ARM and x86.
Signed-off-by: Samuel Ortiz <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Andrew Jones <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/arm/virt-acpi-build.c | 38 +++++++++++++++++++++++++++++++++-----
1 file changed, 33 insertions(+), 5 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 4a6b53fbfc..05f6654371 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -372,6 +372,20 @@ build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData
*rsdp_data)
{
int tbl_off = tbl->len; /* Table offset in the RSDP file */
+ switch (rsdp_data->revision) {
+ case 0:
+ /* With ACPI 1.0, we must have an RSDT pointer */
+ g_assert(rsdp_data->rsdt_tbl_offset);
+ break;
+ case 2:
+ /* With ACPI 2.0+, we must have an XSDT pointer */
+ g_assert(rsdp_data->xsdt_tbl_offset);
+ break;
+ default:
+ /* Only revisions 0 (ACPI 1.0) and 2 (ACPI 2.0+) are valid for RSDP */
+ g_assert_not_reached();
+ }
+
bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, tbl, 16,
true /* fseg memory */);
@@ -380,10 +394,29 @@ build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData
*rsdp_data)
g_array_append_vals(tbl, rsdp_data->oem_id, 6); /* OEMID */
build_append_int_noprefix(tbl, rsdp_data->revision, 1); /* Revision */
build_append_int_noprefix(tbl, 0, 4); /* RsdtAddress */
+ if (rsdp_data->rsdt_tbl_offset) {
+ /* RSDT address to be filled by guest linker */
+ bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off + 16, 4,
+ ACPI_BUILD_TABLE_FILE,
+ *rsdp_data->rsdt_tbl_offset);
+ }
+
+ /* Checksum to be filled by guest linker */
+ bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off, 20, /* ACPI rev 1.0 RSDP size */
+ 8);
+
+ if (rsdp_data->revision == 0) {
+ /* ACPI 1.0 RSDP, we're done */
+ return;
+ }
+
build_append_int_noprefix(tbl, 36, 4); /* Length */
/* XSDT address to be filled by guest linker */
build_append_int_noprefix(tbl, 0, 8); /* XsdtAddress */
+ /* We already validated our xsdt pointer */
bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
tbl_off + 24, 8,
ACPI_BUILD_TABLE_FILE,
@@ -392,11 +425,6 @@ build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData
*rsdp_data)
build_append_int_noprefix(tbl, 0, 1); /* Extended Checksum */
build_append_int_noprefix(tbl, 0, 3); /* Reserved */
- /* Checksum to be filled by guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off, 20, /* ACPI rev 1.0 RSDP size */
- 8);
-
/* Extended checksum to be filled by Guest linker */
bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
tbl_off, 36, /* ACPI rev 2.0 RSDP size */
--
MST
- [Qemu-devel] [PULL 17/31] pcie: Fast PCIe root ports for new machines, (continued)
- [Qemu-devel] [PULL 17/31] pcie: Fast PCIe root ports for new machines, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 18/31] intel_iommu: dump correct iova when failed, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 19/31] intel_iommu: convert invalid traces into error reports, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 20/31] intel_iommu: dma read/write draining support, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 21/31] intel_iommu: remove "x-" prefix for "aw-bits", Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 22/31] intel_iommu: turn on IR by default, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 25/31] hw: i386: Use correct RSDT length for checksum, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 23/31] hw: acpi: The RSDP build API can return void, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 26/31] hw: arm: Carry RSDP specific data through AcpiRsdpData, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 24/31] hw: arm: acpi: Fix incorrect checksums in RSDP, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 28/31] hw: arm: Support both legacy and current RSDP build,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 27/31] hw: arm: Convert the RSDP build to the buid_append_foo() API, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 30/31] hw: acpi: Remove AcpiRsdpDescriptor and fix tests, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 31/31] hw/i386: Remove deprecated machines pc-0.10 and pc-0.11, Michael S. Tsirkin, 2018/12/17
- [Qemu-devel] [PULL 29/31] hw: acpi: Export and share the ARM RSDP build, Michael S. Tsirkin, 2018/12/17
- Re: [Qemu-devel] [PULL 00/31] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2018/12/17
- Re: [Qemu-devel] [PULL 00/31] pci, pc, virtio: fixes, features, no-reply, 2018/12/24