From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759008AbdKQP2N (ORCPT ); Fri, 17 Nov 2017 10:28:13 -0500 Received: from terminus.zytor.com ([65.50.211.136]:40029 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751324AbdKQP1r (ORCPT ); Fri, 17 Nov 2017 10:27:47 -0500 Date: Fri, 17 Nov 2017 07:26:37 -0800 From: tip-bot for Vikas C Sajjan Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, rafael.j.wysocki@intel.com, linux-kernel@vger.kernel.org, vikas.cha.sajjan@hpe.com, mingo@kernel.org Reply-To: mingo@kernel.org, vikas.cha.sajjan@hpe.com, linux-kernel@vger.kernel.org, rafael.j.wysocki@intel.com, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <1510848825-21965-3-git-send-email-vikas.cha.sajjan@hpe.com> References: <1510848825-21965-3-git-send-email-vikas.cha.sajjan@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/acpi: Reduce code duplication in mp_override_legacy_irq() Git-Commit-ID: 4ee2ec1b122599f7b10c849fa7915cebb37b7edb 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: 4ee2ec1b122599f7b10c849fa7915cebb37b7edb Gitweb: https://git.kernel.org/tip/4ee2ec1b122599f7b10c849fa7915cebb37b7edb Author: Vikas C Sajjan AuthorDate: Thu, 16 Nov 2017 21:43:45 +0530 Committer: Thomas Gleixner CommitDate: Fri, 17 Nov 2017 15:30:33 +0100 x86/acpi: Reduce code duplication in mp_override_legacy_irq() The new function mp_register_ioapic_irq() is a subset of the code in mp_override_legacy_irq(). Replace the code duplication by invoking mp_register_ioapic_irq() from mp_override_legacy_irq(). Signed-off-by: Vikas C Sajjan Signed-off-by: Thomas Gleixner Reviewed-by: Thomas Gleixner Acked-by: Rafael J. Wysocki Cc: linux-pm@vger.kernel.org Cc: kkamagui@gmail.com Cc: linux-acpi@vger.kernel.org Link: https://lkml.kernel.org/r/1510848825-21965-3-git-send-email-vikas.cha.sajjan@hpe.com --- arch/x86/kernel/acpi/boot.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 7615379..f4c463d 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -342,13 +342,12 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e #ifdef CONFIG_X86_IO_APIC #define MP_ISA_BUS 0 +static int __init mp_register_ioapic_irq(u8 bus_irq, u8 polarity, + u8 trigger, u32 gsi); + static void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) { - int ioapic; - int pin; - struct mpc_intsrc mp_irq; - /* * Check bus_irq boundary. */ @@ -358,14 +357,6 @@ static void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, } /* - * Convert 'gsi' to 'ioapic.pin'. - */ - ioapic = mp_find_ioapic(gsi); - if (ioapic < 0) - return; - pin = mp_find_ioapic_pin(ioapic, gsi); - - /* * TBD: This check is for faulty timer entries, where the override * erroneously sets the trigger to level, resulting in a HUGE * increase of timer interrupts! @@ -373,16 +364,8 @@ static void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, if ((bus_irq == 0) && (trigger == 3)) trigger = 1; - mp_irq.type = MP_INTSRC; - mp_irq.irqtype = mp_INT; - mp_irq.irqflag = (trigger << 2) | polarity; - mp_irq.srcbus = MP_ISA_BUS; - mp_irq.srcbusirq = bus_irq; /* IRQ */ - mp_irq.dstapic = mpc_ioapic_id(ioapic); /* APIC ID */ - mp_irq.dstirq = pin; /* INTIN# */ - - mp_save_irq(&mp_irq); - + if (mp_register_ioapic_irq(bus_irq, polarity, trigger, gsi) < 0) + return; /* * Reset default identity mapping if gsi is also an legacy IRQ, * otherwise there will be more than one entry with the same GSI