Change name of gMpInformationHobGuid2 to gMpInformation2HobGuid. It's to align with the file name MpInformation2.h and the structure name MP_INFORMATION2_HOB_DATA.
Signed-off-by: Dun Tan <dun....@intel.com> Cc: Ray Ni <ray...@intel.com> Cc: Laszlo Ersek <ler...@redhat.com> Cc: Rahul Kumar <rahul1.ku...@intel.com> Cc: Gerd Hoffmann <kra...@redhat.com> --- UefiCpuPkg/CpuMpPei/CpuMpPei.c | 8 ++++---- UefiCpuPkg/CpuMpPei/CpuMpPei.inf | 2 +- UefiCpuPkg/Include/Guid/MpInformation2.h | 2 +- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 6 +++--- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf | 2 +- UefiCpuPkg/UefiCpuPkg.dec | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c index 93919be94f..2ce4d6ab50 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c @@ -566,7 +566,7 @@ GetProcessorCoreType ( } /** - Create gMpInformationHobGuid2. + Create gMpInformation2HobGuid. **/ VOID BuildMpInformationHob ( @@ -618,13 +618,13 @@ BuildMpInformationHob ( // // Create MP_INFORMATION2_HOB. when the max HobLength 0xFFF8 is not enough, there // will be a MP_INFORMATION2_HOB series in the HOB list. - // In the HOB list, there is a gMpInformationHobGuid2 with 0 value NumberOfProcessors + // In the HOB list, there is a gMpInformation2HobGuid with 0 value NumberOfProcessors // fields to indicate it's the last MP_INFORMATION2_HOB. // while (NumberOfProcessorsInHob != 0) { NumberOfProcessorsInHob = MIN (NumberOfProcessors - ProcessorIndex, MaxProcessorsPerHob); MpInformation2HobData = BuildGuidHob ( - &gMpInformationHobGuid2, + &gMpInformation2HobGuid, sizeof (MP_INFORMATION2_HOB_DATA) + sizeof (MP_INFORMATION2_ENTRY) * NumberOfProcessorsInHob ); ASSERT (MpInformation2HobData != NULL); @@ -744,7 +744,7 @@ InitializeCpuMpWorker ( ASSERT_EFI_ERROR (Status); // - // Create gMpInformationHobGuid2 + // Create gMpInformation2HobGuid // BuildMpInformationHob (); diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf b/UefiCpuPkg/CpuMpPei/CpuMpPei.inf index 812fa179bd..9ab2623bd0 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.inf @@ -50,7 +50,7 @@ [Guids] gEdkiiMigratedFvInfoGuid ## SOMETIMES_CONSUMES ## HOB - gMpInformationHobGuid2 ## PRODUCES + gMpInformation2HobGuid ## PRODUCES [Ppis] gEfiPeiMpServicesPpiGuid ## PRODUCES diff --git a/UefiCpuPkg/Include/Guid/MpInformation2.h b/UefiCpuPkg/Include/Guid/MpInformation2.h index 43185a4b01..2d9266f061 100644 --- a/UefiCpuPkg/Include/Guid/MpInformation2.h +++ b/UefiCpuPkg/Include/Guid/MpInformation2.h @@ -53,6 +53,6 @@ typedef struct { #define GET_MP_INFORMATION_ENTRY(MpInfoHobData, Index) \ (MP_INFORMATION2_ENTRY *)((UINTN)&((MP_INFORMATION2_HOB_DATA *)(MpInfoHobData))->Entry + (MpInfoHobData)->EntrySize * Index) -extern EFI_GUID gMpInformationHobGuid2; +extern EFI_GUID gMpInformation2HobGuid; #endif diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c index 9b230772cb..cd394826ff 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c @@ -776,7 +776,7 @@ GetMpInformation ( HobIndex = 0; HobCount = 0; - FirstMpInfo2Hob = GetFirstGuidHob (&gMpInformationHobGuid2); + FirstMpInfo2Hob = GetFirstGuidHob (&gMpInformation2HobGuid); ASSERT (FirstMpInfo2Hob != NULL); GuidHob = FirstMpInfo2Hob; while (GuidHob != NULL) { @@ -792,7 +792,7 @@ GetMpInformation ( HobCount++; *NumberOfCpus += MpInformation2HobData->NumberOfProcessors; - GuidHob = GetNextGuidHob (&gMpInformationHobGuid2, GET_NEXT_HOB (GuidHob)); + GuidHob = GetNextGuidHob (&gMpInformation2HobGuid, GET_NEXT_HOB (GuidHob)); } ASSERT (*NumberOfCpus <= PcdGet32 (PcdCpuMaxLogicalProcessorNumber)); @@ -820,7 +820,7 @@ GetMpInformation ( GuidHob = FirstMpInfo2Hob; while (HobIndex < HobCount) { MpInfo2Hobs[HobIndex++] = GET_GUID_HOB_DATA (GuidHob); - GuidHob = GetNextGuidHob (&gMpInformationHobGuid2, GET_NEXT_HOB (GuidHob)); + GuidHob = GetNextGuidHob (&gMpInformation2HobGuid, GET_NEXT_HOB (GuidHob)); } ProcessorInfo = (EFI_PROCESSOR_INFORMATION *)AllocatePool (sizeof (EFI_PROCESSOR_INFORMATION) * (*MaxNumberOfCpus)); diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf index 793220aba3..a018954ed7 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf @@ -120,7 +120,7 @@ gEdkiiPiSmmMemoryAttributesTableGuid ## CONSUMES ## SystemTable gEfiMemoryAttributesTableGuid ## CONSUMES ## SystemTable gSmmBaseHobGuid ## CONSUMES - gMpInformationHobGuid2 ## CONSUMES # Assume the HOB must has been created + gMpInformation2HobGuid ## CONSUMES # Assume the HOB must has been created [FeaturePcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug ## CONSUMES diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec index cc785a3222..571b59b36f 100644 --- a/UefiCpuPkg/UefiCpuPkg.dec +++ b/UefiCpuPkg/UefiCpuPkg.dec @@ -89,7 +89,7 @@ gSmmBaseHobGuid = { 0xc2217ba7, 0x03bb, 0x4f63, {0xa6, 0x47, 0x7c, 0x25, 0xc5, 0xfc, 0x9d, 0x73 }} ## Include/Guid/MpInformation2.h - gMpInformationHobGuid2 = { 0x417a7f64, 0xf4e9, 0x4b32, {0x84, 0x6a, 0x5c, 0xc4, 0xd8, 0x62, 0x18, 0x79 }} + gMpInformation2HobGuid = { 0x417a7f64, 0xf4e9, 0x4b32, {0x84, 0x6a, 0x5c, 0xc4, 0xd8, 0x62, 0x18, 0x79 }} [Protocols] ## Include/Protocol/SmmCpuService.h -- 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113601): https://edk2.groups.io/g/devel/message/113601 Mute This Topic: https://groups.io/mt/103658826/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-