ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT

Some BIOS on Toshiba machines corrupt the DSDT, so add a new
boot option acpi=copy_dsdt to workaround it.
Add warning message to ask users to use this option if corrupt DSDT detected.

Also build a DMI blacklist to check it and automatically copy DSDT.

https://bugzilla.kernel.org/show_bug.cgi?id=14679

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

4 files changed, 46 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e2202e93b148..93f113a1b326 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -151,6 +151,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         strict -- Be less tolerant of platforms that are not
                                 strictly ACPI specification compliant.
                         rsdt -- prefer RSDT over (default) XSDT
+                        copy_dsdt -- copy DSDT to memory
 
                         See also Documentation/power/pm.txt, pci=noacpi
 
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index cd40aba6aa95..b9629384263c 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1576,6 +1576,10 @@ static int __init parse_acpi(char *arg)
         /* "acpi=noirq" disables ACPI interrupt routing */
         else if (strcmp(arg, "noirq") == 0) {
                 acpi_noirq_set();
+        }
+        /* "acpi=copy_dsdt" copys DSDT */
+        else if (strcmp(arg, "copy_dsdt") == 0) {
+                acpi_gbl_copy_dsdt_locally = 1;
         } else {
                 /* Core will printk when we return error. */
                 return -EINVAL;
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 54a8712bae62..a9b105fc2e55 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -373,6 +373,10 @@ void acpi_tb_check_dsdt_header(void)
                 acpi_tb_print_table_header(0, &acpi_gbl_original_dsdt_header);
                 acpi_tb_print_table_header(0, acpi_gbl_DSDT);
 
+                ACPI_ERROR((AE_INFO,
+                            "Please send DMI info to linux-acpi@vger.kernel.org\n"
+                            "If system does not work as expected, please boot with acpi=copy_dsdt"));
+
                 /* Disable further error messages */
 
                 acpi_gbl_original_dsdt_header.length = acpi_gbl_DSDT->length;
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 37132dc2da03..49af19bb8c9b 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -69,6 +69,37 @@ static struct dmi_system_id __cpuinitdata power_nocheck_dmi_table[] = {
 };
 
 
+static int set_copy_dsdt(const struct dmi_system_id *id)
+{
+        printk(KERN_NOTICE "%s detected - "
+                "force copy of DSDT to local memory\n", id->ident);
+        acpi_gbl_copy_dsdt_locally = 1;
+        return 0;
+}
+
+static struct dmi_system_id dsdt_dmi_table[] __initdata = {
+        /*
+         * Insyde BIOS on some TOSHIBA machines corrupt the DSDT.
+         * https://bugzilla.kernel.org/show_bug.cgi?id=14679
+         */
+        {
+         .callback = set_copy_dsdt,
+         .ident = "TOSHIBA Satellite A505",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A505"),
+                },
+        },
+        {
+         .callback = set_copy_dsdt,
+         .ident = "TOSHIBA Satellite L505D",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L505D"),
+                },
+        }
+};
+
 /* --------------------------------------------------------------------------
                                 Device Management
    -------------------------------------------------------------------------- */
@@ -813,6 +844,12 @@ void __init acpi_early_init(void)
 
         acpi_gbl_permanent_mmap = 1;
 
+        /*
+         * If the machine falls into the DMI check table,
+         * DSDT will be copied to memory
+         */
+        dmi_check_system(dsdt_dmi_table);
+
         status = acpi_reallocate_root_table();
         if (ACPI_FAILURE(status)) {
                 printk(KERN_ERR PREFIX