Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761598AbdDSJGv (ORCPT ); Wed, 19 Apr 2017 05:06:51 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:22760 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1761564AbdDSJGa (ORCPT ); Wed, 19 Apr 2017 05:06:30 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="17913953" From: Dou Liyang To: , CC: , , , , , , Dou Liyang Subject: [RFC PATCH v2 12/12] x86/apic: Remove the apic_virtual_wire_mode_setup() Date: Wed, 19 Apr 2017 17:05:26 +0800 Message-ID: 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: C7F604670219.A189C 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: 3623 Lines: 121 Currently, enable and setup the interrupt mode has been advanced and it has already included the virtual wire mode setup. The apic_virtual_wire_mode_setup() which works for the virtual wire mode is redundant. Remove the apic_virtual_wire_mode_setup() function and add the apic routing setup for the virtual wire mode. Signed-off-by: Dou Liyang --- arch/x86/include/asm/apic.h | 2 -- arch/x86/kernel/apic/apic.c | 50 +-------------------------------------------- arch/x86/kernel/irqinit.c | 2 -- 3 files changed, 1 insertion(+), 53 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index b0b2cf0..6d643de 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -136,7 +136,6 @@ 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 apic_virtual_wire_mode_setup(void); extern void init_interrupt_mode(void); extern void setup_local_APIC(void); extern void init_apic_mappings(void); @@ -180,7 +179,6 @@ 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) {} static inline void init_interrupt_mode(void) {} #endif /* !CONFIG_X86_LOCAL_APIC */ diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index f259daa..8454226 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1225,55 +1225,6 @@ static int __init apic_bsp_mode_check(int *upmode) } -/* - * Setup the through-local-APIC virtual wire mode. - */ -void __init apic_virtual_wire_mode_setup(void) -{ - unsigned int value; - - /* - * Don't do the setup now if we have a SMP BIOS as the - * through-I/O-APIC virtual wire mode might be active. - */ - if (smp_found_config || !boot_cpu_has(X86_FEATURE_APIC)) - return; - - /* - * Do not trust the local APIC being empty at bootup. - */ - clear_local_APIC(); - - /* - * Enable APIC. - */ - value = apic_read(APIC_SPIV); - value &= ~APIC_VECTOR_MASK; - value |= APIC_SPIV_APIC_ENABLED; - -#ifdef CONFIG_X86_32 - /* This bit is reserved on P4/Xeon and should be cleared */ - if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && - (boot_cpu_data.x86 == 15)) - value &= ~APIC_SPIV_FOCUS_DISABLED; - else -#endif - value |= APIC_SPIV_FOCUS_DISABLED; - value |= SPURIOUS_APIC_VECTOR; - apic_write(APIC_SPIV, value); - - /* - * Set up the virtual wire mode. - */ - apic_write(APIC_LVT0, APIC_DM_EXTINT); - value = APIC_DM_NMI; - if (!lapic_is_integrated()) /* 82489DX */ - value |= APIC_LVT_LEVEL_TRIGGER; - if (apic_extnmi == APIC_EXTNMI_NONE) - value |= APIC_LVT_MASKED; - apic_write(APIC_LVT1, value); -} - /* Init the interrupt delivery mode for the BSP */ void __init init_interrupt_mode(void) { @@ -1286,6 +1237,7 @@ void __init init_interrupt_mode(void) return; case APIC_VIRTUAL_WIRE: pr_info("Switch to virtual wire mode\n"); + default_setup_apic_routing(); break; case APIC_SYMMETRIC_IO: pr_info("Switch to symmectic I/O mode\n"); diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 25ddd7c..a8c0de6 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -72,8 +72,6 @@ void __init init_ISA_irqs(void) struct irq_chip *chip = legacy_pic->chip; int i; - apic_virtual_wire_mode_setup(); - legacy_pic->init(0); for (i = 0; i < nr_legacy_irqs(); i++) -- 2.5.5