Thanks for providing a very clear commit message. Reviewed-by: Ray Ni <ray...@intel.com>
> -----Original Message----- > From: Lou, Yun <yun....@intel.com> > Sent: Wednesday, September 29, 2021 7:53 PM > To: devel@edk2.groups.io > Cc: Lou, Yun <yun....@intel.com>; Ni, Ray <ray...@intel.com>; Dong, Eric > <eric.d...@intel.com>; Laszlo Ersek > <ler...@redhat.com>; Kumar, Rahul1 <rahul1.ku...@intel.com> > Subject: [PATCH v1] UefiCpuPkg: Cpu feature data stored in memory may be > migrated > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3634 > > The memory allocated through "PeiAllocatePool" is located in HOB, and > in DXE phase, the HOB will be migrated to a different location. > After the migration, the data stored in the HOB stays the same, but the > address of pointer to the memory(such as the pointers in ACPI_CPU_DATA > structure) changes, which may cause "PiSmmCpuDxeSmm" driver can't find > the memory(the pointers in ACPI_CPU_DATA structure) that allocated in > "PeiRegisterCpuFeaturesLib", so use "PeiAllocatePages" to allocate > memory instead. > > Signed-off-by: Jason Lou <yun....@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Eric Dong <eric.d...@intel.com> > Cc: Laszlo Ersek <ler...@redhat.com> > Cc: Rahul Kumar <rahul1.ku...@intel.com> > --- > UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > index 6e2ab79518..e9eba64914 100644 > --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > @@ -153,7 +153,7 @@ CpuInitDataInitialize ( > CpuFeaturesData->AcpiCpuData= AcpiCpuData; > > > > CpuStatus = &AcpiCpuData->CpuFeatureInitData.CpuStatus; > > - Location = AllocateZeroPool (sizeof (EFI_CPU_PHYSICAL_LOCATION) * > NumberOfCpus); > > + Location = AllocatePages (EFI_SIZE_TO_PAGES (sizeof > (EFI_CPU_PHYSICAL_LOCATION) * NumberOfCpus)); > > ASSERT (Location != NULL); > > AcpiCpuData->CpuFeatureInitData.ApLocation = > (EFI_PHYSICAL_ADDRESS)(UINTN)Location; > > > > @@ -205,11 +205,11 @@ CpuInitDataInitialize ( > // > > // Collect valid core count in each package because not all cores are > valid. > > // > > - ThreadCountPerPackage = AllocateZeroPool (sizeof (UINT32) * > CpuStatus->PackageCount); > > + ThreadCountPerPackage = AllocatePages (EFI_SIZE_TO_PAGES (sizeof (UINT32) > * CpuStatus->PackageCount)); > > ASSERT (ThreadCountPerPackage != NULL); > > CpuStatus->ThreadCountPerPackage = > (EFI_PHYSICAL_ADDRESS)(UINTN)ThreadCountPerPackage; > > > > - ThreadCountPerCore = AllocateZeroPool (sizeof (UINT8) * > CpuStatus->PackageCount * CpuStatus->MaxCoreCount); > > + ThreadCountPerCore = AllocatePages (EFI_SIZE_TO_PAGES (sizeof (UINT8) * > CpuStatus->PackageCount * CpuStatus- > >MaxCoreCount)); > > ASSERT (ThreadCountPerCore != NULL); > > CpuStatus->ThreadCountPerCore = > (EFI_PHYSICAL_ADDRESS)(UINTN)ThreadCountPerCore; > > > > -- > 2.28.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81284): https://edk2.groups.io/g/devel/message/81284 Mute This Topic: https://groups.io/mt/85946317/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
