sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg/DxeIplPeim: rename variable

Browse Source 
Rename Page5LevelSupported to Page5LevelEnabled.

The variable is set to true in case 5-paging level is enabled (64-bit
PEI) or will be enabled (32-bit PEI), it does *not* tell whenever the
5-level paging is supported by the CPU.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Message-Id: <20240222105407.75735-3-kraxel@redhat.com>
Cc: Michael Roth <michael.roth@amd.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Min Xu <min.m.xu@intel.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: Oliver Steffen <osteffen@redhat.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
[lersek@redhat.com: turn the "Cc:" message headers from Gerd's on-list
 posting into "Cc:" tags in the commit message, in order to pacify
 "PatchCheck.py"]
This commit is contained in:
Gerd Hoffmann
2024-02-22 11:54:06 +01:00
committed by mergify[bot]
parent 73ac735be8
commit 13fbc16556
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
View File

@ -696,7 +696,7 @@ CreateIdentityMappingPageTables (
UINTN TotalPagesNum; UINTN TotalPagesNum;
UINTN BigPageAddress; UINTN BigPageAddress;
VOID *Hob; VOID *Hob;
BOOLEAN Page5LevelSupport; BOOLEAN Page5LevelEnabled;
BOOLEAN Page1GSupport; BOOLEAN Page1GSupport;
PAGE_TABLE_1G_ENTRY *PageDirectory1GEntry; PAGE_TABLE_1G_ENTRY *PageDirectory1GEntry;
UINT64 AddressEncMask; UINT64 AddressEncMask;
@ -744,15 +744,15 @@ CreateIdentityMappingPageTables (
// If cpu has already run in 64bit long mode PEI, Page table Level in DXE must align with previous level. // If cpu has already run in 64bit long mode PEI, Page table Level in DXE must align with previous level.
// //
Cr4.UintN = AsmReadCr4 (); Cr4.UintN = AsmReadCr4 ();
Page5LevelSupport = (Cr4.Bits.LA57 != 0); Page5LevelEnabled = (Cr4.Bits.LA57 != 0);
if (Page5LevelSupport) { if (Page5LevelEnabled) {
ASSERT (PcdGetBool (PcdUse5LevelPageTable)); ASSERT (PcdGetBool (PcdUse5LevelPageTable));
} }
} else { } else {
// //
// If cpu runs in 32bit protected mode PEI, Page table Level in DXE is decided by PCD and feature capability. // If cpu runs in 32bit protected mode PEI, Page table Level in DXE is decided by PCD and feature capability.
// //
Page5LevelSupport = FALSE; Page5LevelEnabled = FALSE;
if (PcdGetBool (PcdUse5LevelPageTable)) { if (PcdGetBool (PcdUse5LevelPageTable)) {
AsmCpuidEx ( AsmCpuidEx (
CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS, CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS,
@ -763,12 +763,12 @@ CreateIdentityMappingPageTables (
NULL NULL
); );
if (EcxFlags.Bits.FiveLevelPage != 0) { if (EcxFlags.Bits.FiveLevelPage != 0) {
Page5LevelSupport = TRUE; Page5LevelEnabled = TRUE;
} }
} }
} }
DEBUG ((DEBUG_INFO, "AddressBits=%u 5LevelPaging=%u 1GPage=%u\n", PhysicalAddressBits, Page5LevelSupport, Page1GSupport)); DEBUG ((DEBUG_INFO, "AddressBits=%u 5LevelPaging=%u 1GPage=%u\n", PhysicalAddressBits, Page5LevelEnabled, Page1GSupport));
// //
// IA-32e paging translates 48-bit linear addresses to 52-bit physical addresses // IA-32e paging translates 48-bit linear addresses to 52-bit physical addresses
@ -776,7 +776,7 @@ CreateIdentityMappingPageTables (
// due to either unsupported by HW, or disabled by PCD. // due to either unsupported by HW, or disabled by PCD.
// //
ASSERT (PhysicalAddressBits <= 52); ASSERT (PhysicalAddressBits <= 52);
if (!Page5LevelSupport && (PhysicalAddressBits > 48)) { if (!Page5LevelEnabled && (PhysicalAddressBits > 48)) {
PhysicalAddressBits = 48; PhysicalAddressBits = 48;
} }
@ -811,7 +811,7 @@ CreateIdentityMappingPageTables (
// //
// Substract the one page occupied by PML5 entries if 5-Level Paging is disabled. // Substract the one page occupied by PML5 entries if 5-Level Paging is disabled.
// //
if (!Page5LevelSupport) { if (!Page5LevelEnabled) {
TotalPagesNum--; TotalPagesNum--;
} }
@ -831,7 +831,7 @@ CreateIdentityMappingPageTables (
// By architecture only one PageMapLevel4 exists - so lets allocate storage for it. // By architecture only one PageMapLevel4 exists - so lets allocate storage for it.
// //
PageMap = (VOID *)BigPageAddress; PageMap = (VOID *)BigPageAddress;
if (Page5LevelSupport) { if (Page5LevelEnabled) {
// //
// By architecture only one PageMapLevel5 exists - so lets allocate storage for it. // By architecture only one PageMapLevel5 exists - so lets allocate storage for it.
// //
@ -853,7 +853,7 @@ CreateIdentityMappingPageTables (
PageMapLevel4Entry = (VOID *)BigPageAddress; PageMapLevel4Entry = (VOID *)BigPageAddress;
BigPageAddress += SIZE_4KB; BigPageAddress += SIZE_4KB;
if (Page5LevelSupport) { if (Page5LevelEnabled) {
// //
// Make a PML5 Entry // Make a PML5 Entry
// //
@ -947,7 +947,7 @@ CreateIdentityMappingPageTables (
ZeroMem (PageMapLevel4Entry, (512 - IndexOfPml4Entries) * sizeof (PAGE_MAP_AND_DIRECTORY_POINTER)); ZeroMem (PageMapLevel4Entry, (512 - IndexOfPml4Entries) * sizeof (PAGE_MAP_AND_DIRECTORY_POINTER));
} }
if (Page5LevelSupport) { if (Page5LevelEnabled) {
Cr4.UintN = AsmReadCr4 (); Cr4.UintN = AsmReadCr4 ();
Cr4.Bits.LA57 = 1; Cr4.Bits.LA57 = 1;
AsmWriteCr4 (Cr4.UintN); AsmWriteCr4 (Cr4.UintN);