From patchwork Tue Apr 20 00:15:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 50503 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 9C146B7D0C for ; Tue, 20 Apr 2010 10:15:23 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O417S-0002Ej-3u; Tue, 20 Apr 2010 01:15:14 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O417Q-0002EZ-PA for kernel-team@lists.ubuntu.com; Tue, 20 Apr 2010 01:15:12 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O417Q-00067F-I6; Tue, 20 Apr 2010 01:15:12 +0100 Received: from c-98-234-57-75.hsd1.ca.comcast.net ([98.234.57.75] helo=[192.168.1.7]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1O417Q-0005Rn-5E; Tue, 20 Apr 2010 01:15:12 +0100 Subject: [Lucid] [PATCH 1/1] SRU: Dell Studio 1558 hangs on resume from suspend From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Date: Mon, 19 Apr 2010 17:15:20 -0700 Message-ID: <1271722520.7038.199.camel@fourier> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 */ ===== From d6d16d70aaebc715795ceaa9fbfbc078703c983a Mon Sep 17 00:00:00 2001 From: Kamal Mostafa 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 Mon, 19 Apr 2010 11:06:35 +0100 + -- Kamal Mostafa 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"), + }, + }, {}, };