From patchwork Fri Jun 30 04:07:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dou Liyang X-Patchwork-Id: 9818965 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 3679D603F3 for ; Fri, 30 Jun 2017 09:20:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27CD4285FB for ; Fri, 30 Jun 2017 09:20:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C1C928607; Fri, 30 Jun 2017 09:20:49 +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 E661228600 for ; Fri, 30 Jun 2017 09:20:47 +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-0005VZ-BJ; Fri, 30 Jun 2017 09:18:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQnE6-0008Io-9N for xen-devel@lists.xenproject.org; Fri, 30 Jun 2017 04:08:14 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 9C/DB-02176-DAEC5595; Fri, 30 Jun 2017 04:08:13 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGIsWRWlGSWpSXmKPExsViPb2gRXfNudB IgymLzSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozpByewFbwWrGjYNoO1gXEffxcjJ4eEgJ/E ssWfWEFsIYFaibtbjrJ1MXIB2SsZJX6c+swC4RxnlGj7fZsNpIpNQEfiTPMDdhBbRCBcYu3ab rAOZoFnjBKffv5g7GLk4BAWCJa4Px/MZBFQldh/NRmknFcgXqLt2GE2iMVyEtu27GEEsTkFbC WWXHnODnGEjcSjXd1MEPWCEidnPmEBsZkFJCQOvnjBDNGrJPF63QEWCFtX4tPqtawQtqbEttX noOabSRzZ+R8qLiix8/kFtgmMIrOQjJ2FZOwCRqZVjBrFqUVlqUW6huZ6SUWZ6RkluYmZObqG BsZ6uanFxYnpqTmJScV6yfm5mxiBYc4ABDsYX572PMQoycGkJMp7blFopBBfUn5KZUZicUZ8U WlOavEhRhkODiUJ3rCzQDnBotT01Iq0zBxgxMGkJTh4lER4BZYApXmLCxJzizPTIVKnGHU5js 34+Y1JiCUvPy9VSpxXDWSGAEhRRmke3AhY9F9ilJUS5mUEOkqIpyC1KDezBFX+FaM4B6OSMC8 PyBSezLwSuE2vgI5gAjpCeEYIyBEliQgpqQZGqXt7gvU2+bpsPsAh+z2vKjpwv9CO020Jb4Q9 +nv6fW0Y53PUqn4NPrq8dL9cgWOxxqLifqFjB/+y+/QsvjJrOsuLm1el2b7Ert4+9el2dq/ty zet+mAQ8XPS571tSg8VPYten453bpB91fGxZpUMY/JGg29tClui8v61K2dbaQkv+DDzVimvEk txRqKhFnNRcSIANrBFUPkCAAA= X-Env-Sender: douly.fnst@cn.fujitsu.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1498795690!103343455!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.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13531 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-8.tower-31.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="20680347" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 30 Jun 2017 12:08:01 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 3F1AA47C654D; Fri, 30 Jun 2017 12:07:59 +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:07:57 +0800 From: Dou Liyang To: , , Date: Fri, 30 Jun 2017 12:07:32 +0800 Message-ID: <5c6ad9d0779fa59825731d58de37a6786f991d83.1498795030.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: 3F1AA47C654D.A6093 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 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 to native_smp_prepare_cpus() 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 | 7 +++++-- 3 files changed, 7 insertions(+), 12 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 63220ca..498edbe 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2341,25 +2341,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..d6721f0 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1347,8 +1347,11 @@ 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); + if (x2apic_mode) + cpu0_logical_apicid = apic_read(APIC_LDR); + else + cpu0_logical_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR)); /* Setup local timer */ x86_init.timers.setup_percpu_clockev();