From patchwork Mon Feb 16 09:17:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 439990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 5D3E314021A; Mon, 16 Feb 2015 20:18:22 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1YNHoi-0008F2-FM; Mon, 16 Feb 2015 09:18:12 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1YNHo7-0008Bl-3J for kernel-team@lists.canonical.com; Mon, 16 Feb 2015 09:17:35 +0000 Received: from [10.172.193.28] by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1YNHo6-0007Ee-Vc; Mon, 16 Feb 2015 09:17:35 +0000 Message-ID: <54E1B5A6.7030404@canonical.com> Date: Mon, 16 Feb 2015 10:17:26 +0100 From: Stefan Bader User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: kernel-team@lists.canonical.com, Andy Whitcroft Subject: Fwd: [PATCH] x86, irq: Fix regression caused by commit b568b8601f05 References: <1424052673-22974-1-git-send-email-jiang.liu@linux.intel.com> In-Reply-To: <1424052673-22974-1-git-send-email-jiang.liu@linux.intel.com> X-Forwarded-Message-Id: <1424052673-22974-1-git-send-email-jiang.liu@linux.intel.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com Andy, there has been no feedback on the fixup, yet. Just a heads-up that the bug fix for Xen acpi irq seems to have some nasty side-effect for some laptops... -Stefan -------- Forwarded Message -------- Subject: [PATCH] x86, irq: Fix regression caused by commit b568b8601f05 Date: Mon, 16 Feb 2015 10:11:13 +0800 From: Jiang Liu To: Ville Syrjälä , Rafael J. Wysocki , Len Brown , Pavel Machek , Thomas Gleixner , Ingo Molnar , H. Peter Anvin , x86@kernel.org CC: Jiang Liu , Sander Eikelenboom , linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Commit b568b8601f05 ("Treat SCI interrupt as normal GSI interrupt") accidently removes support of legacy PIC interrupt when fixing a regression for Xen, which causes a nasty regression on HP/Compaq nc6000 where we fail to register the ACPI interrupt, and thus lose eg. thermal notifications leading a potentially overheated machine. So reintroduce support of legacy PIC based ACPI SCI interrupt. Reported-by: Ville Syrjälä Signed-off-by: Jiang Liu --- Hi Ville, Could you please help to try this patch instead of revert commit b568b8601f05? Thanks! Gerry --- arch/x86/kernel/acpi/boot.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index ae97ed0873c6..3d525c6124f6 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -613,6 +613,11 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp) { int rc, irq, trigger, polarity; + if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) { + *irqp = gsi; + return 0; + } + rc = acpi_get_override_irq(gsi, &trigger, &polarity); if (rc == 0) { trigger = trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;