From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753367AbbBRRJJ (ORCPT ); Wed, 18 Feb 2015 12:09:09 -0500 Received: from terminus.zytor.com ([198.137.202.10]:39051 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752486AbbBRRJF (ORCPT ); Wed, 18 Feb 2015 12:09:05 -0500 Date: Wed, 18 Feb 2015 09:08:06 -0800 From: tip-bot for Jiang Liu Message-ID: Cc: syrjala@sci.fi, tglx@linutronix.de, linux-kernel@vger.kernel.org, pavel@ucw.cz, hpa@zytor.com, mingo@kernel.org, torvalds@linux-foundation.org, jiang.liu@linux.intel.com, peterz@infradead.org, len.brown@intel.com, rjw@rjwysocki.net, linux@eikelenboom.it Reply-To: len.brown@intel.com, rjw@rjwysocki.net, linux@eikelenboom.it, mingo@kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, jiang.liu@linux.intel.com, syrjala@sci.fi, pavel@ucw.cz, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <1424052673-22974-1-git-send-email-jiang.liu@linux.intel.com> References: <1424052673-22974-1-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] x86/irq: Fix regression caused by commit b568b8601f05 Git-Commit-ID: 1ea76fbadd667b19c4fa4466f3a3b55a505e83d9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1ea76fbadd667b19c4fa4466f3a3b55a505e83d9 Gitweb: http://git.kernel.org/tip/1ea76fbadd667b19c4fa4466f3a3b55a505e83d9 Author: Jiang Liu AuthorDate: Mon, 16 Feb 2015 10:11:13 +0800 Committer: Ingo Molnar CommitDate: Wed, 18 Feb 2015 15:01:41 +0100 x86/irq: Fix regression caused by commit b568b8601f05 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ä Tested-by: Ville Syrjälä Signed-off-by: Jiang Liu Signed-off-by: Peter Zijlstra (Intel) Acked-by: Pavel Machek Cc: # 3.19+ Cc: H. Peter Anvin Cc: Len Brown Cc: Linus Torvalds Cc: Rafael J. Wysocki Cc: Sander Eikelenboom Cc: linux-pm@vger.kernel.org Link: http://lkml.kernel.org/r/1424052673-22974-1-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Ingo Molnar --- 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 a18fff3..8b59163 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;