From patchwork Fri Jun 30 04:07:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dou Liyang X-Patchwork-Id: 9818983 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D599560224 for ; Fri, 30 Jun 2017 09:21:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C69ED285FB for ; Fri, 30 Jun 2017 09:21:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAF9028607; Fri, 30 Jun 2017 09:21:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 55505285FB for ; Fri, 30 Jun 2017 09:21:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQs4A-0005Vk-I6; Fri, 30 Jun 2017 09:18:18 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQnE6-0008Ip-Iw for xen-devel@lists.xenproject.org; Fri, 30 Jun 2017 04:08:14 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id D4/14-03032-DAEC5595; Fri, 30 Jun 2017 04:08:13 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKIsWRWlGSWpSXmKPExsViPb2gRXftudB Ig7fMFt+3TGZyYPQ4/OEKSwBjFGtmXlJ+RQJrxrRZ+5kK5slX/L91mKmBcbFUFyMnh4SAn8T9 bfeZQWwhgVqJU31NTF2MXED2SkaJzYsesUI4xxklHnSuYwWpYhPQkTjT/IAdxBYRCJdYu7abD aSIWeAZo8Snnz8YQRLCAqESK3/dBbI5OFgEVCXen4kBCfMKxEsc2PaeGWKznMS2LXvAyjkFbC WWXHnODnGFjcSjXd1MEPWCEidnPmEBsZkFJCQOvngB1ask8XrdARYIW1fi0fsF7BC2psS21ef YIGwziSM7/7NC2IISO59fYJvAKDILydhZSMYuYGRaxahenFpUllqka6SXVJSZnlGSm5iZo2to YKaXm1pcnJiempOYVKyXnJ+7iREY5AxAsINx2V+nQ4ySHExKorznFoVGCvEl5adUZiQWZ8QXl eakFh9ilOHgUJLgDTsLlBMsSk1PrUjLzAHGG0xagoNHSYRXYAlQmre4IDG3ODMdInWKUZfj2I yf35iEWPLy81KlxHlngswQACnKKM2DGwGL/UuMslLCvIxARwnxFKQW5WaWoMq/YhTnYFQS5uU BmcKTmVcCt+kV0BFMQEcIzwgBOaIkESEl1cDIVn73c/vE9x8Ls99NzuL9ELDAZPXyE8UN57fp WfnVaK7PU76g7/y/cq1+jPbDpK28G7d8dNpYIDI3tl7HdEJo4xqGfXOmpn5n+Xrj6wkenhOVK 598rpv+4bbKVHbt8qz33k2VHQ0hH1KS3BL2MVbdVBO9wtO26O3NjQVy3j6sIrUtSyVFqjKUWI ozEg21mIuKEwG7x8Zj+AIAAA== X-Env-Sender: douly.fnst@cn.fujitsu.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1498795685!74337025!3 X-Originating-IP: [59.151.112.132] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64052 invoked from network); 30 Jun 2017 04:08:12 -0000 Received: from cn.fujitsu.com (HELO heian.cn.fujitsu.com) (59.151.112.132) by server-11.tower-27.messagelabs.com with SMTP; 30 Jun 2017 04:08:12 -0000 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="20680346" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 30 Jun 2017 12:08:00 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id C84D247F64DA; Fri, 30 Jun 2017 12:08:02 +0800 (CST) Received: from localhost.localdomain.localdomain (10.167.226.106) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 30 Jun 2017 12:08:01 +0800 From: Dou Liyang To: , , Date: Fri, 30 Jun 2017 12:07:33 +0800 Message-ID: X-Mailer: git-send-email 2.5.5 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.226.106] X-yoursite-MailScanner-ID: C84D247F64DA.A61C1 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: douly.fnst@cn.fujitsu.com X-Mailman-Approved-At: Fri, 30 Jun 2017 09:18:16 +0000 Cc: Dou Liyang , bhe@redhat.com, peterz@infradead.org, mingo@kernel.org, ebiederm@xmission.com, hpa@zytor.com, izumi.taku@jp.fujitsu.com, boris.ostrovsky@oracle.com, tglx@linutronix.de Subject: [Xen-devel] [PATCH v5 05/12] x86/apic: Unify interrupt mode setup for SMP-capable system X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP In the SMP-capable system, enable and setup the interrupt delivery mode in native_smp_prepare_cpus(). This design mixs the APIC and SMP together, it has highly coupling. Make the initialization of interrupt mode independent, Unify and refine it to apic_intr_mode_init() for SMP-capable system. Signed-off-by: Dou Liyang --- arch/x86/kernel/apic/apic.c | 41 ++++++++++++++++++++++++++++++++++++----- arch/x86/kernel/smpboot.c | 13 ++----------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 498edbe..bea8032 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1160,10 +1160,12 @@ void __init sync_Arb_IDs(void) enum apic_intr_mode { APIC_PIC, APIC_VIRTUAL_WIRE, + APIC_VIRTUAL_WIRE_NO_CONFIG, APIC_SYMMETRIC_IO, + APIC_SYMMETRIC_IO_NO_ROUTING, }; -static int __init apic_intr_mode_select(void) +static int __init apic_intr_mode_select(int *upmode) { /* Check kernel option */ if (disable_apic) { @@ -1206,12 +1208,30 @@ static int __init apic_intr_mode_select(void) if (!smp_found_config) { disable_ioapic_support(); - if (!acpi_lapic) + if (!acpi_lapic) { pr_info("APIC: ACPI MADT or MP tables are not detected\n"); + *upmode = true; + + return APIC_VIRTUAL_WIRE_NO_CONFIG; + } return APIC_VIRTUAL_WIRE; } +#ifdef CONFIG_SMP + /* If SMP should be disabled, then really disable it! */ + if (!setup_max_cpus) { + pr_info("APIC: SMP mode deactivated\n"); + return APIC_SYMMETRIC_IO_NO_ROUTING; + } + + if (read_apic_id() != boot_cpu_physical_apicid) { + panic("Boot APIC ID in local APIC unexpected (%d vs %d)", + read_apic_id(), boot_cpu_physical_apicid); + /* Or can we switch back to PIC here? */ + } +#endif + /* Other checks of APIC options will be done in each setup function */ return APIC_SYMMETRIC_IO; @@ -1269,20 +1289,31 @@ void __init init_bsp_APIC(void) /* Init the interrupt delivery mode for the BSP */ void __init apic_intr_mode_init(void) { - switch (apic_intr_mode_select()) { + int upmode = false; + + switch (apic_intr_mode_select(&upmode)) { case APIC_PIC: apic_printk(APIC_VERBOSE, KERN_INFO "Keep in PIC mode(8259)\n"); return; case APIC_VIRTUAL_WIRE: + case APIC_VIRTUAL_WIRE_NO_CONFIG: apic_printk(APIC_VERBOSE, KERN_INFO "Switch to virtual wire mode setup\n"); - return; + default_setup_apic_routing(); + break; case APIC_SYMMETRIC_IO: apic_printk(APIC_VERBOSE, KERN_INFO "Switch to symmectic I/O mode setup\n"); - return; + default_setup_apic_routing(); + break; + case APIC_SYMMETRIC_IO_NO_ROUTING: + apic_printk(APIC_VERBOSE, KERN_INFO + "Switch to symmectic I/O mode setup in no SMP routine\n"); + break; } + + apic_bsp_setup(upmode); } static void lapic_setup_esr(void) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index d6721f0..b9b2a43 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1321,18 +1321,17 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) set_cpu_sibling_map(0); + apic_intr_mode_init(); + switch (smp_sanity_check(max_cpus)) { case SMP_NO_CONFIG: disable_smp(); - if (APIC_init_uniprocessor()) - pr_notice("Local APIC not detected. Using dummy APIC emulation.\n"); return; case SMP_NO_APIC: disable_smp(); return; case SMP_FORCE_UP: disable_smp(); - apic_bsp_setup(false); /* Setup local timer */ x86_init.timers.setup_percpu_clockev(); return; @@ -1340,14 +1339,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) break; } - if (read_apic_id() != boot_cpu_physical_apicid) { - panic("Boot APIC ID in local APIC unexpected (%d vs %d)", - read_apic_id(), boot_cpu_physical_apicid); - /* Or can we switch back to PIC here? */ - } - - default_setup_apic_routing(); - apic_bsp_setup(false); if (x2apic_mode) cpu0_logical_apicid = apic_read(APIC_LDR); else