From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753259AbdH2LZw (ORCPT ); Tue, 29 Aug 2017 07:25:52 -0400 Received: from terminus.zytor.com ([65.50.211.136]:50509 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752247AbdH2LZu (ORCPT ); Tue, 29 Aug 2017 07:25:50 -0400 Date: Tue, 29 Aug 2017 04:20:03 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, brgerst@gmail.com, jpoimboe@redhat.com, luto@kernel.org, mingo@kernel.org, peterz@infradead.org, rostedt@goodmis.org, torvalds@linux-foundation.org, tglx@linutronix.de, bp@alien8.de Reply-To: peterz@infradead.org, bp@alien8.de, torvalds@linux-foundation.org, tglx@linutronix.de, rostedt@goodmis.org, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, jpoimboe@redhat.com, luto@kernel.org, brgerst@gmail.com In-Reply-To: <20170828064959.340209198@linutronix.de> References: <20170828064959.340209198@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/idt: Move interrupt gate initialization to IDT code Git-Commit-ID: dc20b2d526539344d7175a2a83221337302596b8 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: dc20b2d526539344d7175a2a83221337302596b8 Gitweb: http://git.kernel.org/tip/dc20b2d526539344d7175a2a83221337302596b8 Author: Thomas Gleixner AuthorDate: Mon, 28 Aug 2017 08:47:55 +0200 Committer: Ingo Molnar CommitDate: Tue, 29 Aug 2017 12:07:28 +0200 x86/idt: Move interrupt gate initialization to IDT code Move the gate intialization from interrupt init to the IDT code so all IDT related operations are at a single place. Signed-off-by: Thomas Gleixner Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/20170828064959.340209198@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/idt.c | 18 ++++++++++++++++++ arch/x86/kernel/irqinit.c | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/x86/kernel/idt.c b/arch/x86/kernel/idt.c index 4327104..99f93a6 100644 --- a/arch/x86/kernel/idt.c +++ b/arch/x86/kernel/idt.c @@ -286,7 +286,25 @@ void __init idt_setup_debugidt_traps(void) */ void __init idt_setup_apic_and_irq_gates(void) { + int i = FIRST_EXTERNAL_VECTOR; + void *entry; + idt_setup_from_table(idt_table, apic_idts, ARRAY_SIZE(apic_idts)); + + for_each_clear_bit_from(i, used_vectors, FIRST_SYSTEM_VECTOR) { + entry = irq_entries_start + 8 * (i - FIRST_EXTERNAL_VECTOR); + set_intr_gate(i, entry); + } + + for_each_clear_bit_from(i, used_vectors, NR_VECTORS) { +#ifdef CONFIG_X86_LOCAL_APIC + set_bit(i, used_vectors); + set_intr_gate(i, spurious_interrupt); +#else + entry = irq_entries_start + 8 * (i - FIRST_EXTERNAL_VECTOR); + set_intr_gate(i, entry); +#endif + } } /** diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 218cd06..1add9e0 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -89,29 +89,11 @@ void __init init_IRQ(void) void __init native_init_IRQ(void) { - int i; - /* Execute any quirks before the call gates are initialised: */ x86_init.irqs.pre_vector_init(); idt_setup_apic_and_irq_gates(); - /* - * Cover the whole vector space, no vector can escape - * us. (some of these will be overridden and become - * 'special' SMP interrupts) - */ - i = FIRST_EXTERNAL_VECTOR; - for_each_clear_bit_from(i, used_vectors, FIRST_SYSTEM_VECTOR) { - /* IA32_SYSCALL_VECTOR could be used in trap_init already. */ - set_intr_gate(i, irq_entries_start + - 8 * (i - FIRST_EXTERNAL_VECTOR)); - } -#ifdef CONFIG_X86_LOCAL_APIC - for_each_clear_bit_from(i, used_vectors, NR_VECTORS) - set_intr_gate(i, spurious_interrupt); -#endif - if (!acpi_ioapic && !of_ioapic && nr_legacy_irqs()) setup_irq(2, &irq2);