From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751769AbdH1G52 (ORCPT ); Mon, 28 Aug 2017 02:57:28 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:45840 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751478AbdH1Gxb (ORCPT ); Mon, 28 Aug 2017 02:53:31 -0400 Message-Id: <20170828064958.679561404@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 28 Aug 2017 08:47:47 +0200 From: Thomas Gleixner To: LKML Cc: Ingo Molnar , Peter Anvin , Peter Zijlstra , Andy Lutomirski , Borislav Petkov , Steven Rostedt Subject: [patch V3 32/44] x86/idt: Move early IDT handler setup to IDT code References: <20170828064715.802987421@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=x86-idt--Move-early-idt-handler-setup-to-idt-code.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The early IDT handler setup is done in C entry code for 64 bit and in ASM entry code for 32 bit. Move the 64bit variant to the IDT code so it can be shared with 32bit in the next step. Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/desc.h | 9 +++++++++ arch/x86/kernel/head64.c | 6 +----- arch/x86/kernel/idt.c | 12 ++++++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) --- a/arch/x86/include/asm/desc.h +++ b/arch/x86/include/asm/desc.h @@ -504,6 +504,15 @@ static inline void load_current_idt(void load_idt((const struct desc_ptr *)&idt_descr); } +extern void idt_setup_early_handler(void); +extern void idt_setup_early_traps(void); + +#ifdef CONFIG_X86_64 +extern void idt_setup_early_pf(void); +#else +static inline void idt_setup_early_pf(void) { } +#endif + extern void idt_invalidate(void *addr); #endif /* _ASM_X86_DESC_H */ --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -255,8 +255,6 @@ static void __init copy_bootdata(char *r asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data) { - int i; - /* * Build-time sanity checks on the kernel image and module * area mappings. (these are purely build-time and produce no code) @@ -282,9 +280,7 @@ asmlinkage __visible void __init x86_64_ kasan_early_init(); - for (i = 0; i < NUM_EXCEPTION_VECTORS; i++) - set_intr_gate(i, early_idt_handler_array[i]); - load_idt((const struct desc_ptr *)&idt_descr); + idt_setup_early_handler(); copy_bootdata(__va(real_mode_data)); --- a/arch/x86/kernel/idt.c +++ b/arch/x86/kernel/idt.c @@ -26,6 +26,18 @@ const struct desc_ptr debug_idt_descr = #endif /** + * idt_setup_early_handler - Initializes the idt table with early handlers + */ +void __init idt_setup_early_handler(void) +{ + int i; + + for (i = 0; i < NUM_EXCEPTION_VECTORS; i++) + set_intr_gate(i, early_idt_handler_array[i]); + load_idt(&idt_descr); +} + +/** * idt_invalidate - Invalidate interrupt descriptor table * @addr: The virtual address of the 'invalid' IDT */