From patchwork Fri Jul 26 21:08:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11061829 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F2FE1580 for ; Fri, 26 Jul 2019 21:10:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F7D828B59 for ; Fri, 26 Jul 2019 21:10:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73E1328B56; Fri, 26 Jul 2019 21:10:25 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 195E228B56 for ; Fri, 26 Jul 2019 21:10:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hr7Sb-0001Pg-Mx; Fri, 26 Jul 2019 21:09:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hr7Sa-0001PG-68 for xen-devel@lists.xenproject.org; Fri, 26 Jul 2019 21:09:04 +0000 X-Inumbo-ID: 958944ea-afe9-11e9-9a6a-bf56f8ed891f Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 958944ea-afe9-11e9-9a6a-bf56f8ed891f; Fri, 26 Jul 2019 21:08:58 +0000 (UTC) Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: dHzP8NI7TRlgccmHeDRAroNjZ1OH8ViuzLIQsgJEkZvz3Qv1zQAnEqifUxz2CmqDJy1mZJlu1Q f8ir+zR2of+2UmP1ge63imVn/Z1YnGoQOwz/H/aXbZ5FtKBsXD7yr/sKwTt7GSrgkzij30kiSI hCm6Wlg60UfJp2PhR46PheBWv850l4XemE8g3RVzH32/BG2yuqw2hCKp4aLy0+6ljfIvjYAlB1 SHYoeH0hMh3CenD3X/jnHGS9xv/Uhy5nNbwENmow27lnX3X9gqOSQ6lrTzQwrqNnQAOtgh1dzI VRA= X-SBRS: 2.7 X-MesageID: 3613655 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,312,1559534400"; d="scan'208";a="3613655" From: Andrew Cooper To: Xen-devel Date: Fri, 26 Jul 2019 22:08:51 +0100 Message-ID: <20190726210854.6408-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190726210854.6408-1-andrew.cooper3@citrix.com> References: <20190726210854.6408-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 1/4] arm/percpu: Move {get, set}_processor_id() into smp.h X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Julien Grall , Stefano Stabellini , Volodymyr Babchuk Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP For cleanup purposes, it is necessary for asm/percpu.h to not use DECLARE_PER_CPU() itself. asm/smp.h is arguably a better place for it to live anyway. Signed-off-by: Andrew Cooper --- CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk --- xen/include/asm-arm/percpu.h | 6 ------ xen/include/asm-arm/smp.h | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-arm/percpu.h b/xen/include/asm-arm/percpu.h index 264120b192..5ce81a1707 100644 --- a/xen/include/asm-arm/percpu.h +++ b/xen/include/asm-arm/percpu.h @@ -25,12 +25,6 @@ void percpu_init_areas(void); #define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name -DECLARE_PER_CPU(unsigned int, cpu_id); -#define get_processor_id() (this_cpu(cpu_id)) -#define set_processor_id(id) do { \ - WRITE_SYSREG(__per_cpu_offset[id], TPIDR_EL2); \ - this_cpu(cpu_id) = (id); \ -} while(0) #endif #endif /* __ARM_PERCPU_H__ */ diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h index fdbcefa241..7d4edfa0a0 100644 --- a/xen/include/asm-arm/smp.h +++ b/xen/include/asm-arm/smp.h @@ -7,11 +7,19 @@ #include #endif +DECLARE_PER_CPU(unsigned int, cpu_id); DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_mask); DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu)) +#define get_processor_id() this_cpu(cpu_id) +#define set_processor_id(id) \ +do { \ + WRITE_SYSREG(__per_cpu_offset[(id)], TPIDR_EL2); \ + this_cpu(cpu_id) = (id); \ +} while ( 0 ) + #define raw_smp_processor_id() (get_processor_id()) /*