From nobody Mon Feb 9 00:43:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89577+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89577+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1651936402; cv=none; d=zohomail.com; s=zohoarc; b=lfgNsl36dtPKCaTnOxu6zV7HFl2ZSezunLydOckhLGO0rl5aIAFIbX12vFGloyUZmR7HhtsSOWa+MxofIcZZg4MJ9UMh8HQdL8wTRgjG2svRMG8AcrDKUGq5lEK3qnMc6Ph8QT7t8dGhr3UAR+8rUl79Wxdmbf6BiNztikLwahc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651936402; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=SaCN6I+MmB0ah0Ez+H4B10gW1hC+JYEzvyd5sgLKUP8=; b=FRsPHirhZa/cA5fp/Fub2o1tKDq2/R7EQE5WDN13c6u2tecihw2cFVOjAX4Pjtl9YxU9ij4mA5vlV7Bm4SJN34WBvXvllE0I9B0ehG/wAatik0vcYwTxLTX+9j1WV4y7NZkDec9bPXdj1AqpzJ8a1YDLYXzAucqWn0bGLQsPq4U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89577+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1651936402552895.0664188914071; Sat, 7 May 2022 08:13:22 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id eFayYY1788612xg8jCaCFla8; Sat, 07 May 2022 08:13:21 -0700 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.10776.1651936400565355060 for ; Sat, 07 May 2022 08:13:20 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10340"; a="268345241" X-IronPort-AV: E=Sophos;i="5.91,207,1647327600"; d="scan'208";a="268345241" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2022 08:13:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,207,1647327600"; d="scan'208";a="601004353" X-Received: from shwdeopenlab706.ccr.corp.intel.com ([10.239.183.102]) by orsmga001.jf.intel.com with ESMTP; 07 May 2022 08:13:19 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH 2/4] MpInitLib: remove unneeded global ASM_PFX Date: Sat, 7 May 2022 23:13:11 +0800 Message-Id: <20220507151313.115-3-ray.ni@intel.com> In-Reply-To: <20220507151313.115-1-ray.ni@intel.com> References: <20220507151313.115-1-ray.ni@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ray.ni@intel.com X-Gm-Message-State: xwUqvodr7Y6SygVC52j01yQox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1651936401; bh=FP0sVaY9lKOURFWs6hexRPRsiPL4lYtt8x1xbVoSx0M=; h=Date:From:Reply-To:Subject:To; b=nRMAM8Pq2LXa7Ctk9oV/E0aARn/HyI6VZ28YElTTAY5z0DzoJ9qEdXMAXjag7Ec3FFz hdp4FpOKX6IVnEQCC1KWzYRGi+1KdyHj0rJ891QUiuEYyz4+O5JSv2/MfcXYbVHIShJze RkrF0wLx/d2ZMSDs50f1P5ObnY5oT7CjV1k= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1651936403787100010 Content-Type: text/plain; charset="utf-8" global in NASM file is used for symbols that are referenced in C files. Remove unneeded global keyword in NASM file. Signed-off-by: Ray Ni --- UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm | 8 +------- UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm | 10 ++-------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm b/UefiCpuPkg/Li= brary/MpInitLib/Ia32/MpFuncs.nasm index 7bd2415670..8981c32722 100644 --- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm @@ -1,5 +1,5 @@ ;-------------------------------------------------------------------------= ----- ; -; Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.
+; Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved.
; SPDX-License-Identifier: BSD-2-Clause-Patent ; ; Module Name: @@ -24,8 +24,6 @@ SECTION .text ;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PR= OC ;IS IN MACHINE CODE. ;-------------------------------------------------------------------------= ------------ -global ASM_PFX(RendezvousFunnelProc) -ASM_PFX(RendezvousFunnelProc): RendezvousFunnelProcStart: ; At this point CS =3D 0x(vv00) and ip=3D 0x0. BITS 16 @@ -207,8 +205,6 @@ RendezvousFunnelProcEnd: ;SwitchToRealProc procedure follows. ;NOT USED IN 32 BIT MODE. ;-------------------------------------------------------------------------= ------------ -global ASM_PFX(SwitchToRealProc) -ASM_PFX(SwitchToRealProc): SwitchToRealProcStart: jmp $ ; Never reach here SwitchToRealProcEnd: @@ -219,8 +215,6 @@ SwitchToRealProcEnd: ; The last three parameters (Pm16CodeSegment, SevEsAPJumpTable and Wakeup= Buffer) are ; specific to SEV-ES support and are not applicable on IA32. ;-------------------------------------------------------------------------= ------------ -global ASM_PFX(AsmRelocateApLoop) -ASM_PFX(AsmRelocateApLoop): AsmRelocateApLoopStart: mov eax, esp mov esp, [eax + 16] ; TopOfApStack diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Lib= rary/MpInitLib/X64/MpFuncs.nasm index f1422fd30a..d7e0e1fabd 100644 --- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm @@ -35,8 +35,6 @@ SECTION .text ;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PR= OC ;IS IN MACHINE CODE. ;-------------------------------------------------------------------------= ------------ -global ASM_PFX(RendezvousFunnelProc) -ASM_PFX(RendezvousFunnelProc): RendezvousFunnelProcStart: ; At this point CS =3D 0x(vv00) and ip=3D 0x0. ; Save BIST information to ebp firstly @@ -279,8 +277,6 @@ RendezvousFunnelProcEnd: ; r8 - Code32 Selector Offset ; r9 - Stack Start ;-------------------------------------------------------------------------= ------------ -global ASM_PFX(SwitchToRealProc) -ASM_PFX(SwitchToRealProc): SwitchToRealProcStart: BITS 64 cli @@ -421,8 +417,6 @@ SwitchToRealProcEnd: ;-------------------------------------------------------------------------= ------------ ; AsmRelocateApLoop (MwaitSupport, ApTargetCState, PmCodeSegment, TopOfAp= Stack, CountTofinish, Pm16CodeSegment, SevEsAPJumpTable, WakeupBuffer); ;-------------------------------------------------------------------------= ------------ -global ASM_PFX(AsmRelocateApLoop) -ASM_PFX(AsmRelocateApLoop): AsmRelocateApLoopStart: BITS 64 cmp qword [rsp + 56], 0 ; SevEsAPJumpTable @@ -594,11 +588,11 @@ AsmRelocateApLoopEnd: ;-------------------------------------------------------------------------= ------------ global ASM_PFX(AsmGetAddressMap) ASM_PFX(AsmGetAddressMap): - lea rax, [ASM_PFX(RendezvousFunnelProc)] + lea rax, [RendezvousFunnelProcStart] mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RendezvousFunnelAddres= s], rax mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeEntryOffset], Long= ModeStart - RendezvousFunnelProcStart mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RendezvousFunnelSize],= RendezvousFunnelProcEnd - RendezvousFunnelProcStart - lea rax, [ASM_PFX(AsmRelocateApLoop)] + lea rax, [AsmRelocateApLoopStart] mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddr= ess], rax mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSize= ], AsmRelocateApLoopEnd - AsmRelocateApLoopStart mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeTransitionOffset],= Flat32Start - RendezvousFunnelProcStart --=20 2.32.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89577): https://edk2.groups.io/g/devel/message/89577 Mute This Topic: https://groups.io/mt/90954626/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-