diff options
| author | Dun Tan <dun.tan@intel.com> | 2024-01-11 15:49:46 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-01-15 01:46:36 +0000 |
| commit | f5b91c60ef24eecf5702e061dd7fd700943405b2 (patch) | |
| tree | 5abcf479486846d5a8f3d7e6df8004c486345efb | |
| parent | db59ff333dee07afdd64f9b2efc682d475a9c3ad (diff) | |
| download | edk2-f5b91c60ef24eecf5702e061dd7fd700943405b2.tar.gz | |
UefiCpuPkg: change name of gMpInformationHobGuid2
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.tan@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | UefiCpuPkg/CpuMpPei/CpuMpPei.c | 8 | ||||
| -rw-r--r-- | UefiCpuPkg/CpuMpPei/CpuMpPei.inf | 2 | ||||
| -rw-r--r-- | UefiCpuPkg/Include/Guid/MpInformation2.h | 2 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 6 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf | 2 | ||||
| -rw-r--r-- | 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
|