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

UefiCpuPkg/CpuPageTableLib:Initialize some LocalVariable at beginning 

Move some local variable initialization to the beginning of the
function. Also delete duplicated calculation for RegionLength.

Signed-off-by: Dun Tan <dun.tan@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Dun Tan 2023-03-16 10:30:53 +08:00 committed by mergify[bot]
parent c18fbd2c31
commit 563a2d2695
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
View File

@ -258,6 +258,7 @@ PageTableLibMapInLevel (
UINTN BitStart; UINTN BitStart;
UINTN Index; UINTN Index;
IA32_PAGING_ENTRY *PagingEntry; IA32_PAGING_ENTRY *PagingEntry;
UINTN PagingEntryIndex;
IA32_PAGING_ENTRY *CurrentPagingEntry; IA32_PAGING_ENTRY *CurrentPagingEntry;
UINT64 RegionLength; UINT64 RegionLength;
UINT64 SubLength; UINT64 SubLength;
@ -288,6 +289,14 @@ PageTableLibMapInLevel (
LocalParentAttribute.Uint64 = ParentAttribute->Uint64; LocalParentAttribute.Uint64 = ParentAttribute->Uint64;
ParentAttribute = &LocalParentAttribute; ParentAttribute = &LocalParentAttribute;
//
// RegionLength: 256T (1 << 48) 512G (1 << 39), 1G (1 << 30), 2M (1 << 21) or 4K (1 << 12).
//
BitStart = 12 + (Level - 1) * 9;
PagingEntryIndex = (UINTN)BitFieldRead64 (LinearAddress + Offset, BitStart, BitStart + 9 - 1);
RegionLength = REGION_LENGTH (Level);
RegionMask = RegionLength - 1;
// //
// ParentPagingEntry ONLY is deferenced for checking Present and MustBeOne bits // ParentPagingEntry ONLY is deferenced for checking Present and MustBeOne bits
// when Modify is FALSE. // when Modify is FALSE.
@ -353,8 +362,7 @@ PageTableLibMapInLevel (
// //
PageTableLibSetPnle (&ParentPagingEntry->Pnle, &NopAttribute, &AllOneMask); PageTableLibSetPnle (&ParentPagingEntry->Pnle, &NopAttribute, &AllOneMask);
RegionLength = REGION_LENGTH (Level); PagingEntry = (IA32_PAGING_ENTRY *)(UINTN)IA32_PNLE_PAGE_TABLE_BASE_ADDRESS (&ParentPagingEntry->Pnle);
PagingEntry = (IA32_PAGING_ENTRY *)(UINTN)IA32_PNLE_PAGE_TABLE_BASE_ADDRESS (&ParentPagingEntry->Pnle);
for (SubOffset = 0, Index = 0; Index < 512; Index++) { for (SubOffset = 0, Index = 0; Index < 512; Index++) {
PagingEntry[Index].Uint64 = OneOfPagingEntry.Uint64 + SubOffset; PagingEntry[Index].Uint64 = OneOfPagingEntry.Uint64 + SubOffset;
SubOffset += RegionLength; SubOffset += RegionLength;
@ -425,15 +433,10 @@ PageTableLibMapInLevel (
} }
// //
// RegionLength: 256T (1 << 48) 512G (1 << 39), 1G (1 << 30), 2M (1 << 21) or 4K (1 << 12).
// RegionStart: points to the linear address that's aligned on RegionLength and lower than (LinearAddress + Offset). // RegionStart: points to the linear address that's aligned on RegionLength and lower than (LinearAddress + Offset).
// //
BitStart = 12 + (Level - 1) * 9; Index = PagingEntryIndex;
Index = (UINTN)BitFieldRead64 (LinearAddress + Offset, BitStart, BitStart + 9 - 1); RegionStart = (LinearAddress + Offset) & ~RegionMask;
RegionLength = LShiftU64 (1, BitStart);
RegionMask = RegionLength - 1;
RegionStart = (LinearAddress + Offset) & ~RegionMask;
ParentAttribute->Uint64 = PageTableLibGetPnleMapAttribute (&ParentPagingEntry->Pnle, ParentAttribute); ParentAttribute->Uint64 = PageTableLibGetPnleMapAttribute (&ParentPagingEntry->Pnle, ParentAttribute);
// //