From patchwork Tue Jan 11 23:06:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manoj Iyer X-Patchwork-Id: 78467 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 B17EFB6F1E for ; Wed, 12 Jan 2011 10:06:40 +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 1PcnIM-0007pH-Sw; Tue, 11 Jan 2011 23:06:30 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PcnIL-0007pC-1O for kernel-team@lists.ubuntu.com; Tue, 11 Jan 2011 23:06:29 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1PcnIK-0006HP-Vy for ; Tue, 11 Jan 2011 23:06:28 +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 1PcnIK-0000bd-J9 for kernel-team@lists.ubuntu.com; Tue, 11 Jan 2011 23:06:28 +0000 From: Manoj Iyer To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: SAUCE: Quirk to fix suspend/resume on Lenovo Edge 11/13/14/15 Date: Tue, 11 Jan 2011 17:06:10 -0600 Message-Id: <1294787170-4843-2-git-send-email-manoj.iyer@canonical.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294787170-4843-1-git-send-email-manoj.iyer@canonical.com> References: <1294787170-4843-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 On Lenovo Edge 11/13/14/15 laptops resume from suspend does not work, Check IRQ0 routing and if it is routed to INT0 of IOAPIC skip the timer override. This patch was tested on Edge 11 and Edge 14, where ATI Technologies Inc SBx00 SMBus Controller rev ids are 41 or 42. Signed-off-by: Manoj Iyer --- arch/x86/kernel/early-quirks.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index ebdb85c..b0a3833 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -166,7 +166,7 @@ static void __init ati_bugs_contd(int num, int slot, int func) return; rev = ati_sbx00_rev(num, slot, func); - if (rev > 0x13) + if ((rev > 0x13) && ((rev != 0x41) && (rev != 0x42))) return; /* check for IRQ0 interrupt swap */