@@ -126,6 +126,11 @@ struct fadt_descriptor_rev1
} PACKED;
/*
+ * Differentiated System Descrition Table (DSDT)
+ */
+#define DSDT_SIGNATURE 0x54445344 // DSDT
+
+/*
* MADT values and structures
*/
@@ -280,6 +285,11 @@ static inline u32 cpu_to_le32(u32 x)
return x;
}
+static inline u32 le32_to_cpu(u32 x)
+{
+ return x;
+}
+
static void
build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev)
{
@@ -634,7 +644,8 @@ acpi_bios_init(void)
} while(0)
// Add tables
- ACPI_INIT_TABLE(build_fadt(bdf));
+ struct fadt_descriptor_rev1 *fadt = build_fadt(bdf);
+ ACPI_INIT_TABLE(fadt);
ACPI_INIT_TABLE(build_ssdt());
ACPI_INIT_TABLE(build_madt());
ACPI_INIT_TABLE(build_hpet());
@@ -649,7 +660,19 @@ acpi_bios_init(void)
warn_noalloc();
continue;
}
- ACPI_INIT_TABLE(qemu_cfg_next_acpi_table_load(addr, len));
+ struct acpi_table_header *header =
+ qemu_cfg_next_acpi_table_load(addr, len);
+ if (header->signature == DSDT_SIGNATURE) {
+ if (fadt) {
+ free((void*)le32_to_cpu(fadt->dsdt));
+ fadt->dsdt = cpu_to_le32((u32)addr);
+ fadt->checksum -= checksum(fadt, sizeof(*fadt));
+ header->checksum -= checksum(header, len);
+ dprintf(1, "ACPI DSDT=%p\n", addr);
+ }
+ } else {
+ ACPI_INIT_TABLE(header);
+ }
if (tbl_idx == MAX_ACPI_TABLES) {
warn_noalloc();
break;
allow qemu to load dsdt as external acpi table. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- src/acpi.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-)