From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753803AbbBPTLx (ORCPT ); Mon, 16 Feb 2015 14:11:53 -0500 Received: from filtteri1.pp.htv.fi ([213.243.153.184]:48487 "EHLO filtteri1.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752990AbbBPTLu (ORCPT ); Mon, 16 Feb 2015 14:11:50 -0500 Date: Mon, 16 Feb 2015 21:11:42 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jiang Liu Cc: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Sander Eikelenboom , linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] x86, irq: Fix regression caused by commit b568b8601f05 Message-ID: <20150216191142.GA3311@sci.fi> Mail-Followup-To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , Jiang Liu , "Rafael J. Wysocki" , Len Brown , Pavel Machek , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Sander Eikelenboom , linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org References: <1424039150-4115-1-git-send-email-syrjala@sci.fi> <1424052673-22974-1-git-send-email-jiang.liu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1424052673-22974-1-git-send-email-jiang.liu@linux.intel.com> User-Agent: Mutt/1.5.22 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 16, 2015 at 10:11:13AM +0800, Jiang Liu wrote: > 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? Yep, this seems to fix it. Thanks. Tested-by: Ville Syrjälä Cc: # 3.19 That's one regression fixed on this machine, time to go bisect the next one... > 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; > -- > 1.7.10.4 > -- Ville Syrjälä syrjala@sci.fi http://www.sci.fi/~syrjala/