Add 2 APIs in SmmCpuFeaturesLib.

Add NULL func for 2 new APIs in SmmCpuFeaturesLib.

SmmCpuFeaturesCompleteSmmReadyToLock() is a hook point to allow
CPU specific code to do more registers setting after
the gEfiSmmReadyToLockProtocolGuid notification is completely processed.
Add SmmCpuFeaturesCompleteSmmReadyToLock() to PerformRemainingTasks() and PerformPreTasks().

SmmCpuFeaturesAllocatePageTableMemory() is an API to allow
CPU to allocate a specific region for storing page tables.
All page table allocation will use AllocatePageTableMemory().

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Yao, Jiewen" <jiewen.yao@intel.com>
Reviewed-by: "Kinney, Michael D" <michael.d.kinney@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18958 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 135 insertions, 5 deletions

diff --git a/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h b/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h
index d1c7a8ac96..4478003467 100644
--- a/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h
+++ b/UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h
@@ -363,4 +363,39 @@ SmmCpuFeaturesWriteSaveStateRegister (
   IN CONST VOID                   *Buffer

   );

 

+/**

+  This function is hook point called after the gEfiSmmReadyToLockProtocolGuid

+  notification is completely processed.

+**/

+VOID

+EFIAPI

+SmmCpuFeaturesCompleteSmmReadyToLock (

+  VOID

+  );

+

+/**

+  This API provides a method for a CPU to allocate a specific region for storing page tables.

+

+  This API can be called more once to allocate memory for page tables.

+

+  Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a pointer to the

+  allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL

+  is returned.  If there is not enough memory remaining to satisfy the request, then NULL is

+  returned.

+

+  This function can also return NULL if there is no preference on where the page tables are allocated in SMRAM.

+

+  @param  Pages                 The number of 4 KB pages to allocate.

+

+  @return A pointer to the allocated buffer for page tables.

+  @retval NULL      Fail to allocate a specific region for storing page tables,

+                    Or there is no preference on where the page tables are allocated in SMRAM.

+

+**/

+VOID *

+EFIAPI

+SmmCpuFeaturesAllocatePageTableMemory (

+  IN UINTN           Pages

+  );

+

 #endif

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
index b839d3192f..3e480e1761 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
@@ -615,3 +615,44 @@ SmmCpuFeaturesWriteSaveStateRegister (
 {

   return EFI_UNSUPPORTED;

 }

+

+/**

+  This function is hook point called after the gEfiSmmReadyToLockProtocolGuid

+  notification is completely processed.

+**/

+VOID

+EFIAPI

+SmmCpuFeaturesCompleteSmmReadyToLock (

+  VOID

+  )

+{

+}

+

+/**

+  This API provides a method for a CPU to allocate a specific region for storing page tables.

+

+  This API can be called more once to allocate memory for page tables.

+

+  Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a pointer to the

+  allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL

+  is returned.  If there is not enough memory remaining to satisfy the request, then NULL is

+  returned.

+

+  This function can also return NULL if there is no preference on where the page tables are allocated in SMRAM.

+

+  @param  Pages                 The number of 4 KB pages to allocate.

+

+  @return A pointer to the allocated buffer for page tables.

+  @retval NULL      Fail to allocate a specific region for storing page tables,

+                    Or there is no preference on where the page tables are allocated in SMRAM.

+

+**/

+VOID *

+EFIAPI

+SmmCpuFeaturesAllocatePageTableMemory (

+  IN UINTN           Pages

+  )

+{

+  return NULL;

+}

+

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
index 83f5bf962d..06ffc6dd86 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
@@ -770,7 +770,7 @@ Gen4GPageTable (
   //

   // Allocate the page table

   //

-  PageTable = AllocatePages (ExtraPages + 5 + PagesNeeded);

+  PageTable = AllocatePageTableMemory (ExtraPages + 5 + PagesNeeded);

   ASSERT (PageTable != NULL);

 

   PageTable = (VOID *)((UINTN)PageTable + EFI_PAGES_TO_SIZE (ExtraPages));

@@ -872,7 +872,7 @@ SetCacheability (
     //

     // Allocate a page from SMRAM

     //

-    NewPageTableAddress = AllocatePages (1);

+    NewPageTableAddress = AllocatePageTableMemory (1);

     ASSERT (NewPageTableAddress != NULL);

 

     NewPageTable = (UINT64 *)NewPageTableAddress;

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
index 670a5cf663..fb4655128f 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
@@ -970,9 +970,9 @@ PiCpuSmmEntry (
   //

   BufferPages = EFI_SIZE_TO_PAGES (SIZE_32KB + TileSize * (mMaxNumberOfCpus - 1));

   if ((FamilyId == 4) || (FamilyId == 5)) {

-    Buffer = AllocateAlignedCodePages (BufferPages, SIZE_32KB);

+    Buffer = AllocateAlignedPages (BufferPages, SIZE_32KB);

   } else {

-    Buffer = AllocateAlignedCodePages (BufferPages, SIZE_4KB);

+    Buffer = AllocateAlignedPages (BufferPages, SIZE_4KB);

   }

   ASSERT (Buffer != NULL);

   DEBUG ((EFI_D_INFO, "SMRAM SaveState Buffer (0x%08x, 0x%08x)\n", Buffer, EFI_PAGES_TO_SIZE(BufferPages)));

@@ -1416,6 +1416,35 @@ ConfigSmmCodeAccessCheck (
 }

 

 /**

+  This API provides a way to allocate memory for page table.

+

+  This API can be called more once to allocate memory for page tables.

+

+  Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a pointer to the

+  allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL

+  is returned.  If there is not enough memory remaining to satisfy the request, then NULL is

+  returned.

+

+  @param  Pages                 The number of 4 KB pages to allocate.

+

+  @return A pointer to the allocated buffer or NULL if allocation fails.

+

+**/

+VOID *

+AllocatePageTableMemory (

+  IN UINTN           Pages

+  )

+{

+  VOID  *Buffer;

+

+  Buffer = SmmCpuFeaturesAllocatePageTableMemory (Pages);

+  if (Buffer != NULL) {

+    return Buffer;

+  }

+  return AllocatePages (Pages);

+}

+

+/**

   Perform the remaining tasks.

 

 **/

@@ -1440,6 +1469,8 @@ PerformRemainingTasks (
     //

     ConfigSmmCodeAccessCheck ();

 

+    SmmCpuFeaturesCompleteSmmReadyToLock ();

+

     //

     // Clean SMM ready to lock flag

     //

@@ -1465,6 +1496,8 @@ PerformPreTasks (
     //

     ConfigSmmCodeAccessCheck ();

 

+    SmmCpuFeaturesCompleteSmmReadyToLock ();

+

     mRestoreSmmConfigurationInS3 = FALSE;

   }

 }

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
index 66d85d80e1..f2a91655a3 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
@@ -718,4 +718,25 @@ VOID
 DumpModuleInfoByIp (

   IN  UINTN              CallerIpAddress

   );

+

+/**

+  This API provides a way to allocate memory for page table.

+

+  This API can be called more once to allocate memory for page tables.

+

+  Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a pointer to the

+  allocated buffer.  The buffer returned is aligned on a 4KB boundary.  If Pages is 0, then NULL

+  is returned.  If there is not enough memory remaining to satisfy the request, then NULL is

+  returned.

+

+  @param  Pages                 The number of 4 KB pages to allocate.

+

+  @return A pointer to the allocated buffer or NULL if allocation fails.

+

+**/

+VOID *

+AllocatePageTableMemory (

+  IN UINTN           Pages

+  );

+

 #endif

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
index 8ddde9acb5..ff4e28ec58 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
@@ -552,7 +552,7 @@ InitPaging (
           //

           ASSERT (Address == (*Pte & PHYSICAL_ADDRESS_MASK));

 

-          Pt = AllocatePages (1);

+          Pt = AllocatePageTableMemory (1);

           ASSERT (Pt != NULL);

 

           // Split it