Reviewed-by: Wu, Jiaxin <[email protected]>
> -----Original Message----- > From: [email protected] <[email protected]> On Behalf Of Zeng, > Star > Sent: Thursday, January 12, 2023 8:12 PM > To: [email protected]; Liu, Zhiguang <[email protected]> > Cc: Ni, Ray <[email protected]>; Kumar, Rahul R <[email protected]>; > Dong, Eric <[email protected]>; Tan, Dun <[email protected]>; Zeng, > Star <[email protected]> > Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg: Fix SMM code hangs when > InitPaging > > Reviewed-by: Star Zeng <[email protected]> > > -----Original Message----- > From: [email protected] <[email protected]> On Behalf Of > Zhiguang Liu > Sent: Wednesday, January 4, 2023 1:41 PM > To: [email protected] > Cc: Liu, Zhiguang <[email protected]>; Ni, Ray <[email protected]>; > Kumar, Rahul R <[email protected]>; Dong, Eric <[email protected]> > Subject: [edk2-devel] [PATCH] UefiCpuPkg: Fix SMM code hangs when > InitPaging > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4246 > > In function InitPaging, NumberOfPml5Entries is calculated by below code > NumberOfPml5Entries = (UINTN)LShiftU64 (1, SizeOfMemorySpace - 48); If > the SizeOfMemorySpace is larger than 48, NumberOfPml5Entries will be > larger than 1. However, this doesn't make sense if the hardware doesn't > support 5 level page table. > > Cc: Ray Ni <[email protected]> > Cc: Rahul Kumar <[email protected]> > Signed-off-by: Eric Dong <[email protected]> > Signed-off-by: Zhiguang Liu <[email protected]> > --- > UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c > index c1efda7126..c597b39b8c 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c > @@ -1,7 +1,7 @@ > /** @file > Enable SMM profile. > > -Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.<BR> > +Copyright (c) 2012 - 2023, Intel Corporation. All rights reserved.<BR> > Copyright (c) 2017 - 2020, AMD Incorporated. All rights reserved.<BR> > > SPDX-License-Identifier: BSD-2-Clause-Patent @@ -587,15 +587,17 @@ > InitPaging ( > } > > SizeOfMemorySpace = HighBitSet64 (gPhyMask) + 1; > + ASSERT (SizeOfMemorySpace <= 52); > + > // > - // Calculate the table entries of PML4E and PDPTE. > + // Calculate the table entries of PML5E, PML4E and PDPTE. > // > NumberOfPml5Entries = 1; > - if (SizeOfMemorySpace > 48) { > + if (Enable5LevelPaging && (SizeOfMemorySpace > 48)) { > NumberOfPml5Entries = (UINTN)LShiftU64 (1, SizeOfMemorySpace - 48); > - SizeOfMemorySpace = 48; > } > > + SizeOfMemorySpace = SizeOfMemorySpace > 48 ? 48 : > SizeOfMemorySpace; > NumberOfPml4Entries = 1; > if (SizeOfMemorySpace > 39) { > NumberOfPml4Entries = (UINTN)LShiftU64 (1, SizeOfMemorySpace - 39); > -- > 2.31.1.windows.1 > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#98655): https://edk2.groups.io/g/devel/message/98655 Mute This Topic: https://groups.io/mt/96045489/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
