UefiCpuPkg/PiSmmCpuDxeSmm: Remove mInternalCr3 in PiSmmCpuDxeSmm

This patch is code refactoring and doesn't change any functionality.
Remove mInternalCr3 in PiSmmCpuDxe pagetable related code. In previous
code, mInternalCr3 is used to pass address of page table which is
different from Cr3 register in different level of SetMemoryAttributes
function. Now remove it and pass the page table base address from the
root function parameter to simplify the code logic.

Signed-off-by: Dun Tan <dun.tan@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

1 files changed, 5 insertions, 25 deletions

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
index 8ec8790c05..97058a2810 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
@@ -29,26 +29,6 @@ EnableCet (
   );

 

 /**

-  Get page table base address and the depth of the page table.

-

-  @param[out] Base        Page table base address.

-  @param[out] FiveLevels  TRUE means 5 level paging. FALSE means 4 level paging.

-**/

-VOID

-GetPageTable (

-  OUT UINTN    *Base,

-  OUT BOOLEAN  *FiveLevels OPTIONAL

-  )

-{

-  *Base = ((mInternalCr3 == 0) ?

-           (AsmReadCr3 () & PAGING_4K_ADDRESS_MASK_64) :

-           mInternalCr3);

-  if (FiveLevels != NULL) {

-    *FiveLevels = FALSE;

-  }

-}

-

-/**

   Create PageTable for SMM use.

 

   @return     PageTable Address

@@ -297,10 +277,10 @@ SetPageTableAttributes (
     DEBUG ((DEBUG_INFO, "Start...\n"));

     PageTableSplitted = FALSE;

 

-    GetPageTable (&PageTableBase, NULL);

-    L3PageTable = (UINT64 *)PageTableBase;

+    PageTableBase = AsmReadCr3 () & PAGING_4K_ADDRESS_MASK_64;

+    L3PageTable   = (UINT64 *)PageTableBase;

 

-    SmmSetMemoryAttributesEx ((EFI_PHYSICAL_ADDRESS)PageTableBase, SIZE_4KB, EFI_MEMORY_RO, &IsSplitted);

+    SmmSetMemoryAttributesEx (PageTableBase, FALSE, (EFI_PHYSICAL_ADDRESS)PageTableBase, SIZE_4KB, EFI_MEMORY_RO, &IsSplitted);

     PageTableSplitted = (PageTableSplitted || IsSplitted);

 

     for (Index3 = 0; Index3 < 4; Index3++) {

@@ -309,7 +289,7 @@ SetPageTableAttributes (
         continue;

       }

 

-      SmmSetMemoryAttributesEx ((EFI_PHYSICAL_ADDRESS)(UINTN)L2PageTable, SIZE_4KB, EFI_MEMORY_RO, &IsSplitted);

+      SmmSetMemoryAttributesEx (PageTableBase, FALSE, (EFI_PHYSICAL_ADDRESS)(UINTN)L2PageTable, SIZE_4KB, EFI_MEMORY_RO, &IsSplitted);

       PageTableSplitted = (PageTableSplitted || IsSplitted);

 

       for (Index2 = 0; Index2 < SIZE_4KB/sizeof (UINT64); Index2++) {

@@ -323,7 +303,7 @@ SetPageTableAttributes (
           continue;

         }

 

-        SmmSetMemoryAttributesEx ((EFI_PHYSICAL_ADDRESS)(UINTN)L1PageTable, SIZE_4KB, EFI_MEMORY_RO, &IsSplitted);

+        SmmSetMemoryAttributesEx (PageTableBase, FALSE, (EFI_PHYSICAL_ADDRESS)(UINTN)L1PageTable, SIZE_4KB, EFI_MEMORY_RO, &IsSplitted);

         PageTableSplitted = (PageTableSplitted || IsSplitted);

       }

     }