Jonathan Nieder wrote:

> Nice to hear. :)  Passed upstream.

The 2.6.32.y tree doesn't have the prerequisite patches that are
already in squeeze and upstream doesn't want them (too invasive).

> Debian kernel team: please consider applying 100cf87788c0 (ACPI:
> invoke DSDT corruption workaround on all Toshiba Satellite,
> 2010-09-28) to squeeze.

I've attached a patch against the squeeze branch, r18343, that does
that.  Thoughts welcome, of course.

Regards,
Jonathan
Index: 
debian/patches/bugfix/x86/ACPI-invoke-DSDT-corruption-workaround-on-all-Toshiba-.patch
===================================================================
--- 
debian/patches/bugfix/x86/ACPI-invoke-DSDT-corruption-workaround-on-all-Toshiba-.patch
      (révision 0)
+++ 
debian/patches/bugfix/x86/ACPI-invoke-DSDT-corruption-workaround-on-all-Toshiba-.patch
      (copie de travail)
@@ -0,0 +1,51 @@
+From: Len Brown <len.br...@intel.com>
+Date: Tue, 28 Sep 2010 22:57:02 -0400
+Subject: ACPI: invoke DSDT corruption workaround on all Toshiba Satellite
+
+commit 100cf87788c0e9104f6fb1b0ff5f72f73fbbbea3 upstream.
+
+Our list of Toshiba Satellite models that require this workaround
+is growing -- so invoke the workaround for the entire product line.
+
+https://bugzilla.kernel.org/show_bug.cgi?id=14679
+
+Signed-off-by: Len Brown <len.br...@intel.com>
+Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
+---
+ drivers/acpi/bus.c |   14 +++-----------
+ 1 files changed, 3 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
+index 6f81634ac620..2a409996d5d3 100644
+--- a/drivers/acpi/bus.c
++++ b/drivers/acpi/bus.c
+@@ -79,23 +79,15 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
+ 
+ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
+       /*
+-       * Insyde BIOS on some TOSHIBA machines corrupt the DSDT.
++       * Invoke DSDT corruption work-around on all Toshiba Satellite.
+        * https://bugzilla.kernel.org/show_bug.cgi?id=14679
+        */
+       {
+        .callback = set_copy_dsdt,
+-       .ident = "TOSHIBA Satellite A505",
++       .ident = "TOSHIBA Satellite",
+        .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"),
++              DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"),
+               },
+       },
+       {}
+-- 
+1.7.8.rc3
+
Index: debian/patches/series/40
===================================================================
--- debian/patches/series/40    (révision 18343)
+++ debian/patches/series/40    (copie de travail)
@@ -31,3 +31,4 @@
 + debian/tty-Avoid-ABI-change-for-addition-of-get_icount.patch
 
 + bugfix/all/gro-reset-vlan_tci-on-reuse.patch
++ bugfix/x86/ACPI-invoke-DSDT-corruption-workaround-on-all-Toshiba-.patch
Index: debian/changelog
===================================================================
--- debian/changelog    (révision 18343)
+++ debian/changelog    (copie de travail)
@@ -44,6 +44,10 @@
     and the bug report which this closes: #650160.
   * gro: reset vlan_tci on reuse
 
+  [ Jonathan Nieder ]
+  * ACPI: fix corrupt DSDT by enabling acpi=copy_dsdt automatically on more
+    known-bad Toshiba models (Closes: #598104)
+
  -- Ben Hutchings <b...@decadent.org.uk>  Thu, 10 Nov 2011 02:28:55 +0000
 
 linux-2.6 (2.6.32-39) stable; urgency=high

Reply via email to