Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761647AbdDSJHd (ORCPT ); Wed, 19 Apr 2017 05:07:33 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:39189 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1761548AbdDSJGU (ORCPT ); Wed, 19 Apr 2017 05:06:20 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="17913941" From: Dou Liyang To: , CC: , , , , , , Dou Liyang Subject: [RFC PATCH v2 10/12] x86/apic: Make the interrupt mode setup earlier for UP system Date: Wed, 19 Apr 2017 17:05:24 +0800 Message-ID: <7cd6ba331a5cd27e5a080cfe16a7929fee7c9233.1492589715.git.douly.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.167.226.106] X-yoursite-MailScanner-ID: CFEAF47CE256.A5027 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 Content-Length: 2216 Lines: 92 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, calibrate delay needs the timer interrupt which may be disabled in dump-capture kernel. Due to the MP table or ACPI has been read earlier, setup the interrupt mode as soon as possible to cleanup the disabled situation for UP kernel and remove the original setup code. Signed-off-by: Dou Liyang --- arch/x86/kernel/apic/apic.c | 49 ++++++--------------------------------------- 1 file changed, 6 insertions(+), 43 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index a915f09..5d27a24 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1224,9 +1224,12 @@ static int __init apic_bsp_mode_check(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; + } /* @@ -2375,51 +2378,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