mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xen/x86/pvh: handle ACPI RSDT table in PVH Dom0 build
Xen always generates an XSDT table even if the firmware only provided an
RSDT table. Copy the RSDT header from the firmware table, adjusting the
signature, for the XSDT table when not provided by the firmware.
This is necessary to run Xen on QEMU.
Fixes: 1d74282c45 ('x86: setup PVHv2 Dom0 ACPI tables')
Suggested-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
This commit is contained in:
1 parent
40f5c7e138
commit
6e7f7a0c16
1 file changed
+16
-1
@@ -1078,7 +1078,16 @@ static int __init pvh_setup_acpi_xsdt(struct domain *d, paddr_t madt_addr,
|
||||
rc = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
xsdt_paddr = rsdp->xsdt_physical_address;
|
||||
/*
|
||||
* Note the header is the same for both RSDT and XSDT, so it's fine to
|
||||
* copy the native RSDT header to the Xen crafted XSDT if no native
|
||||
* XSDT is available.
|
||||
*/
|
||||
if ( rsdp->revision > 1 && rsdp->xsdt_physical_address )
|
||||
xsdt_paddr = rsdp->xsdt_physical_address;
|
||||
else
|
||||
xsdt_paddr = rsdp->rsdt_physical_address;
|
||||
|
||||
acpi_os_unmap_memory(rsdp, sizeof(*rsdp));
|
||||
table = acpi_os_map_memory(xsdt_paddr, sizeof(*table));
|
||||
if ( !table )
|
||||
@@ -1090,6 +1099,12 @@ static int __init pvh_setup_acpi_xsdt(struct domain *d, paddr_t madt_addr,
|
||||
xsdt->header = *table;
|
||||
acpi_os_unmap_memory(table, sizeof(*table));
|
||||
|
||||
/*
|
||||
* In case the header is an RSDT copy, unconditionally ensure it has
|
||||
* an XSDT sig.
|
||||
*/
|
||||
xsdt->header.signature[0] = 'X';
|
||||
|
||||
/* Add the custom MADT. */
|
||||
xsdt->table_offset_entry[0] = madt_addr;
|
||||
|
||||
|
||||