From patchwork Mon Jul 3 11:07:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dou Liyang X-Patchwork-Id: 9822515 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 52B7C60246 for ; Mon, 3 Jul 2017 11:10:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 440F02817F for ; Mon, 3 Jul 2017 11:10:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38697283AD; Mon, 3 Jul 2017 11:10:05 +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 9CE3B2817F for ; Mon, 3 Jul 2017 11:10:04 +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 1dRzCu-0005lb-9U; Mon, 03 Jul 2017 11:07:56 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRzCt-0005kD-5l for xen-devel@lists.xenproject.org; Mon, 03 Jul 2017 11:07:55 +0000 Received: from [193.109.254.147] by server-8.bemta-6.messagelabs.com id 97/BC-03704-A852A595; Mon, 03 Jul 2017 11:07:54 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKIsWRWlGSWpSXmKPExsViPb2gRbdTNSr S4OZtc4vvWyYzOTB6HP5whSWAMYo1My8pvyKBNaPtlmjBHZGKnacnsDUwvhTsYuTkkBDwk9hw bDI7iC0kUCvx6MpqNgh7JaPE0q2VEPYxRon2xdYgNpuAjsSZ5gdg9SIC4RJr13YD1XNxMAs8Y 5T49PMHI0hCWCBY4sCquywgNouAikTjmeVgNq9AvETrpuWsEIvlJLZt2QNWzylgKzGp5TILxD IbiTutzYwQ9YISJ2c+AYszC0hIHHzxghmiV0ni9boDLBC2rsSk3RfYIWxNiW2rz7FB2GYSR3b +h9olKLHz+QW2CYwis5CMnYVk7AJGplWMGsWpRWWpRbpGxnpJRZnpGSW5iZk5uoYGZnq5qcXF iempOYlJxXrJ+bmbGIFBzgAEOxj/zA88xCjJwaQkyut6MzJSiC8pP6UyI7E4I76oNCe1+BCjD AeHkgTvN+WoSCHBotT01Iq0zBxgvMGkJTh4lER4D9wDauUtLkjMLc5Mh0idYtTleDXh/zcmIZ a8/LxUKXFedhWgGQIgRRmleXAjYLF/iVFWSpiXEegoIZ6C1KLczBJU+VeM4hyMSsK8n0Au4cn MK4Hb9AroCCagIxp6IkCOKElESEk1MKbNXXVD7v4886O7Fx/vaZktu6exIZzjkcmk0rvNjXvU TxmctJ9xI6TT9mtMacU93e/SB577nc9P02vRdUk7Xqt998Eb31tLM2wqTVaKH69w+7Hmv+SEW SyW35QDX0Q+OKzQKPvyyb0302rfcr97vXzO+uLpmmsXnKiKC93Trl15YLvGdH7efRJKLMUZiY ZazEXFiQDEArIy+AIAAA== X-Env-Sender: douly.fnst@cn.fujitsu.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1499080068!52448529!2 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.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2453 invoked from network); 3 Jul 2017 11:07:53 -0000 Received: from cn.fujitsu.com (HELO heian.cn.fujitsu.com) (59.151.112.132) by server-15.tower-27.messagelabs.com with SMTP; 3 Jul 2017 11:07:53 -0000 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="20783657" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 03 Jul 2017 19:07:51 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 8C2D247F64D3; Mon, 3 Jul 2017 19:07:48 +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; Mon, 3 Jul 2017 19:07:52 +0800 From: Dou Liyang To: , , Date: Mon, 3 Jul 2017 19:07:24 +0800 Message-ID: <451a10df9a6b70e07b5c15aad482e64ebbc9d29d.1499074567.git.douly.fnst@cn.fujitsu.com> 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: 8C2D247F64D3.A3E12 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: douly.fnst@cn.fujitsu.com 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 v6 04/12] x86/apic: Move logical APIC ID away from apic_bsp_setup() 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 apic_bsp_setup() sets and returns logical APIC ID for initializing cpu0_logical_apicid in SMP-capable system. The id has nothing to do with the initialization of local APIC and I/O APIC. And apic_bsp_setup() should be called for interrupt mode setup intently. Move the id setup into a separate helper function for cleanup and mark apic_bsp_setup() void. Signed-off-by: Dou Liyang --- arch/x86/include/asm/apic.h | 2 +- arch/x86/kernel/apic/apic.c | 10 +--------- arch/x86/kernel/smpboot.c | 12 +++++++++++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index ddc16ff..c3bedbd 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -146,7 +146,7 @@ static inline int apic_force_enable(unsigned long addr) extern int apic_force_enable(unsigned long addr); #endif -extern int apic_bsp_setup(bool upmode); +extern void apic_bsp_setup(bool upmode); extern void apic_ap_setup(void); /* diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 83b7c2e..51536b9 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2337,25 +2337,17 @@ static void __init apic_bsp_up_setup(void) * Returns: * apic_id of BSP APIC */ -int __init apic_bsp_setup(bool upmode) +void __init apic_bsp_setup(bool upmode) { - int id; - connect_bsp_APIC(); if (upmode) apic_bsp_up_setup(); setup_local_APIC(); - if (x2apic_mode) - id = apic_read(APIC_LDR); - else - id = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR)); - enable_IO_APIC(); end_local_APIC_setup(); irq_remap_enable_fault_handling(); setup_IO_APIC(); - return id; } /* diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 93f0cda..3f74288 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1287,6 +1287,14 @@ static void __init smp_cpu_index_default(void) } } +static void __init smp_get_logical_apicid(void) +{ + if (x2apic_mode) + cpu0_logical_apicid = apic_read(APIC_LDR); + else + cpu0_logical_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR)); +} + /* * Prepare for SMP bootup. The MP table or ACPI has been read * earlier. Just do some sanity checking here and enable APIC mode. @@ -1347,11 +1355,13 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) } default_setup_apic_routing(); - cpu0_logical_apicid = apic_bsp_setup(false); + apic_bsp_setup(false); /* Setup local timer */ x86_init.timers.setup_percpu_clockev(); + smp_get_logical_apicid(); + pr_info("CPU0: "); print_cpu_info(&cpu_data(0));