From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753446AbdEJNpn (ORCPT ); Wed, 10 May 2017 09:45:43 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:36948 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753140AbdEJNpk (ORCPT ); Wed, 10 May 2017 09:45:40 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18692977" From: Dou Liyang To: , CC: , , , , , , Dou Liyang Subject: [RFC PATCH v3 10/12] x86/apic: Make the interrupt mode setup earlier for UP system Date: Wed, 10 May 2017 21:44:47 +0800 Message-ID: <1494423889-25799-11-git-send-email-douly.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1494423889-25799-1-git-send-email-douly.fnst@cn.fujitsu.com> References: <1494423889-25799-1-git-send-email-douly.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.167.226.106] X-yoursite-MailScanner-ID: 6CD3547C6107.AF5B8 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: douly.fnst@cn.fujitsu.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In UniProcessor kernel with UP_LATE_INIT=y, enable and setup the interrupt delivery mode in smp_init() which almost be called at the end of start_kernel(). But, system should not make sure the timer IRQs work well for calibrating delay in dump-capture kernel. Due to the MP table or ACPI has been read earlier, setup the interrupt mode as soon as possible, and make the system run in the final mode to avoid the compatibility issues. Core patch for UP kernel and remove the original setup code. Signed-off-by: Dou Liyang --- v2 --> v3: remove the APIC_init_uniprocessor() arch/x86/include/asm/apic.h | 1 - arch/x86/kernel/apic/apic.c | 49 ++++++--------------------------------------- 2 files changed, 6 insertions(+), 44 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 13f46e3..78a0c74 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -135,7 +135,6 @@ void register_lapic_address(unsigned long address); extern void setup_boot_APIC_clock(void); extern void setup_secondary_APIC_clock(void); extern void lapic_update_tsc_freq(void); -extern int APIC_init_uniprocessor(void); #ifdef CONFIG_X86_64 static inline int apic_force_enable(unsigned long addr) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index b09650d..5fe98b9 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1233,9 +1233,12 @@ static int __init apic_interrupt_mode_select(int *upmode) pr_info("SMP mode deactivated\n"); return APIC_SYMMETRIC_IO_NO_ROUTING; } +#else + /* UP_LATE_INIT is true */ + *upmode = true; #endif - return APIC_SYMMETRIC_IO; + } /* @@ -2382,51 +2385,11 @@ void __init apic_bsp_setup(bool upmode) setup_IO_APIC(); } -/* - * This initializes the IO-APIC and APIC hardware if this is - * a UP kernel. - */ -int __init APIC_init_uniprocessor(void) -{ - if (disable_apic) { - pr_info("Apic disabled\n"); - return -1; - } -#ifdef CONFIG_X86_64 - if (!boot_cpu_has(X86_FEATURE_APIC)) { - disable_apic = 1; - pr_info("Apic disabled by BIOS\n"); - return -1; - } -#else - if (!smp_found_config && !boot_cpu_has(X86_FEATURE_APIC)) - return -1; - - /* - * Complain if the BIOS pretends there is one. - */ - if (!boot_cpu_has(X86_FEATURE_APIC) && - APIC_INTEGRATED(boot_cpu_apic_version)) { - pr_err("BIOS bug, local APIC 0x%x not detected!...\n", - boot_cpu_physical_apicid); - return -1; - } -#endif - - if (!smp_found_config) - disable_ioapic_support(); - - default_setup_apic_routing(); - apic_bsp_setup(true); - /* Setup local timer */ - x86_init.timers.setup_percpu_clockev(); - return 0; -} - #ifdef CONFIG_UP_LATE_INIT void __init up_late_init(void) { - APIC_init_uniprocessor(); + /* Setup local APIC timer */ + x86_init.timers.setup_percpu_clockev(); } #endif -- 2.5.5