Check for X__DSDT in acpi_get_table_header_early()
PATCH 1/1 Check for X__DSDT in acpi_get_table_header_early()
I finally got tired of my rx2600 printing garbage at the end of
the list of ACPI tables so I decided to fix it. Turns out the HP rx2600 does not provide a DSDT in the FADT, so we were trying to print a table at 0x0. It does provide a X_DSDT. This patch will make acpi_get_table_header_early() prefer the X_DSDT over the DSDT and adds more checking for null. Looks like the same code is in 2.6 and 2.4, please apply for both. Thanks,
Alex
Signature · 1 line
Alex Williamson HP Linux & Open Source Lab
drivers/acpi/tables.c +10 -3
@@ -256,10 +256,17 @@/* Map the DSDT header via the pointer in the FADT */ if (id ==ACPI_DSDT ) { -struct acpi_table_fadt *fadt = (struct acpi_table_fadt *) *header; +struct fadt_descriptor_rev2 *fadt = (struct fadt_descriptor_rev2 *) *header; + +if (fadt->header.revision ==3 && fadt->Xdsdt) { + *header = (void *)__acpi_map_table (fadt->Xdsdt, +sizeof (struct acpi_table_header )); + }else if (fadt->V1_dsdt) { + *header = (void *)__acpi_map_table (fadt->V1_dsdt, +sizeof (struct acpi_table_header )); + }else + *header =0 ; - *header = (void *)__acpi_map_table (fadt->dsdt_addr, -sizeof (struct acpi_table_header ));if (!*header) { printk(KERN_WARNING PREFIX "Unable to map DSDT\n");return -ENODEV ;