From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=fOKZNRhI; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651936400; x=1683472400; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=fWxcgqr1WxLeX3P45dW33FmYnTfFPJYf+qFj4I0C4Jw=; b=fOKZNRhIwQby0lG0zW/mufxEh0sheE/piGR/T5vzJMvFFBaK0h/bCFy6 A0Y3wJ/yYb1ZOxHhC4SCcFl0K+gFvHq19vi0hLamFCz7Idss6hJrMm5KX U0cd+7oSPVGHKI/ICW/bfmZxD6gcVzv+xQSRZQMlhxxWOpdgrbv266H0T DX1flXl1iIh/qKV2ckzqCiitkHVKDJBlFzwoRMrgfXR0D1A/15o4cWCPE WtGfrDg5y4Du7SM6yjIYR5Eww6yCiG8LJ0/rJ0C9swOrnM+L4yUn8ZIX6 E1lJZx0UI056zB5TAPjsLaqb/YauzhJIO88dy3cxJmfuZAYmcxyO+T81S A==; 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" 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" 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: [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> X-Mailer: git-send-email 2.32.0.windows.1 In-Reply-To: <20220507151313.115-1-ray.ni@intel.com> References: <20220507151313.115-1-ray.ni@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 @@ ;-------------------------------------------------------------------------= ----- ;=0D -; Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.
=0D +; Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved.
=0D ; SPDX-License-Identifier: BSD-2-Clause-Patent=0D ;=0D ; Module Name:=0D @@ -24,8 +24,6 @@ SECTION .text ;ALSO THIS PROCEDURE IS EXECUTED BY APs ONLY ON 16 BIT MODE. HENCE THIS PR= OC=0D ;IS IN MACHINE CODE.=0D ;-------------------------------------------------------------------------= ------------=0D -global ASM_PFX(RendezvousFunnelProc)=0D -ASM_PFX(RendezvousFunnelProc):=0D RendezvousFunnelProcStart:=0D ; At this point CS =3D 0x(vv00) and ip=3D 0x0.=0D BITS 16=0D @@ -207,8 +205,6 @@ RendezvousFunnelProcEnd: ;SwitchToRealProc procedure follows.=0D ;NOT USED IN 32 BIT MODE.=0D ;-------------------------------------------------------------------------= ------------=0D -global ASM_PFX(SwitchToRealProc)=0D -ASM_PFX(SwitchToRealProc):=0D SwitchToRealProcStart:=0D jmp $ ; Never reach here=0D SwitchToRealProcEnd:=0D @@ -219,8 +215,6 @@ SwitchToRealProcEnd: ; The last three parameters (Pm16CodeSegment, SevEsAPJumpTable and Wakeup= Buffer) are=0D ; specific to SEV-ES support and are not applicable on IA32.=0D ;-------------------------------------------------------------------------= ------------=0D -global ASM_PFX(AsmRelocateApLoop)=0D -ASM_PFX(AsmRelocateApLoop):=0D AsmRelocateApLoopStart:=0D mov eax, esp=0D mov esp, [eax + 16] ; TopOfApStack=0D 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=0D ;IS IN MACHINE CODE.=0D ;-------------------------------------------------------------------------= ------------=0D -global ASM_PFX(RendezvousFunnelProc)=0D -ASM_PFX(RendezvousFunnelProc):=0D RendezvousFunnelProcStart:=0D ; At this point CS =3D 0x(vv00) and ip=3D 0x0.=0D ; Save BIST information to ebp firstly=0D @@ -279,8 +277,6 @@ RendezvousFunnelProcEnd: ; r8 - Code32 Selector Offset=0D ; r9 - Stack Start=0D ;-------------------------------------------------------------------------= ------------=0D -global ASM_PFX(SwitchToRealProc)=0D -ASM_PFX(SwitchToRealProc):=0D SwitchToRealProcStart:=0D BITS 64=0D cli=0D @@ -421,8 +417,6 @@ SwitchToRealProcEnd: ;-------------------------------------------------------------------------= ------------=0D ; AsmRelocateApLoop (MwaitSupport, ApTargetCState, PmCodeSegment, TopOfAp= Stack, CountTofinish, Pm16CodeSegment, SevEsAPJumpTable, WakeupBuffer);=0D ;-------------------------------------------------------------------------= ------------=0D -global ASM_PFX(AsmRelocateApLoop)=0D -ASM_PFX(AsmRelocateApLoop):=0D AsmRelocateApLoopStart:=0D BITS 64=0D cmp qword [rsp + 56], 0 ; SevEsAPJumpTable=0D @@ -594,11 +588,11 @@ AsmRelocateApLoopEnd: ;-------------------------------------------------------------------------= ------------=0D global ASM_PFX(AsmGetAddressMap)=0D ASM_PFX(AsmGetAddressMap):=0D - lea rax, [ASM_PFX(RendezvousFunnelProc)]=0D + lea rax, [RendezvousFunnelProcStart]=0D mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RendezvousFunnelAddres= s], rax=0D mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeEntryOffset], Long= ModeStart - RendezvousFunnelProcStart=0D mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RendezvousFunnelSize],= RendezvousFunnelProcEnd - RendezvousFunnelProcStart=0D - lea rax, [ASM_PFX(AsmRelocateApLoop)]=0D + lea rax, [AsmRelocateApLoopStart]=0D mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddr= ess], rax=0D mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSize= ], AsmRelocateApLoopEnd - AsmRelocateApLoopStart=0D mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeTransitionOffset],= Flat32Start - RendezvousFunnelProcStart=0D --=20 2.32.0.windows.1