[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/8] hw: arm: Carry RSDP specific data through AcpiR
From: |
Samuel Ortiz |
Subject: |
[Qemu-devel] [PATCH 4/8] hw: arm: Carry RSDP specific data through AcpiRsdpData |
Date: |
Mon, 26 Nov 2018 17:29:37 +0100 |
That will allow us to generalize the ARM build_rsdp() routine to support
both legacy RSDP (The current i386 implementation) and extended RSDP
(The ARM implementation).
Signed-off-by: Samuel Ortiz <address@hidden>
---
include/hw/acpi/acpi-defs.h | 11 +++++++++++
hw/arm/virt-acpi-build.c | 27 ++++++++++++++++++++++-----
2 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index af8e023968..e7fd24c6c5 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -53,6 +53,17 @@ struct AcpiRsdpDescriptor { /* Root System Descriptor
Pointer */
} QEMU_PACKED;
typedef struct AcpiRsdpDescriptor AcpiRsdpDescriptor;
+typedef struct AcpiRsdpData {
+ uint8_t oem_id[6]; /* OEM identification */
+ uint8_t revision; /* Must be 0 for 1.0, 2 for 2.0 */
+
+ unsigned *rsdt_tbl_offset;
+ unsigned *xsdt_tbl_offset;
+} AcpiRsdpData;
+
+#define ACPI_RSDP_REV_1 0
+#define ACPI_RSDP_REV_2 2
+
/* Table structure from Linux kernel (the ACPI tables are under the
BSD license) */
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 0835900052..2dad465ecf 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -368,7 +368,7 @@ static void acpi_dsdt_add_power_button(Aml *scope)
/* RSDP */
static void
-build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset)
+build_rsdp(GArray *rsdp_table, BIOSLinker *linker, AcpiRsdpData *rsdp_data)
{
AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
unsigned xsdt_pa_size = sizeof(rsdp->xsdt_physical_address);
@@ -379,14 +379,14 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker,
unsigned xsdt_tbl_offset)
true /* fseg memory */);
memcpy(&rsdp->signature, "RSD PTR ", sizeof(rsdp->signature));
- memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, sizeof(rsdp->oem_id));
+ memcpy(rsdp->oem_id, rsdp_data->oem_id, sizeof(rsdp->oem_id));
rsdp->length = cpu_to_le32(sizeof(*rsdp));
- rsdp->revision = 0x02;
+ rsdp->revision = rsdp_data->revision;
/* Address to be filled by Guest linker */
bios_linker_loader_add_pointer(linker,
ACPI_BUILD_RSDP_FILE, xsdt_pa_offset, xsdt_pa_size,
- ACPI_BUILD_TABLE_FILE, xsdt_tbl_offset);
+ ACPI_BUILD_TABLE_FILE, *rsdp_data->xsdt_tbl_offset);
/* Checksum to be filled by Guest linker */
bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
@@ -399,6 +399,20 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker,
unsigned xsdt_tbl_offset)
(char *)&rsdp->extended_checksum - rsdp_table->data);
}
+static void
+init_rsdp_data(AcpiRsdpData *data, const char *oem_id, uint8_t revision,
+ unsigned *rsdt_offset, unsigned *xsdt_offset)
+{
+ /* Caller must provide an OEM ID */
+ g_assert(oem_id);
+ g_assert(strlen(oem_id) >= 6);
+
+ memcpy(data->oem_id, oem_id, 6);
+ data->revision = revision;
+ data->rsdt_tbl_offset = rsdt_offset;
+ data->xsdt_tbl_offset = xsdt_offset;
+}
+
static void
build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{
@@ -810,6 +824,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables
*tables)
GArray *table_offsets;
unsigned dsdt, xsdt;
GArray *tables_blob = tables->table_data;
+ AcpiRsdpData rsdp;
table_offsets = g_array_new(false, true /* clear */,
sizeof(uint32_t));
@@ -857,7 +872,9 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables
*tables)
build_xsdt(tables_blob, tables->linker, table_offsets, NULL, NULL);
/* RSDP is in FSEG memory, so allocate it separately */
- build_rsdp(tables->rsdp, tables->linker, xsdt);
+ init_rsdp_data(&rsdp, ACPI_BUILD_APPNAME6, ACPI_RSDP_REV_2,
+ NULL, &xsdt);
+ build_rsdp(tables->rsdp, tables->linker, &rsdp);
/* Cleanup memory that's no longer used. */
g_array_free(table_offsets, true);
--
2.19.1
- [Qemu-devel] [PATCH 0/8] hw: acpi: RSDP fixes and refactoring, Samuel Ortiz, 2018/11/26
- [Qemu-devel] [PATCH 2/8] hw: arm: acpi: Fix incorrect checksums in RSDP, Samuel Ortiz, 2018/11/26
- [Qemu-devel] [PATCH 1/8] hw: acpi: The RSDP build API can return void, Samuel Ortiz, 2018/11/26
- [Qemu-devel] [PATCH 3/8] hw: i386: Use correct RSDT length for checksum, Samuel Ortiz, 2018/11/26
- [Qemu-devel] [PATCH 5/8] hw: arm: Convert the RSDP build to the buid_append_foo() API, Samuel Ortiz, 2018/11/26
- [Qemu-devel] [PATCH 4/8] hw: arm: Carry RSDP specific data through AcpiRsdpData,
Samuel Ortiz <=
- Re: [Qemu-devel] [PATCH 4/8] hw: arm: Carry RSDP specific data through AcpiRsdpData, Philippe Mathieu-Daudé, 2018/11/26
- Re: [Qemu-devel] [PATCH 4/8] hw: arm: Carry RSDP specific data through AcpiRsdpData, Igor Mammedov, 2018/11/27
- Re: [Qemu-devel] [PATCH 4/8] hw: arm: Carry RSDP specific data through AcpiRsdpData, Samuel Ortiz, 2018/11/28
- Re: [Qemu-devel] [PATCH 4/8] hw: arm: Carry RSDP specific data through AcpiRsdpData, Samuel Ortiz, 2018/11/28
- Re: [Qemu-devel] [PATCH 4/8] hw: arm: Carry RSDP specific data through AcpiRsdpData, Igor Mammedov, 2018/11/28
[Qemu-devel] [PATCH 6/8] hw: arm: Support both legacy and current RSDP build, Samuel Ortiz, 2018/11/26