Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761445AbdDSJFn (ORCPT ); Wed, 19 Apr 2017 05:05:43 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:29089 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1761154AbdDSJFk (ORCPT ); Wed, 19 Apr 2017 05:05:40 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="17913906" From: Dou Liyang To: , CC: , , , , , , Dou Liyang Subject: [RFC PATCH v2 01/12] x86/apic: Replace init_bsp_APIC() with apic_virtual_wire_mode_setup() Date: Wed, 19 Apr 2017 17:05:15 +0800 Message-ID: <1b2976cfbc9b8180abe61b648a2a087d6a36bbb7.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: 8108347CE24C.A11CA 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: 2486 Lines: 74 The init_bsp_APIC() sets up virtual wire mode through the local APIC. The function name implies that the BSP's APIC will be initialized here, which is unsuitable, while its initialization actually locates almost at the end of start_kernel(). And the CONFIG X86_64 is also imply the X86_LOCAL_APIC is y. Rename it with a straightforward name, remove the redundant macros to increase readability by adding an empty stub for the X86_LOCAL_APIC = n. Signed-off-by: Dou Liyang --- arch/x86/include/asm/apic.h | 3 ++- arch/x86/kernel/apic/apic.c | 4 ++-- arch/x86/kernel/irqinit.c | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 730ef65..86597f3 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -127,7 +127,7 @@ extern void disconnect_bsp_APIC(int virt_wire_setup); extern void disable_local_APIC(void); extern void lapic_shutdown(void); extern void sync_Arb_IDs(void); -extern void init_bsp_APIC(void); +extern void apic_virtual_wire_mode_setup(void); extern void setup_local_APIC(void); extern void init_apic_mappings(void); void register_lapic_address(unsigned long address); @@ -170,6 +170,7 @@ static inline void disable_local_APIC(void) { } # define setup_boot_APIC_clock x86_init_noop # define setup_secondary_APIC_clock x86_init_noop static inline void lapic_update_tsc_freq(void) { } +static inline void apic_virtual_wire_mode_setup(void) {} #endif /* !CONFIG_X86_LOCAL_APIC */ #ifdef CONFIG_X86_X2APIC diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 8ccb7ef..221056a 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1154,9 +1154,9 @@ void __init sync_Arb_IDs(void) } /* - * An initial setup of the virtual wire mode. + * Setup the through-local-APIC virtual wire mode. */ -void __init init_bsp_APIC(void) +void __init apic_virtual_wire_mode_setup(void) { unsigned int value; diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 1423ab1..25ddd7c 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -72,9 +72,8 @@ void __init init_ISA_irqs(void) struct irq_chip *chip = legacy_pic->chip; int i; -#if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC) - init_bsp_APIC(); -#endif + apic_virtual_wire_mode_setup(); + legacy_pic->init(0); for (i = 0; i < nr_legacy_irqs(); i++) -- 2.5.5