Some of the order is not in alphabetical, reorder. BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4726
Cc: Ray Ni <ray...@intel.com> Cc: Rahul Kumar <rahul1.ku...@intel.com> Cc: Gerd Hoffmann <kra...@redhat.com> Signed-off-by: Chao Li <lic...@loongson.cn> Acked-by: Gerd Hoffmann <kra...@redhat.com> Reviewed-by: Ray Ni <ray...@intel.com> --- UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf | 29 ++++++++++--------- UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf | 25 ++++++++-------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf index 55e46d4a1f..7ef4c0d4db 100644 --- a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf +++ b/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf @@ -23,21 +23,21 @@ [Defines] [Sources.IA32] Ia32/AmdSev.c - Ia32/MpFuncs.nasm Ia32/CreatePageTable.c + Ia32/MpFuncs.nasm [Sources.X64] X64/AmdSev.c - X64/MpFuncs.nasm X64/CreatePageTable.c + X64/MpFuncs.nasm [Sources.common] AmdSev.c - MpEqu.inc DxeMpLib.c + Microcode.c + MpEqu.inc MpLib.c MpLib.h - Microcode.c MpHandOff.h [Packages] @@ -47,17 +47,18 @@ [Packages] [LibraryClasses] BaseLib + CcExitLib + CpuLib + DebugAgentLib + HobLib LocalApicLib MemoryAllocationLib - HobLib + MicrocodeLib MtrrLib - CpuLib - UefiBootServicesTableLib - DebugAgentLib - SynchronizationLib PcdLib - CcExitLib - MicrocodeLib + SynchronizationLib + UefiBootServicesTableLib + [LibraryClasses.X64] CpuPageTableLib @@ -70,6 +71,9 @@ [Guids] gEdkiiMicrocodePatchHobGuid ## SOMETIMES_CONSUMES ## HOB [Pcd] + gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase ## CONSUMES + gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuBootLogicalProcessorNumber ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds ## SOMETIMES_CONSUMES @@ -82,6 +86,3 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdGhcbHypervisorFeatures ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase ## SOMETIMES_CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdFirstTimeWakeUpAPsBySipi ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase ## CONSUMES - gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr ## CONSUMES diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf index bc3d716aa9..599ca36bc2 100644 --- a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf +++ b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf @@ -31,31 +31,34 @@ [Sources.X64] [Sources.common] AmdSev.c + Microcode.c MpEqu.inc - PeiMpLib.c MpLib.c MpLib.h - Microcode.c MpHandOff.h + PeiMpLib.c + [Packages] MdePkg/MdePkg.dec - UefiCpuPkg/UefiCpuPkg.dec MdeModulePkg/MdeModulePkg.dec + UefiCpuPkg/UefiCpuPkg.dec [LibraryClasses] BaseLib + CcExitLib + CpuLib + HobLib LocalApicLib MemoryAllocationLib - HobLib + MicrocodeLib MtrrLib - CpuLib - SynchronizationLib - PeiServicesLib PcdLib - CcExitLib - MicrocodeLib + PeiServicesLib + SynchronizationLib [Pcd] + gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase ## CONSUMES + gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuBootLogicalProcessorNumber ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds ## SOMETIMES_CONSUMES @@ -66,9 +69,7 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate ## SOMETIMES_CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase ## SOMETIMES_CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdGhcbHypervisorFeatures ## CONSUMES - gUefiCpuPkgTokenSpaceGuid.PcdFirstTimeWakeUpAPsBySipi ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase ## CONSUMES - gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr ## CONSUMES + gUefiCpuPkgTokenSpaceGuid.PcdFirstTimeWakeUpAPsBySipi ## CONSUMES [Ppis] gEdkiiPeiShadowMicrocodePpiGuid ## SOMETIMES_CONSUMES -- 2.27.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117650): https://edk2.groups.io/g/devel/message/117650 Mute This Topic: https://groups.io/mt/105478490/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
