From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755205AbaKEQgo (ORCPT ); Wed, 5 Nov 2014 11:36:44 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41168 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755103AbaKEQgY (ORCPT ); Wed, 5 Nov 2014 11:36:24 -0500 Date: Wed, 5 Nov 2014 08:34:35 -0800 From: tip-bot for Jiang Liu Message-ID: Cc: bhelgaas@google.com, rjw@rjwysocki.net, rdunlap@infradead.org, hpa@zytor.com, konrad.wilk@oracle.com, yinghai@kernel.org, tglx@linutronix.de, benh@kernel.crashing.org, gregkh@linuxfoundation.org, len.brown@intel.com, tony.luck@intel.com, mingo@kernel.org, jiang.liu@linux.intel.com, pavel@ucw.cz, linux-kernel@vger.kernel.org, bp@alien8.de, joro@8bytes.org Reply-To: joro@8bytes.org, bp@alien8.de, mingo@kernel.org, jiang.liu@linux.intel.com, pavel@ucw.cz, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, len.brown@intel.com, tony.luck@intel.com, yinghai@kernel.org, konrad.wilk@oracle.com, hpa@zytor.com, benh@kernel.crashing.org, tglx@linutronix.de, rdunlap@infradead.org, bhelgaas@google.com, rjw@rjwysocki.net In-Reply-To: <1414397531-28254-2-git-send-email-jiang.liu@linux.intel.com> References: <1414397531-28254-2-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] ACPI, irq, x86: Get rid of special handling of GSI for ACPI SCI Git-Commit-ID: 585c1ee262d793b53812840a033aa1e96c5d9a47 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: 585c1ee262d793b53812840a033aa1e96c5d9a47 Gitweb: http://git.kernel.org/tip/585c1ee262d793b53812840a033aa1e96c5d9a47 Author: Jiang Liu AuthorDate: Mon, 27 Oct 2014 16:11:52 +0800 Committer: Thomas Gleixner CommitDate: Wed, 5 Nov 2014 11:04:46 +0100 ACPI, irq, x86: Get rid of special handling of GSI for ACPI SCI The IOAPIC has logic to track IOAPIC pin status, so there's no need for special treatment for GSI used by ACPI SCI in function mp_register_gsi() and mp_unregister_gsi(). Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Bjorn Helgaas Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Len Brown Cc: Pavel Machek Link: http://lkml.kernel.org/r/1414397531-28254-2-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/acpi/boot.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 1ae52e0..a0e095f 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -408,10 +408,6 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger, if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) return gsi; - /* Don't set up the ACPI SCI because it's already set up */ - if (acpi_gbl_FADT.sci_interrupt == gsi) - return mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC); - trigger = trigger == ACPI_EDGE_SENSITIVE ? 0 : 1; polarity = polarity == ACPI_ACTIVE_HIGH ? 0 : 1; node = dev ? dev_to_node(dev) : NUMA_NO_NODE; @@ -424,7 +420,8 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger, if (irq < 0) return irq; - if (enable_update_mptable) + /* Don't set up the ACPI SCI because it's already set up */ + if (enable_update_mptable && acpi_gbl_FADT.sci_interrupt != gsi) mp_config_acpi_gsi(dev, gsi, trigger, polarity); return irq; @@ -437,9 +434,6 @@ static void mp_unregister_gsi(u32 gsi) if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) return; - if (acpi_gbl_FADT.sci_interrupt == gsi) - return; - irq = mp_map_gsi_to_irq(gsi, 0); if (irq > 0) mp_unmap_irq(irq);