UefiCpuPkg: Use GenSmmPageTable() to create Smm S3 page table

Use GenSmmPageTable() to create both IA32 and X64 Smm S3
page table.

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>
Cc: Gerd Hoffmann <kraxel@redhat.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c
index cb7a691745..01432d466c 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c
@@ -35,26 +35,14 @@ InitSmmS3Cr3 (
   VOID

   )

 {

-  EFI_PHYSICAL_ADDRESS  Pages;

-  UINT64                *PTEntry;

-

-  //

-  // Generate PAE page table for the first 4GB memory space

-  //

-  Pages = Gen4GPageTable (FALSE);

-

   //

-  // Fill Page-Table-Level4 (PML4) entry

+  // Generate level4 page table for the first 4GB memory space

+  // Return the address of PML4 (to set CR3)

   //

-  PTEntry = (UINT64 *)AllocatePageTableMemory (1);

-  ASSERT (PTEntry != NULL);

-  *PTEntry = Pages | mAddressEncMask | PAGE_ATTRIBUTE_BITS;

-  ZeroMem (PTEntry + 1, EFI_PAGE_SIZE - sizeof (*PTEntry));

-

   //

-  // Return the address of PML4 (to set CR3)

+  // The SmmS3Cr3 is only used by S3Resume PEIM to switch CPU from 32bit to 64bit

   //

-  mSmmS3ResumeState->SmmS3Cr3 = (UINT32)(UINTN)PTEntry;

+  mSmmS3ResumeState->SmmS3Cr3 = (UINT32)GenSmmPageTable (Paging4Level, 32);

 

   return;

 }