From patchwork Tue Apr 20 20:16:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 50572 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 06C05B7D0E for ; Wed, 21 Apr 2010 06:16:30 +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 1O4Jro-00068P-6v; Tue, 20 Apr 2010 21:16:20 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O4Jrm-000688-Dt for kernel-team@lists.ubuntu.com; Tue, 20 Apr 2010 21:16:18 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O4Jrl-000559-RC; Tue, 20 Apr 2010 21:16:18 +0100 Received: from c-98-234-57-75.hsd1.ca.comcast.net ([98.234.57.75] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1O4Jrl-0007mw-Cn; Tue, 20 Apr 2010 21:16:17 +0100 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [Lucid] [PATCH v2] SRU: UBUNTU: SAUCE: Fix hang on resume for Dell Studio 1558, 1557, 1555 Date: Tue, 20 Apr 2010 13:16:04 -0700 Message-Id: <1271794564-9695-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.7.0.4 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. 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. Acked-by: Andy Whitcroft Acked-by: Stefan Bader ===== Add the Dell Studio models (1558, 1557, 1555) to the list of machines needing 'set_sci_en_on_resume' handling; affects only the listed models. BugLink: http://bugs.launchpad.net/bugs/553498 Signed-off-by: Kamal Mostafa --- drivers/acpi/sleep.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) 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"), + }, + }, {}, }; #endif /* CONFIG_SUSPEND */