mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw: arm: Carry RSDP specific data through AcpiRsdpData

Browse Source 
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 <sameo@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Samuel Ortiz 2018-12-17 11:48:34 +01:00 committed by Michael S. Tsirkin
parent 3bb3006a63
commit 5c5fce1ab5
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/arm/virt-acpi-build.c
View File

@ -368,7 +368,7 @@ static void acpi_dsdt_add_power_button(Aml *scope)
/* RSDP */ /* RSDP */
static void 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); AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
unsigned xsdt_pa_size = sizeof(rsdp->xsdt_physical_address); 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 */); true /* fseg memory */);
memcpy(&rsdp->signature, "RSD PTR ", sizeof(rsdp->signature)); 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->length = cpu_to_le32(sizeof(*rsdp));
rsdp->revision = 0x02; rsdp->revision = rsdp_data->revision;
/* Address to be filled by Guest linker */ /* Address to be filled by Guest linker */
bios_linker_loader_add_pointer(linker, bios_linker_loader_add_pointer(linker,
ACPI_BUILD_RSDP_FILE, xsdt_pa_offset, xsdt_pa_size, 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 */ /* Checksum to be filled by Guest linker */
bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE, bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
@ -857,7 +857,15 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
build_xsdt(tables_blob, tables->linker, table_offsets, NULL, NULL); build_xsdt(tables_blob, tables->linker, table_offsets, NULL, NULL);
/* RSDP is in FSEG memory, so allocate it separately */ /* RSDP is in FSEG memory, so allocate it separately */
build_rsdp(tables->rsdp, tables->linker, xsdt); {
AcpiRsdpData rsdp_data = {
.revision = 2,
.oem_id = ACPI_BUILD_APPNAME6,
.xsdt_tbl_offset = &xsdt,
.rsdt_tbl_offset = NULL,
};
build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
}
/* Cleanup memory that's no longer used. */ /* Cleanup memory that's no longer used. */
g_array_free(table_offsets, true); g_array_free(table_offsets, true);

8
include/hw/acpi/acpi-defs.h
View File

@ -53,6 +53,14 @@ struct AcpiRsdpDescriptor { /* Root System Descriptor Pointer */
} QEMU_PACKED; } QEMU_PACKED;
typedef struct AcpiRsdpDescriptor AcpiRsdpDescriptor; 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;
/* Table structure from Linux kernel (the ACPI tables are under the /* Table structure from Linux kernel (the ACPI tables are under the
BSD license) */ BSD license) */