From patchwork Fri Jan 14 20:17:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manoj Iyer X-Patchwork-Id: 79008 X-Patchwork-Delegate: brad.figg@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 B4E7FB70CC for ; Sat, 15 Jan 2011 07:17:30 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Pdq5L-0004hd-Bk; Fri, 14 Jan 2011 20:17:23 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Pdq5J-0004hJ-Au for kernel-team@lists.ubuntu.com; Fri, 14 Jan 2011 20:17:21 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Pdq5J-000808-7H for ; Fri, 14 Jan 2011 20:17:21 +0000 Received: from [63.133.153.66] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Pdq5I-0007Fu-Qk for kernel-team@lists.ubuntu.com; Fri, 14 Jan 2011 20:17:21 +0000 From: Manoj Iyer To: kernel-team@lists.ubuntu.com Subject: [PATCH] Quirk to fix suspend/resume on Lenovo Edge 11,13,14,15 Date: Fri, 14 Jan 2011 14:17:15 -0600 Message-Id: <1295036235-2506-2-git-send-email-manoj.iyer@canonical.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1295036235-2506-1-git-send-email-manoj.iyer@canonical.com> References: <1295036235-2506-1-git-send-email-manoj.iyer@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 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 Set acpi_skip_timer_override to force ignoring BIOS IRQ0 pin2 override. This fixes resume from suspend on AMD based ThinkPad Edge 11,13,14 and 15. Please note that with this patch applied, you will see a warning message from the kernel, this is printed in acpi/boot.c before it sets acpi_skip_timer_override=1; [ 0.000000] ------------[ cut here ]------------ [ 0.000000] WARNING: at /home/manjo/ubuntu-maverick-674710/arch/x86/kernel/acpi/boot.c:1345 dmi_ignore_irq0_timer_override+0x2e/0x52() [ 0.000000] Hardware name: 254523U [ 0.000000] ati_ixp4x0 quirk not complete. [ 0.000000] Modules linked in: [ 0.000000] Pid: 0, comm: swapper Not tainted 2.6.35-25-generic #43 [ 0.000000] Call Trace: [ 0.000000] [] warn_slowpath_common+0x72/0xa0 [ 0.000000] [] ? dmi_ignore_irq0_timer_override+0x2e/0x52 [ 0.000000] [] ? dmi_ignore_irq0_timer_override+0x2e/0x52 [ 0.000000] [] warn_slowpath_fmt+0x33/0x40 [ 0.000000] [] dmi_ignore_irq0_timer_override+0x2e/0x52 [ 0.000000] [] dmi_check_system+0x30/0x50 [ 0.000000] [] acpi_boot_table_init+0x10/0x7d [ 0.000000] [] ? io_delay_init+0x16/0x18 [ 0.000000] [] setup_arch+0x562/0x645 [ 0.000000] [] ? default_spin_lock_flags+0x9/0x10 [ 0.000000] [] start_kernel+0xcf/0x374 [ 0.000000] [] i386_start_kernel+0xd7/0xdf [ 0.000000] ---[ end trace a7919e7f17c0a725 ]--- [ 0.000000] ThinkPad Edge detected: Ignoring BIOS IRQ0 pin2 override Signed-off-by: Manoj Iyer BugLink: http://launchpad.net/bugs/702434 Acked-by: Stefan Bader Acked-by: Brad Figg --- arch/x86/kernel/acpi/boot.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 71232b9..b0caeb5 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1451,6 +1451,42 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), }, }, + /* ThinkPad Edge 11 (AMD) */ + { + .callback = dmi_ignore_irq0_timer_override, + .ident = "ThinkPad Edge", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "254523U"), + }, + }, + /* ThinkPad Edge 13 (AMD) */ + { + .callback = dmi_ignore_irq0_timer_override, + .ident = "ThinkPad Edge", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "022120U"), + }, + }, + /* ThinkPad Edge 14 (AMD) */ + { + .callback = dmi_ignore_irq0_timer_override, + .ident = "ThinkPad Edge", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "019923U"), + }, + }, + /* ThinkPad Edge 15 (AMD) */ + { + .callback = dmi_ignore_irq0_timer_override, + .ident = "ThinkPad Edge", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "030222U"), + }, + }, {} };