From patchwork Fri Mar 20 21:24:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11450387 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE8E31392 for ; Fri, 20 Mar 2020 21:26:17 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB40F20724 for ; Fri, 20 Mar 2020 21:26:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="IsJ86K4j" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB40F20724 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jFP8m-0003w5-B3; Fri, 20 Mar 2020 21:25:16 +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 1jFP8l-0003v9-8X for xen-devel@lists.xenproject.org; Fri, 20 Mar 2020 21:25:15 +0000 X-Inumbo-ID: 425a449b-6af1-11ea-be19-12813bfff9fa Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 425a449b-6af1-11ea-be19-12813bfff9fa; Fri, 20 Mar 2020 21:25:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1584739502; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Yp/861rLdxwmVg8ZyVF+rmArBo6QMsLefGFaDVLdQSs=; b=IsJ86K4j3TmWhgWkUlCjKR8XAkKN6UO39jETlNGcL2aGPRqfalj6NkA6 280qz5eDajE2zzjWMcCg2q7LZMaaabVvqMwi+uytYjXmAx3Km15TLJuMb +6K+Rvi/dGrIOFyTzdZpgV1QIWMX4ZaRwAaei30nD4920fSRoUNGfCxwU I=; Authentication-Results: esa5.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 (esa5.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=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.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=esa5.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 ip4:168.245.78.127 ~all" Received-SPF: None (esa5.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=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: /VJBbAEGva673Cp9VTThZmy4teoqf/DYPrD+56kE2+xteGpLwnkTX5Qq9w/B0LWymf6KW4zhrV UKzxdQWJUK5rMZraHSKArwYubalmx1wrSZFP1aD+7Xt1ZE867Uas2w00k7Rec7MVMfKy1gIrS9 tVBW/eG1iMtTflvBSrZVH0vlI5FMqinZGXXxrQN+Unjpbfo+G2PhqVlm/XULHm6zzXmZLg1KdN sB87NVE9asbQZNg07ndwSnrQWJyiC1tBjk7HvrSiybVgPPqf/hgmtsiqF0XH14VSXsxIlsyhYC dOg= X-SBRS: 2.7 X-MesageID: 14716099 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.72,286,1580792400"; d="scan'208";a="14716099" From: Andrew Cooper To: Xen-devel Date: Fri, 20 Mar 2020 21:24:51 +0000 Message-ID: <20200320212453.21685-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200320212453.21685-1-andrew.cooper3@citrix.com> References: <20200320212453.21685-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 3/4] xen: Drop raw_smp_processor_id() 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: Stefano Stabellini , Julien Grall , Wei Liu , Andrew Cooper , Jan Beulich , Volodymyr Babchuk , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" There is only a single user of raw_smp_processor_id() left in the tree (and it is unconditionally compiled out). Drop the alias from all architectures. Signed-off-by: Andrew Cooper Acked-by: Julien Grall Reviewed-by: Wei Liu --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné CC: Stefano Stabellini CC: Julien Grall CC: Volodymyr Babchuk --- xen/arch/x86/cpu/microcode/amd.c | 2 +- xen/include/asm-arm/smp.h | 2 +- xen/include/asm-x86/smp.h | 2 +- xen/include/xen/smp.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index a053e43923..0998a36b5c 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -306,7 +306,7 @@ static int get_ucode_from_buffer_amd( memcpy(mc_amd->mpb, mpbuf->data, mpbuf->len); pr_debug("microcode: CPU%d size %zu, block size %u offset %zu equivID %#x rev %#x\n", - raw_smp_processor_id(), bufsize, mpbuf->len, *offset, + smp_processor_id(), bufsize, mpbuf->len, *offset, ((struct microcode_header_amd *)mc_amd->mpb)->processor_rev_id, ((struct microcode_header_amd *)mc_amd->mpb)->patch_id); diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h index fdbcefa241..af5a2fe652 100644 --- a/xen/include/asm-arm/smp.h +++ b/xen/include/asm-arm/smp.h @@ -12,7 +12,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu)) -#define raw_smp_processor_id() (get_processor_id()) +#define smp_processor_id() get_processor_id() /* * Do we, for platform reasons, need to actually keep CPUs online when we diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h index 6150363655..f7485f602e 100644 --- a/xen/include/asm-x86/smp.h +++ b/xen/include/asm-x86/smp.h @@ -53,7 +53,7 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm); * from the initial startup. We map APIC_BASE very early in page_setup(), * so this is correct in the x86 case. */ -#define raw_smp_processor_id() (get_processor_id()) +#define smp_processor_id() get_processor_id() void __stop_this_cpu(void); diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h index a64c9b3882..d5a3644611 100644 --- a/xen/include/xen/smp.h +++ b/xen/include/xen/smp.h @@ -65,8 +65,6 @@ void smp_call_function_interrupt(void); void smp_send_call_function_mask(const cpumask_t *mask); -#define smp_processor_id() raw_smp_processor_id() - int alloc_cpu_id(void); extern void *stack_base[NR_CPUS];