From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966889AbbDXQDt (ORCPT ); Fri, 24 Apr 2015 12:03:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45154 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965348AbbDXQDp (ORCPT ); Fri, 24 Apr 2015 12:03:45 -0400 Date: Fri, 24 Apr 2015 09:02:41 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: linux-kernel@vger.kernel.org, benh@kernel.crashing.org, tglx@linutronix.de, rdunlap@infradead.org, bp@alien8.de, konrad.wilk@oracle.com, sivanich@sgi.com, joro@8bytes.org, mingo@kernel.org, rjw@rjwysocki.net, jiang.liu@linux.intel.com, hpa@zytor.com, linux@eikelenboom.it, tony.luck@intel.com, bhelgaas@google.com, pavel@ucw.cz, len.brown@intel.com, jroedel@suse.de, david.vrabel@citrix.com, gregkh@linuxfoundation.org, yinghai@kernel.org, david.a.cohen@linux.intel.com Reply-To: sivanich@sgi.com, konrad.wilk@oracle.com, mingo@kernel.org, joro@8bytes.org, tglx@linutronix.de, bp@alien8.de, rdunlap@infradead.org, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, gregkh@linuxfoundation.org, david.a.cohen@linux.intel.com, yinghai@kernel.org, jroedel@suse.de, len.brown@intel.com, david.vrabel@citrix.com, bhelgaas@google.com, pavel@ucw.cz, jiang.liu@linux.intel.com, rjw@rjwysocki.net, linux@eikelenboom.it, tony.luck@intel.com, hpa@zytor.com In-Reply-To: <1428978610-28986-29-git-send-email-jiang.liu@linux.intel.com> References: <1428978610-28986-29-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq, ACPI: Remove private function mp_register_gsi()/ mp_unregister_gsi() Git-Commit-ID: 46176f39b1a6f457eae78999befbdf58e68555e7 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: 46176f39b1a6f457eae78999befbdf58e68555e7 Gitweb: http://git.kernel.org/tip/46176f39b1a6f457eae78999befbdf58e68555e7 Author: Jiang Liu AuthorDate: Tue, 14 Apr 2015 10:30:05 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:55 +0200 x86/irq, ACPI: Remove private function mp_register_gsi()/ mp_unregister_gsi() Function mp_register_gsi() is only called once, so fold it into caller acpi_register_gsi_ioapic(). Do the same for mp_unregister_gsi(). Signed-off-by: Jiang Liu Tested-by: Joerg Roedel Cc: Konrad Rzeszutek Wilk Cc: David Cohen Cc: Sander Eikelenboom Cc: David Vrabel Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Dimitri Sivanich Cc: Len Brown Cc: Pavel Machek Link: http://lkml.kernel.org/r/1428978610-28986-29-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/acpi/boot.c | 57 ++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 39 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 21e460b..91a1012 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -400,42 +400,6 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, return 0; } -static int mp_register_gsi(struct device *dev, u32 gsi, int trigger, - int polarity) -{ - int irq, node; - struct irq_alloc_info info; - - if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) - return gsi; - - trigger = trigger == ACPI_EDGE_SENSITIVE ? 0 : 1; - polarity = polarity == ACPI_ACTIVE_HIGH ? 0 : 1; - node = dev ? dev_to_node(dev) : NUMA_NO_NODE; - ioapic_set_alloc_attr(&info, node, trigger, polarity); - irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC, &info); - if (irq < 0) - return irq; - - /* 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; -} - -static void mp_unregister_gsi(u32 gsi) -{ - int irq; - - if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) - return; - - irq = mp_map_gsi_to_irq(gsi, 0, NULL); - if (irq > 0) - mp_unmap_irq(irq); -} - static struct irq_domain_ops acpi_irqdomain_ops = { .alloc = mp_irqdomain_alloc, .free = mp_irqdomain_free, @@ -662,10 +626,21 @@ static int acpi_register_gsi_ioapic(struct device *dev, u32 gsi, int trigger, int polarity) { int irq = gsi; - #ifdef CONFIG_X86_IO_APIC + int node; + struct irq_alloc_info info; + + node = dev ? dev_to_node(dev) : NUMA_NO_NODE; + trigger = trigger == ACPI_EDGE_SENSITIVE ? 0 : 1; + polarity = polarity == ACPI_ACTIVE_HIGH ? 0 : 1; + ioapic_set_alloc_attr(&info, node, trigger, polarity); + mutex_lock(&acpi_ioapic_lock); - irq = mp_register_gsi(dev, gsi, trigger, polarity); + irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC, &info); + /* Don't set up the ACPI SCI because it's already set up */ + if (irq >= 0 && enable_update_mptable && + acpi_gbl_FADT.sci_interrupt != gsi) + mp_config_acpi_gsi(dev, gsi, trigger, polarity); mutex_unlock(&acpi_ioapic_lock); #endif @@ -675,8 +650,12 @@ static int acpi_register_gsi_ioapic(struct device *dev, u32 gsi, static void acpi_unregister_gsi_ioapic(u32 gsi) { #ifdef CONFIG_X86_IO_APIC + int irq; + mutex_lock(&acpi_ioapic_lock); - mp_unregister_gsi(gsi); + irq = mp_map_gsi_to_irq(gsi, 0, NULL); + if (irq > 0) + mp_unmap_irq(irq); mutex_unlock(&acpi_ioapic_lock); #endif }