1 files changed, 37 insertions, 0 deletions

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