tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Gerd Hoffmann <kraxel@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Wu, Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Eric Dong <eric.dong@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
This commit is contained in:
Zhiguang Liu 2023-01-04 11:42:43 +08:00 committed by mergify[bot]
parent 11f0014c0e
commit 13b97736c8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Enable SMM profile. 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> Copyright (c) 2017 - 2020, AMD Incorporated. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -587,13 +587,18 @@ InitPaging (
} }
SizeOfMemorySpace = HighBitSet64 (gPhyMask) + 1; 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; NumberOfPml5Entries = 1;
if (SizeOfMemorySpace > 48) { if (SizeOfMemorySpace > 48) {
NumberOfPml5Entries = (UINTN)LShiftU64 (1, SizeOfMemorySpace - 48); if (Enable5LevelPaging) {
SizeOfMemorySpace = 48; NumberOfPml5Entries = (UINTN)LShiftU64 (1, SizeOfMemorySpace - 48);
}
SizeOfMemorySpace = 48;
} }
NumberOfPml4Entries = 1; NumberOfPml4Entries = 1;