Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Dun Tan 2024-01-11 15:49:46 +08:00 committed by mergify[bot]
parent db59ff333d
commit f5b91c60ef
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UefiCpuPkg/CpuMpPei/CpuMpPei.c
View File

@ -566,7 +566,7 @@ GetProcessorCoreType (
} }
/** /**
Create gMpInformationHobGuid2. Create gMpInformation2HobGuid.
**/ **/
VOID VOID
BuildMpInformationHob ( BuildMpInformationHob (
@ -618,13 +618,13 @@ BuildMpInformationHob (
// //
// Create MP_INFORMATION2_HOB. when the max HobLength 0xFFF8 is not enough, there // Create MP_INFORMATION2_HOB. when the max HobLength 0xFFF8 is not enough, there
// will be a MP_INFORMATION2_HOB series in the HOB list. // 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. // fields to indicate it's the last MP_INFORMATION2_HOB.
// //
while (NumberOfProcessorsInHob != 0) { while (NumberOfProcessorsInHob != 0) {
NumberOfProcessorsInHob = MIN (NumberOfProcessors - ProcessorIndex, MaxProcessorsPerHob); NumberOfProcessorsInHob = MIN (NumberOfProcessors - ProcessorIndex, MaxProcessorsPerHob);
MpInformation2HobData = BuildGuidHob ( MpInformation2HobData = BuildGuidHob (
&gMpInformationHobGuid2, &gMpInformation2HobGuid,
sizeof (MP_INFORMATION2_HOB_DATA) + sizeof (MP_INFORMATION2_ENTRY) * NumberOfProcessorsInHob sizeof (MP_INFORMATION2_HOB_DATA) + sizeof (MP_INFORMATION2_ENTRY) * NumberOfProcessorsInHob
); );
ASSERT (MpInformation2HobData != NULL); ASSERT (MpInformation2HobData != NULL);
@ -744,7 +744,7 @@ InitializeCpuMpWorker (
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
// //
// Create gMpInformationHobGuid2 // Create gMpInformation2HobGuid
// //
BuildMpInformationHob (); BuildMpInformationHob ();

2
UefiCpuPkg/CpuMpPei/CpuMpPei.inf
View File

@ -50,7 +50,7 @@
[Guids] [Guids]
gEdkiiMigratedFvInfoGuid ## SOMETIMES_CONSUMES ## HOB gEdkiiMigratedFvInfoGuid ## SOMETIMES_CONSUMES ## HOB
gMpInformationHobGuid2 ## PRODUCES gMpInformation2HobGuid ## PRODUCES
[Ppis] [Ppis]
gEfiPeiMpServicesPpiGuid ## PRODUCES gEfiPeiMpServicesPpiGuid ## PRODUCES

2
UefiCpuPkg/Include/Guid/MpInformation2.h
View File

@ -53,6 +53,6 @@ typedef struct {
#define GET_MP_INFORMATION_ENTRY(MpInfoHobData, Index) \ #define GET_MP_INFORMATION_ENTRY(MpInfoHobData, Index) \
(MP_INFORMATION2_ENTRY *)((UINTN)&((MP_INFORMATION2_HOB_DATA *)(MpInfoHobData))->Entry + (MpInfoHobData)->EntrySize * Index) (MP_INFORMATION2_ENTRY *)((UINTN)&((MP_INFORMATION2_HOB_DATA *)(MpInfoHobData))->Entry + (MpInfoHobData)->EntrySize * Index)
extern EFI_GUID gMpInformationHobGuid2; extern EFI_GUID gMpInformation2HobGuid;
#endif #endif

6
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
View File

@ -776,7 +776,7 @@ GetMpInformation (
HobIndex = 0; HobIndex = 0;
HobCount = 0; HobCount = 0;
FirstMpInfo2Hob = GetFirstGuidHob (&gMpInformationHobGuid2); FirstMpInfo2Hob = GetFirstGuidHob (&gMpInformation2HobGuid);
ASSERT (FirstMpInfo2Hob != NULL); ASSERT (FirstMpInfo2Hob != NULL);
GuidHob = FirstMpInfo2Hob; GuidHob = FirstMpInfo2Hob;
while (GuidHob != NULL) { while (GuidHob != NULL) {
@ -792,7 +792,7 @@ GetMpInformation (
HobCount++; HobCount++;
*NumberOfCpus += MpInformation2HobData->NumberOfProcessors; *NumberOfCpus += MpInformation2HobData->NumberOfProcessors;
GuidHob = GetNextGuidHob (&gMpInformationHobGuid2, GET_NEXT_HOB (GuidHob)); GuidHob = GetNextGuidHob (&gMpInformation2HobGuid, GET_NEXT_HOB (GuidHob));
} }
ASSERT (*NumberOfCpus <= PcdGet32 (PcdCpuMaxLogicalProcessorNumber)); ASSERT (*NumberOfCpus <= PcdGet32 (PcdCpuMaxLogicalProcessorNumber));
@ -820,7 +820,7 @@ GetMpInformation (
GuidHob = FirstMpInfo2Hob; GuidHob = FirstMpInfo2Hob;
while (HobIndex < HobCount) { while (HobIndex < HobCount) {
MpInfo2Hobs[HobIndex++] = GET_GUID_HOB_DATA (GuidHob); 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)); ProcessorInfo = (EFI_PROCESSOR_INFORMATION *)AllocatePool (sizeof (EFI_PROCESSOR_INFORMATION) * (*MaxNumberOfCpus));

2
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
View File

@ -120,7 +120,7 @@
gEdkiiPiSmmMemoryAttributesTableGuid ## CONSUMES ## SystemTable gEdkiiPiSmmMemoryAttributesTableGuid ## CONSUMES ## SystemTable
gEfiMemoryAttributesTableGuid ## CONSUMES ## SystemTable gEfiMemoryAttributesTableGuid ## CONSUMES ## SystemTable
gSmmBaseHobGuid ## CONSUMES gSmmBaseHobGuid ## CONSUMES
gMpInformationHobGuid2 ## CONSUMES # Assume the HOB must has been created gMpInformation2HobGuid ## CONSUMES # Assume the HOB must has been created
[FeaturePcd] [FeaturePcd]
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug ## CONSUMES

2
UefiCpuPkg/UefiCpuPkg.dec
View File

@ -89,7 +89,7 @@
gSmmBaseHobGuid = { 0xc2217ba7, 0x03bb, 0x4f63, {0xa6, 0x47, 0x7c, 0x25, 0xc5, 0xfc, 0x9d, 0x73 }} gSmmBaseHobGuid = { 0xc2217ba7, 0x03bb, 0x4f63, {0xa6, 0x47, 0x7c, 0x25, 0xc5, 0xfc, 0x9d, 0x73 }}
## Include/Guid/MpInformation2.h ## 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] [Protocols]
## Include/Protocol/SmmCpuService.h ## Include/Protocol/SmmCpuService.h