Patchwork [Lucid,1/1] SRU: Dell Studio 1558 hangs on resume from suspend

login
register
mail settings
Submitter Kamal Mostafa
Date April 20, 2010, 12:15 a.m.
Message ID <1271722520.7038.199.camel@fourier>
Download mbox | patch
Permalink /patch/50503/
State Superseded
Delegated to: Andy Whitcroft
Headers show

Comments

Kamal Mostafa - April 20, 2010, 12:15 a.m.
Proposed patch for Lucid SRU-

https://bugs.launchpad.net/ubuntu/+source/linux/+bug/553498
Dell Studio 1558 (Arrandale) hangs on resume from suspend

SRU Justification/Impact:

Dell Studio 1558 (and presumably other 155x models) hangs on resume from
suspend.  Attached patch adds the Dell Studio models (1558, 1557, 1555)
to the list of machines needing 'set_sci_en_on_resume' handling, fixing
resume on the 1558.  This change affects only the listed machines.

TEST CASE:

I have built and tested a kernel with this patch and confirmed that it
reliably fixes resume from suspend on my own Dell Studio 1558.

 #endif /* CONFIG_SUSPEND */
Tim Gardner - April 20, 2010, 1:49 a.m.
On 04/19/2010 06:15 PM, Kamal Mostafa wrote:
> Proposed patch for Lucid SRU-
>
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/553498
> Dell Studio 1558 (Arrandale) hangs on resume from suspend
>
> SRU Justification/Impact:
>
> Dell Studio 1558 (and presumably other 155x models) hangs on resume from
> suspend.  Attached patch adds the Dell Studio models (1558, 1557, 1555)
> to the list of machines needing 'set_sci_en_on_resume' handling, fixing
> resume on the 1558.  This change affects only the listed machines.
>
> TEST CASE:
>
> I have built and tested a kernel with this patch and confirmed that it
> reliably fixes resume from suspend on my own Dell Studio 1558.
>
> =====
>
>  From d6d16d70aaebc715795ceaa9fbfbc078703c983a Mon Sep 17 00:00:00 2001
> From: Kamal Mostafa<kamal@canonical.com>
> Date: Mon, 19 Apr 2010 17:45:33 -0400
> Subject: [PATCH] UBUNTU: SAUCE: Fix hang on resume for Dell Studio 1558,
> 1557, 1555
>
> BugLink: http://bugs.launchpad.net/bugs/553498
> ---
>   debian.master/changelog |    9 ++++-----
>   drivers/acpi/sleep.c    |   24 ++++++++++++++++++++++++
>   2 files changed, 28 insertions(+), 5 deletions(-)
>
> diff --git a/debian.master/changelog b/debian.master/changelog
> index f661b70..b2b36c8 100644
> --- a/debian.master/changelog
> +++ b/debian.master/changelog
> @@ -1,10 +1,9 @@
> -linux (2.6.32-21.33) UNRELEASED; urgency=low
> +linux (2.6.32-21.33~kamal~dell_155x_resume) lucid; urgency=low
>
> -  CHANGELOG: Do not edit directly. Autogenerated at release.
> -  CHANGELOG: Use the printchanges target to see the curent changes.
> -  CHANGELOG: Use the insertchanges target to create the final log.
> +  * Fix hang on resume for Dell Studio 1558, 1557, 1555
> (set_sci_en_on_resume)
> +    - LP: #553498
>
> - -- Andy Whitcroft<apw@canonical.com>   Mon, 19 Apr 2010 11:06:35 +0100
> + -- Kamal Mostafa<kamal@canonical.com>   Mon, 19 Apr 2010 15:20:45
> -0400
>
>   linux (2.6.32-21.32) lucid; urgency=low
>

The quirk patch looks fine, but we don't patch or update 
debian.master/changelog manually since updates to that file are 
generated by 'debian/rules insertchanges'.

rtg

Patch

=====

From d6d16d70aaebc715795ceaa9fbfbc078703c983a Mon Sep 17 00:00:00 2001
From: Kamal Mostafa <kamal@canonical.com>
Date: Mon, 19 Apr 2010 17:45:33 -0400
Subject: [PATCH] UBUNTU: SAUCE: Fix hang on resume for Dell Studio 1558,
1557, 1555

BugLink: http://bugs.launchpad.net/bugs/553498
---
 debian.master/changelog |    9 ++++-----
 drivers/acpi/sleep.c    |   24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/debian.master/changelog b/debian.master/changelog
index f661b70..b2b36c8 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,10 +1,9 @@ 
-linux (2.6.32-21.33) UNRELEASED; urgency=low
+linux (2.6.32-21.33~kamal~dell_155x_resume) lucid; urgency=low
 
-  CHANGELOG: Do not edit directly. Autogenerated at release.
-  CHANGELOG: Use the printchanges target to see the curent changes.
-  CHANGELOG: Use the insertchanges target to create the final log.
+  * Fix hang on resume for Dell Studio 1558, 1557, 1555
(set_sci_en_on_resume)
+    - LP: #553498
 
- -- Andy Whitcroft <apw@canonical.com>  Mon, 19 Apr 2010 11:06:35 +0100
+ -- Kamal Mostafa <kamal@canonical.com>  Mon, 19 Apr 2010 15:20:45
-0400
 
 linux (2.6.32-21.32) lucid; urgency=low
 
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 5f2c379..cf3101f 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -453,6 +453,30 @@  static struct dmi_system_id __initdata
acpisleep_dmi_table[] = {
 		DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
 		},
 	},
+	{
+	.callback = init_set_sci_en_on_resume,
+	.ident = "Dell Studio 1558",
+	.matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+		DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1558"),
+		},
+	},
+	{
+	.callback = init_set_sci_en_on_resume,
+	.ident = "Dell Studio 1557",
+	.matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+		DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"),
+		},
+	},
+	{
+	.callback = init_set_sci_en_on_resume,
+	.ident = "Dell Studio 1555",
+	.matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+		DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1555"),
+		},
+	},
 	{},
 };