]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
MdeModulePkg PiSmmIpl: Use AllocateZeroPool() for FullSmramRanges
[mirror_edk2.git] / MdeModulePkg / Core / PiSmmCore / PiSmmIpl.c
index 0cfd746a07c7938e4f1b7ac4ec53591dbd36452d..c534ee37011a879ff0991d250f5732e89ebfffdd 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   SMM IPL that produces SMM related runtime protocols and load the SMM Core into SMRAM\r
 \r
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials are licensed and made available \r
   under the terms and conditions of the BSD License which accompanies this \r
   distribution.  The full text of the license may be found at        \r
@@ -140,6 +140,20 @@ SmmIplReadyToLockEventNotify (
   @param  Event                 The Event that is being processed, not used.\r
   @param  Context               Event Context, not used.\r
 \r
+**/\r
+VOID\r
+EFIAPI\r
+SmmIplDxeDispatchEventNotify (\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
+  );\r
+\r
+/**\r
+  Event notification that is fired when a GUIDed Event Group is signaled.\r
+\r
+  @param  Event                 The Event that is being processed, not used.\r
+  @param  Context               Event Context, not used.\r
+\r
 **/\r
 VOID\r
 EFIAPI\r
@@ -175,6 +189,7 @@ typedef struct {
   EFI_GUID          *Guid;\r
   EFI_EVENT_NOTIFY  NotifyFunction;\r
   VOID              *NotifyContext;\r
+  EFI_TPL           NotifyTpl;\r
   EFI_EVENT         Event;\r
 } SMM_IPL_EVENT_NOTIFICATION;\r
 \r
@@ -240,39 +255,56 @@ SMM_IPL_EVENT_NOTIFICATION  mSmmIplEvents[] = {
   // the associated event is immediately signalled, so the notification function will be executed and the \r
   // SMM Configuration Protocol will be found if it is already in the handle database.\r
   //\r
-  { TRUE,  FALSE, &gEfiSmmConfigurationProtocolGuid,  SmmIplSmmConfigurationEventNotify, &gEfiSmmConfigurationProtocolGuid,  NULL },\r
+  { TRUE,  FALSE, &gEfiSmmConfigurationProtocolGuid,  SmmIplSmmConfigurationEventNotify, &gEfiSmmConfigurationProtocolGuid,  TPL_NOTIFY,   NULL },\r
   //\r
-  // Declare protocl notification on DxeSmmReadyToLock protocols.  When this notification is etablished, \r
+  // Declare protocol notification on DxeSmmReadyToLock protocols.  When this notification is established, \r
   // the associated event is immediately signalled, so the notification function will be executed and the \r
   // DXE SMM Ready To Lock Protocol will be found if it is already in the handle database.\r
   //\r
-  { TRUE,  TRUE,  &gEfiDxeSmmReadyToLockProtocolGuid, SmmIplReadyToLockEventNotify,      &gEfiDxeSmmReadyToLockProtocolGuid, NULL },\r
+  { TRUE,  TRUE,  &gEfiDxeSmmReadyToLockProtocolGuid, SmmIplReadyToLockEventNotify,      &gEfiDxeSmmReadyToLockProtocolGuid, TPL_CALLBACK, NULL },\r
+  //\r
+  // Declare event notification on EndOfDxe event.  When this notification is etablished, \r
+  // the associated event is immediately signalled, so the notification function will be executed and the \r
+  // SMM End Of Dxe Protocol will be found if it is already in the handle database.\r
+  //\r
+  { FALSE, TRUE,  &gEfiEndOfDxeEventGroupGuid,        SmmIplGuidedEventNotify,           &gEfiEndOfDxeEventGroupGuid,        TPL_CALLBACK, NULL },\r
   //\r
   // Declare event notification on the DXE Dispatch Event Group.  This event is signaled by the DXE Core\r
   // each time the DXE Core dispatcher has completed its work.  When this event is signalled, the SMM Core\r
   // if notified, so the SMM Core can dispatch SMM drivers.\r
   //\r
-  { FALSE, TRUE,  &gEfiEventDxeDispatchGuid,          SmmIplGuidedEventNotify,           &gEfiEventDxeDispatchGuid,          NULL },\r
+  { FALSE, TRUE,  &gEfiEventDxeDispatchGuid,          SmmIplDxeDispatchEventNotify,      &gEfiEventDxeDispatchGuid,          TPL_CALLBACK, NULL },\r
   //\r
   // Declare event notification on Ready To Boot Event Group.  This is an extra event notification that is\r
   // used to make sure SMRAM is locked before any boot options are processed.\r
   //\r
-  { FALSE, TRUE,  &gEfiEventReadyToBootGuid,          SmmIplReadyToLockEventNotify,      &gEfiEventReadyToBootGuid,          NULL },\r
+  { FALSE, TRUE,  &gEfiEventReadyToBootGuid,          SmmIplReadyToLockEventNotify,      &gEfiEventReadyToBootGuid,          TPL_CALLBACK, NULL },\r
   //\r
   // Declare event notification on Legacy Boot Event Group.  This is used to inform the SMM Core that the platform \r
   // is performing a legacy boot operation, and that the UEFI environment is no longer available and the SMM Core \r
   // must guarantee that it does not access any UEFI related structures outside of SMRAM.\r
+  // It is also to inform the SMM Core to notify SMM driver that system enter legacy boot.\r
   //\r
-  { FALSE, FALSE, &gEfiEventLegacyBootGuid,           SmmIplGuidedEventNotify,           &gEfiEventLegacyBootGuid,           NULL },\r
+  { FALSE, FALSE, &gEfiEventLegacyBootGuid,           SmmIplGuidedEventNotify,           &gEfiEventLegacyBootGuid,           TPL_CALLBACK, NULL },\r
+  //\r
+  // Declare event notification on Exit Boot Services Event Group.  This is used to inform the SMM Core\r
+  // to notify SMM driver that system enter exit boot services.\r
+  //\r
+  { FALSE, FALSE, &gEfiEventExitBootServicesGuid,     SmmIplGuidedEventNotify,           &gEfiEventExitBootServicesGuid,     TPL_CALLBACK, NULL },\r
+  //\r
+  // Declare event notification on Ready To Boot Event Group.  This is used to inform the SMM Core\r
+  // to notify SMM driver that system enter ready to boot.\r
+  //\r
+  { FALSE, FALSE, &gEfiEventReadyToBootGuid,          SmmIplGuidedEventNotify,           &gEfiEventReadyToBootGuid,          TPL_CALLBACK, NULL },\r
   //\r
   // Declare event notification on SetVirtualAddressMap() Event Group.  This is used to convert gSmmCorePrivate \r
   // and mSmmControl2 from physical addresses to virtual addresses.\r
   //\r
-  { FALSE, FALSE, &gEfiEventVirtualAddressChangeGuid, SmmIplSetVirtualAddressNotify,     NULL,                               NULL },\r
+  { FALSE, FALSE, &gEfiEventVirtualAddressChangeGuid, SmmIplSetVirtualAddressNotify,     NULL,                               TPL_CALLBACK, NULL },\r
   //\r
   // Terminate the table of event notifications\r
   //\r
-  { FALSE, FALSE, NULL,                               NULL,                              NULL,                               NULL }\r
+  { FALSE, FALSE, NULL,                               NULL,                              NULL,                               TPL_CALLBACK, NULL }\r
 };\r
 \r
 /**\r
@@ -489,11 +521,11 @@ SmmCommunicationCommunicate (
   //\r
   gSmmCorePrivate->InSmm = OldInSmm;\r
 \r
-  return (Status == EFI_WARN_INTERRUPT_SOURCE_QUIESCED) ? EFI_SUCCESS : EFI_NOT_FOUND;\r
+  return (Status == EFI_SUCCESS) ? EFI_SUCCESS : EFI_NOT_FOUND;\r
 }\r
 \r
 /**\r
-  Event notification that is fired when DxeDispatch Event Group is signaled.\r
+  Event notification that is fired when GUIDed Event Group is signaled.\r
 \r
   @param  Event                 The Event that is being processed, not used.\r
   @param  Context               Event Context, not used.\r
@@ -523,6 +555,76 @@ SmmIplGuidedEventNotify (
   SmmCommunicationCommunicate (&mSmmCommunication, &CommunicateHeader, &Size);\r
 }\r
 \r
+/**\r
+  Event notification that is fired when DxeDispatch Event Group is signaled.\r
+\r
+  @param  Event                 The Event that is being processed, not used.\r
+  @param  Context               Event Context, not used.\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+SmmIplDxeDispatchEventNotify (\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
+  )\r
+{\r
+  EFI_SMM_COMMUNICATE_HEADER  CommunicateHeader;\r
+  UINTN                       Size;\r
+  EFI_STATUS                  Status;\r
+\r
+  //\r
+  // Keep calling the SMM Core Dispatcher until there is no request to restart it.\r
+  //\r
+  while (TRUE) {\r
+    //\r
+    // Use Guid to initialize EFI_SMM_COMMUNICATE_HEADER structure\r
+    // Clear the buffer passed into the Software SMI.  This buffer will return\r
+    // the status of the SMM Core Dispatcher.\r
+    //\r
+    CopyGuid (&CommunicateHeader.HeaderGuid, (EFI_GUID *)Context);\r
+    CommunicateHeader.MessageLength = 1;\r
+    CommunicateHeader.Data[0] = 0;\r
+\r
+    //\r
+    // Generate the Software SMI and return the result\r
+    //\r
+    Size = sizeof (CommunicateHeader);\r
+    SmmCommunicationCommunicate (&mSmmCommunication, &CommunicateHeader, &Size);\r
+    \r
+    //\r
+    // Return if there is no request to restart the SMM Core Dispatcher\r
+    //\r
+    if (CommunicateHeader.Data[0] != COMM_BUFFER_SMM_DISPATCH_RESTART) {\r
+      return;\r
+    }\r
+      \r
+    //\r
+    // Attempt to reset SMRAM cacheability to UC\r
+    // Assume CPU AP is available at this time\r
+    //\r
+    Status = gDS->SetMemorySpaceAttributes(\r
+                    mSmramCacheBase, \r
+                    mSmramCacheSize,\r
+                    EFI_MEMORY_UC\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((DEBUG_WARN, "SMM IPL failed to reset SMRAM window to EFI_MEMORY_UC\n"));\r
+    }  \r
+\r
+    //\r
+    // Close all SMRAM ranges to protect SMRAM\r
+    //\r
+    Status = mSmmAccess->Close (mSmmAccess);\r
+    ASSERT_EFI_ERROR (Status);\r
+\r
+    //\r
+    // Print debug message that the SMRAM window is now closed.\r
+    //\r
+    DEBUG ((DEBUG_INFO, "SMM IPL closed SMRAM window\n"));\r
+  }\r
+}\r
+\r
 /**\r
   Event notification that is fired every time a gEfiSmmConfigurationProtocol installs.\r
 \r
@@ -555,7 +657,7 @@ SmmIplSmmConfigurationEventNotify (
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
-  // Set flag to indicate that the SM< Entry Point has been registered which \r
+  // Set flag to indicate that the SMM Entry Point has been registered which \r
   // means that SMIs are now fully operational.\r
   //\r
   gSmmCorePrivate->SmmEntryPointRegistered = TRUE;\r
@@ -564,35 +666,11 @@ SmmIplSmmConfigurationEventNotify (
   // Print debug message showing SMM Core entry point address.\r
   //\r
   DEBUG ((DEBUG_INFO, "SMM IPL registered SMM Entry Point address %p\n", (VOID *)(UINTN)gSmmCorePrivate->SmmEntryPoint));\r
-\r
-  //\r
-  // Attempt to reset SMRAM cacheability to UC\r
-  // Assume CPU AP is available at this time\r
-  //\r
-  Status = gDS->SetMemorySpaceAttributes(\r
-                  mSmramCacheBase, \r
-                  mSmramCacheSize,\r
-                  EFI_MEMORY_UC\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_WARN, "SMM IPL failed to reset SMRAM window to EFI_MEMORY_UC\n"));\r
-  }  \r
-\r
-  //\r
-  // Close all SMRAM ranges to protect SMRAM\r
-  //\r
-  Status = mSmmAccess->Close (mSmmAccess);\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  //\r
-  // Print debug message that the SMRAM window is now closed.\r
-  //\r
-  DEBUG ((DEBUG_INFO, "SMM IPL closed SMRAM window\n"));\r
 }\r
 \r
 /**\r
   Event notification that is fired every time a DxeSmmReadyToLock protocol is added\r
-  or if gEfiEventReadyToBootGuid is signalled.\r
+  or if gEfiEventReadyToBootGuid is signaled.\r
 \r
   @param  Event                 The Event that is being processed, not used.\r
   @param  Context               Event Context, not used.\r
@@ -627,7 +705,7 @@ SmmIplReadyToLockEventNotify (
   } else {\r
     //\r
     // If SMM is not locked yet and we got here from gEfiEventReadyToBootGuid being \r
-    // signalled, then gEfiDxeSmmReadyToLockProtocolGuid was not installed as expected.\r
+    // signaled, then gEfiDxeSmmReadyToLockProtocolGuid was not installed as expected.\r
     // Print a warning on debug builds.\r
     //\r
     DEBUG ((DEBUG_WARN, "SMM IPL!  DXE SMM Ready To Lock Protocol not installed before Ready To Boot signal\n"));\r
@@ -637,7 +715,7 @@ SmmIplReadyToLockEventNotify (
   // Lock the SMRAM (Note: Locking SMRAM may not be supported on all platforms)\r
   //\r
   mSmmAccess->Lock (mSmmAccess);\r
-\r
+  \r
   //\r
   // Close protocol and event notification events that do not apply after the \r
   // DXE SMM Ready To Lock Protocol has been installed or the Ready To Boot \r
@@ -783,17 +861,21 @@ GetPeCoffImageFixLoadingAssignedAddress(
 /**\r
   Load the SMM Core image into SMRAM and executes the SMM Core from SMRAM.\r
 \r
-  @param[in] SmramRange  Descriptor for the range of SMRAM to reload the \r
-                         currently executing image.\r
-  @param[in] Context     Context to pass into SMM Core\r
+  @param[in, out] SmramRange            Descriptor for the range of SMRAM to reload the \r
+                                        currently executing image, the rang of SMRAM to\r
+                                        hold SMM Core will be excluded.\r
+  @param[in, out] SmramRangeSmmCore     Descriptor for the range of SMRAM to hold SMM Core.\r
+\r
+  @param[in]      Context               Context to pass into SMM Core\r
 \r
   @return  EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r
 ExecuteSmmCoreFromSmram (\r
-  IN EFI_SMRAM_DESCRIPTOR  *SmramRange,\r
-  IN VOID                  *Context\r
+  IN OUT EFI_SMRAM_DESCRIPTOR   *SmramRange,\r
+  IN OUT EFI_SMRAM_DESCRIPTOR   *SmramRangeSmmCore,\r
+  IN     VOID                   *Context\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -801,7 +883,6 @@ ExecuteSmmCoreFromSmram (
   UINTN                         SourceSize;\r
   PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;\r
   UINTN                         PageCount;\r
-  EFI_PHYSICAL_ADDRESS          DestinationBuffer;\r
   EFI_IMAGE_ENTRY_POINT         EntryPoint;\r
 \r
   //\r
@@ -846,46 +927,52 @@ ExecuteSmmCoreFromSmram (
       // Since the memory range to load SMM CORE will be cut out in SMM core, so no need to allocate and free this range\r
       //\r
       PageCount = 0;\r
-     } else {\r
+    } else {\r
       DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR: Loading module at fixed address at address failed\n"));\r
       //\r
       // Allocate memory for the image being loaded from the EFI_SRAM_DESCRIPTOR \r
       // specified by SmramRange\r
       //\r
-      PageCount = (UINTN)EFI_SIZE_TO_PAGES(ImageContext.ImageSize + ImageContext.SectionAlignment);\r
+      PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r
 \r
       ASSERT ((SmramRange->PhysicalSize & EFI_PAGE_MASK) == 0);\r
       ASSERT (SmramRange->PhysicalSize > EFI_PAGES_TO_SIZE (PageCount));\r
 \r
       SmramRange->PhysicalSize -= EFI_PAGES_TO_SIZE (PageCount);\r
-      DestinationBuffer = SmramRange->CpuStart + SmramRange->PhysicalSize;\r
+      SmramRangeSmmCore->CpuStart = SmramRange->CpuStart + SmramRange->PhysicalSize;\r
+      SmramRangeSmmCore->PhysicalStart = SmramRange->PhysicalStart + SmramRange->PhysicalSize;\r
+      SmramRangeSmmCore->RegionState = SmramRange->RegionState | EFI_ALLOCATED;\r
+      SmramRangeSmmCore->PhysicalSize = EFI_PAGES_TO_SIZE (PageCount);\r
 \r
       //\r
-      // Align buffer on section boundry\r
+      // Align buffer on section boundary\r
       //\r
-      ImageContext.ImageAddress = DestinationBuffer;\r
+      ImageContext.ImageAddress = SmramRangeSmmCore->CpuStart;\r
     }\r
   } else {\r
     //\r
     // Allocate memory for the image being loaded from the EFI_SRAM_DESCRIPTOR \r
     // specified by SmramRange\r
     //\r
-    PageCount = (UINTN)EFI_SIZE_TO_PAGES(ImageContext.ImageSize + ImageContext.SectionAlignment);\r
+    PageCount = (UINTN)EFI_SIZE_TO_PAGES((UINTN)ImageContext.ImageSize + ImageContext.SectionAlignment);\r
 \r
     ASSERT ((SmramRange->PhysicalSize & EFI_PAGE_MASK) == 0);\r
     ASSERT (SmramRange->PhysicalSize > EFI_PAGES_TO_SIZE (PageCount));\r
 \r
     SmramRange->PhysicalSize -= EFI_PAGES_TO_SIZE (PageCount);\r
-    DestinationBuffer = SmramRange->CpuStart + SmramRange->PhysicalSize;\r
+    SmramRangeSmmCore->CpuStart = SmramRange->CpuStart + SmramRange->PhysicalSize;\r
+    SmramRangeSmmCore->PhysicalStart = SmramRange->PhysicalStart + SmramRange->PhysicalSize;\r
+    SmramRangeSmmCore->RegionState = SmramRange->RegionState | EFI_ALLOCATED;\r
+    SmramRangeSmmCore->PhysicalSize = EFI_PAGES_TO_SIZE (PageCount);\r
 \r
     //\r
-    // Align buffer on section boundry\r
+    // Align buffer on section boundary\r
     //\r
-    ImageContext.ImageAddress = DestinationBuffer;\r
+    ImageContext.ImageAddress = SmramRangeSmmCore->CpuStart;\r
   }\r
   \r
   ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;\r
-  ImageContext.ImageAddress &= ~(ImageContext.SectionAlignment - 1);\r
+  ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)(ImageContext.SectionAlignment - 1));\r
 \r
   //\r
   // Print debug message showing SMM Core load address.\r
@@ -912,6 +999,13 @@ ExecuteSmmCoreFromSmram (
       //\r
       DEBUG ((DEBUG_INFO, "SMM IPL calling SMM Core at SMRAM address %p\n", (VOID *)(UINTN)ImageContext.EntryPoint));\r
 \r
+      gSmmCorePrivate->PiSmmCoreImageBase = ImageContext.ImageAddress;\r
+      gSmmCorePrivate->PiSmmCoreImageSize = ImageContext.ImageSize;\r
+      DEBUG ((DEBUG_INFO, "PiSmmCoreImageBase - 0x%016lx\n", gSmmCorePrivate->PiSmmCoreImageBase));\r
+      DEBUG ((DEBUG_INFO, "PiSmmCoreImageSize - 0x%016lx\n", gSmmCorePrivate->PiSmmCoreImageSize));\r
+\r
+      gSmmCorePrivate->PiSmmCoreEntryPoint = ImageContext.EntryPoint;\r
+\r
       //\r
       // Execute image\r
       //\r
@@ -921,20 +1015,424 @@ ExecuteSmmCoreFromSmram (
   }\r
 \r
   //\r
-  // If the load operation, relocate operation, or the image execution return an\r
-  // error, then free memory allocated from the EFI_SRAM_DESCRIPTOR specified by \r
-  // SmramRange\r
+  // Always free memory allocted by GetFileBufferByFilePath ()\r
   //\r
-  if (EFI_ERROR (Status)) {\r
-    SmramRange->PhysicalSize += EFI_PAGES_TO_SIZE (PageCount);\r
+  FreePool (SourceBuffer);\r
+\r
+  return Status;\r
+}\r
+\r
+/**\r
+  SMM split SMRAM entry.\r
+\r
+  @param[in, out] RangeToCompare             Pointer to EFI_SMRAM_DESCRIPTOR to compare.\r
+  @param[in, out] ReservedRangeToCompare     Pointer to EFI_SMM_RESERVED_SMRAM_REGION to compare.\r
+  @param[out]     Ranges                     Output pointer to hold split EFI_SMRAM_DESCRIPTOR entry.\r
+  @param[in, out] RangeCount                 Pointer to range count.\r
+  @param[out]     ReservedRanges             Output pointer to hold split EFI_SMM_RESERVED_SMRAM_REGION entry.\r
+  @param[in, out] ReservedRangeCount         Pointer to reserved range count.\r
+  @param[out]     FinalRanges                Output pointer to hold split final EFI_SMRAM_DESCRIPTOR entry\r
+                                             that no need to be split anymore.\r
+  @param[in, out] FinalRangeCount            Pointer to final range count.\r
+\r
+**/\r
+VOID\r
+SmmSplitSmramEntry (\r
+  IN OUT EFI_SMRAM_DESCRIPTOR           *RangeToCompare,\r
+  IN OUT EFI_SMM_RESERVED_SMRAM_REGION  *ReservedRangeToCompare,\r
+  OUT    EFI_SMRAM_DESCRIPTOR           *Ranges,\r
+  IN OUT UINTN                          *RangeCount,\r
+  OUT    EFI_SMM_RESERVED_SMRAM_REGION  *ReservedRanges,\r
+  IN OUT UINTN                          *ReservedRangeCount,\r
+  OUT    EFI_SMRAM_DESCRIPTOR           *FinalRanges,\r
+  IN OUT UINTN                          *FinalRangeCount\r
+  )\r
+{\r
+  UINT64    RangeToCompareEnd;\r
+  UINT64    ReservedRangeToCompareEnd;\r
+\r
+  RangeToCompareEnd         = RangeToCompare->CpuStart + RangeToCompare->PhysicalSize;\r
+  ReservedRangeToCompareEnd = ReservedRangeToCompare->SmramReservedStart + ReservedRangeToCompare->SmramReservedSize;\r
+\r
+  if ((RangeToCompare->CpuStart >= ReservedRangeToCompare->SmramReservedStart) &&\r
+      (RangeToCompare->CpuStart < ReservedRangeToCompareEnd)) {\r
+    if (RangeToCompareEnd < ReservedRangeToCompareEnd) {\r
+      //\r
+      // RangeToCompare  ReservedRangeToCompare\r
+      //                 ----                    ----    --------------------------------------\r
+      //                 |  |                    |  | -> 1. ReservedRangeToCompare\r
+      // ----            |  |                    |--|    --------------------------------------\r
+      // |  |            |  |                    |  |\r
+      // |  |            |  |                    |  | -> 2. FinalRanges[*FinalRangeCount] and increment *FinalRangeCount\r
+      // |  |            |  |                    |  |       RangeToCompare->PhysicalSize = 0\r
+      // ----            |  |                    |--|    --------------------------------------\r
+      //                 |  |                    |  | -> 3. ReservedRanges[*ReservedRangeCount] and increment *ReservedRangeCount\r
+      //                 ----                    ----    --------------------------------------\r
+      //\r
+\r
+      //\r
+      // 1. Update ReservedRangeToCompare.\r
+      //\r
+      ReservedRangeToCompare->SmramReservedSize = RangeToCompare->CpuStart - ReservedRangeToCompare->SmramReservedStart;\r
+      //\r
+      // 2. Update FinalRanges[FinalRangeCount] and increment *FinalRangeCount.\r
+      //    Zero RangeToCompare->PhysicalSize.\r
+      //\r
+      FinalRanges[*FinalRangeCount].CpuStart      = RangeToCompare->CpuStart;\r
+      FinalRanges[*FinalRangeCount].PhysicalStart = RangeToCompare->PhysicalStart;\r
+      FinalRanges[*FinalRangeCount].RegionState   = RangeToCompare->RegionState | EFI_ALLOCATED;\r
+      FinalRanges[*FinalRangeCount].PhysicalSize  = RangeToCompare->PhysicalSize;\r
+      *FinalRangeCount += 1;\r
+      RangeToCompare->PhysicalSize = 0;\r
+      //\r
+      // 3. Update ReservedRanges[*ReservedRangeCount] and increment *ReservedRangeCount.\r
+      //\r
+      ReservedRanges[*ReservedRangeCount].SmramReservedStart = FinalRanges[*FinalRangeCount - 1].CpuStart + FinalRanges[*FinalRangeCount - 1].PhysicalSize;\r
+      ReservedRanges[*ReservedRangeCount].SmramReservedSize  = ReservedRangeToCompareEnd - RangeToCompareEnd;\r
+      *ReservedRangeCount += 1;\r
+    } else {\r
+      //\r
+      // RangeToCompare  ReservedRangeToCompare\r
+      //                 ----                    ----    --------------------------------------\r
+      //                 |  |                    |  | -> 1. ReservedRangeToCompare\r
+      // ----            |  |                    |--|    --------------------------------------\r
+      // |  |            |  |                    |  |\r
+      // |  |            |  |                    |  | -> 2. FinalRanges[*FinalRangeCount] and increment *FinalRangeCount\r
+      // |  |            |  |                    |  |\r
+      // |  |            ----                    |--|    --------------------------------------\r
+      // |  |                                    |  | -> 3. RangeToCompare\r
+      // ----                                    ----    --------------------------------------\r
+      //\r
+\r
+      //\r
+      // 1. Update ReservedRangeToCompare.\r
+      //\r
+      ReservedRangeToCompare->SmramReservedSize = RangeToCompare->CpuStart - ReservedRangeToCompare->SmramReservedStart;\r
+      //\r
+      // 2. Update FinalRanges[FinalRangeCount] and increment *FinalRangeCount.\r
+      //\r
+      FinalRanges[*FinalRangeCount].CpuStart      = RangeToCompare->CpuStart;\r
+      FinalRanges[*FinalRangeCount].PhysicalStart = RangeToCompare->PhysicalStart;\r
+      FinalRanges[*FinalRangeCount].RegionState   = RangeToCompare->RegionState | EFI_ALLOCATED;\r
+      FinalRanges[*FinalRangeCount].PhysicalSize  = ReservedRangeToCompareEnd - RangeToCompare->CpuStart;\r
+      *FinalRangeCount += 1;\r
+      //\r
+      // 3. Update RangeToCompare.\r
+      //\r
+      RangeToCompare->CpuStart      += FinalRanges[*FinalRangeCount - 1].PhysicalSize;\r
+      RangeToCompare->PhysicalStart += FinalRanges[*FinalRangeCount - 1].PhysicalSize;\r
+      RangeToCompare->PhysicalSize  -= FinalRanges[*FinalRangeCount - 1].PhysicalSize;\r
+    }\r
+  } else if ((ReservedRangeToCompare->SmramReservedStart >= RangeToCompare->CpuStart) &&\r
+             (ReservedRangeToCompare->SmramReservedStart < RangeToCompareEnd)) {\r
+    if (ReservedRangeToCompareEnd < RangeToCompareEnd) {\r
+      //\r
+      // RangeToCompare  ReservedRangeToCompare\r
+      // ----                                    ----    --------------------------------------\r
+      // |  |                                    |  | -> 1. RangeToCompare\r
+      // |  |            ----                    |--|    --------------------------------------\r
+      // |  |            |  |                    |  |\r
+      // |  |            |  |                    |  | -> 2. FinalRanges[*FinalRangeCount] and increment *FinalRangeCount\r
+      // |  |            |  |                    |  |       ReservedRangeToCompare->SmramReservedSize = 0\r
+      // |  |            ----                    |--|    --------------------------------------\r
+      // |  |                                    |  | -> 3. Ranges[*RangeCount] and increment *RangeCount\r
+      // ----                                    ----    --------------------------------------\r
+      //\r
+\r
+      //\r
+      // 1. Update RangeToCompare.\r
+      //\r
+      RangeToCompare->PhysicalSize = ReservedRangeToCompare->SmramReservedStart - RangeToCompare->CpuStart;\r
+      //\r
+      // 2. Update FinalRanges[FinalRangeCount] and increment *FinalRangeCount.\r
+      //    ReservedRangeToCompare->SmramReservedSize = 0\r
+      //\r
+      FinalRanges[*FinalRangeCount].CpuStart      = ReservedRangeToCompare->SmramReservedStart;\r
+      FinalRanges[*FinalRangeCount].PhysicalStart = RangeToCompare->PhysicalStart + RangeToCompare->PhysicalSize;\r
+      FinalRanges[*FinalRangeCount].RegionState   = RangeToCompare->RegionState | EFI_ALLOCATED;\r
+      FinalRanges[*FinalRangeCount].PhysicalSize  = ReservedRangeToCompare->SmramReservedSize;\r
+      *FinalRangeCount += 1;\r
+      ReservedRangeToCompare->SmramReservedSize = 0;\r
+      //\r
+      // 3. Update Ranges[*RangeCount] and increment *RangeCount.\r
+      //\r
+      Ranges[*RangeCount].CpuStart      = FinalRanges[*FinalRangeCount - 1].CpuStart + FinalRanges[*FinalRangeCount - 1].PhysicalSize;\r
+      Ranges[*RangeCount].PhysicalStart = FinalRanges[*FinalRangeCount - 1].PhysicalStart + FinalRanges[*FinalRangeCount - 1].PhysicalSize;\r
+      Ranges[*RangeCount].RegionState   = RangeToCompare->RegionState;\r
+      Ranges[*RangeCount].PhysicalSize  = RangeToCompareEnd - ReservedRangeToCompareEnd;\r
+      *RangeCount += 1;\r
+    } else {\r
+      //\r
+      // RangeToCompare  ReservedRangeToCompare\r
+      // ----                                    ----    --------------------------------------\r
+      // |  |                                    |  | -> 1. RangeToCompare\r
+      // |  |            ----                    |--|    --------------------------------------\r
+      // |  |            |  |                    |  |\r
+      // |  |            |  |                    |  | -> 2. FinalRanges[*FinalRangeCount] and increment *FinalRangeCount\r
+      // |  |            |  |                    |  |\r
+      // ----            |  |                    |--|    --------------------------------------\r
+      //                 |  |                    |  | -> 3. ReservedRangeToCompare\r
+      //                 ----                    ----    --------------------------------------\r
+      //\r
+\r
+      //\r
+      // 1. Update RangeToCompare.\r
+      //\r
+      RangeToCompare->PhysicalSize = ReservedRangeToCompare->SmramReservedStart - RangeToCompare->CpuStart;\r
+      //\r
+      // 2. Update FinalRanges[FinalRangeCount] and increment *FinalRangeCount.\r
+      //    ReservedRangeToCompare->SmramReservedSize = 0\r
+      //\r
+      FinalRanges[*FinalRangeCount].CpuStart      = ReservedRangeToCompare->SmramReservedStart;\r
+      FinalRanges[*FinalRangeCount].PhysicalStart = RangeToCompare->PhysicalStart + RangeToCompare->PhysicalSize;\r
+      FinalRanges[*FinalRangeCount].RegionState   = RangeToCompare->RegionState | EFI_ALLOCATED;\r
+      FinalRanges[*FinalRangeCount].PhysicalSize  = RangeToCompareEnd - ReservedRangeToCompare->SmramReservedStart;\r
+      *FinalRangeCount += 1;\r
+      //\r
+      // 3. Update ReservedRangeToCompare.\r
+      //\r
+      ReservedRangeToCompare->SmramReservedStart += FinalRanges[*FinalRangeCount - 1].PhysicalSize;\r
+      ReservedRangeToCompare->SmramReservedSize  -= FinalRanges[*FinalRangeCount - 1].PhysicalSize;\r
+    }\r
   }\r
+}\r
 \r
+/**\r
+  Returns if SMRAM range and SMRAM reserved range are overlapped.\r
+\r
+  @param[in] RangeToCompare             Pointer to EFI_SMRAM_DESCRIPTOR to compare.\r
+  @param[in] ReservedRangeToCompare     Pointer to EFI_SMM_RESERVED_SMRAM_REGION to compare.\r
+\r
+  @retval TRUE  There is overlap.\r
+  @retval FALSE There is no overlap.\r
+\r
+**/\r
+BOOLEAN\r
+SmmIsSmramOverlap (\r
+  IN EFI_SMRAM_DESCRIPTOR           *RangeToCompare,\r
+  IN EFI_SMM_RESERVED_SMRAM_REGION  *ReservedRangeToCompare\r
+  )\r
+{\r
+  UINT64    RangeToCompareEnd;\r
+  UINT64    ReservedRangeToCompareEnd;\r
+\r
+  RangeToCompareEnd         = RangeToCompare->CpuStart + RangeToCompare->PhysicalSize;\r
+  ReservedRangeToCompareEnd = ReservedRangeToCompare->SmramReservedStart + ReservedRangeToCompare->SmramReservedSize;\r
+\r
+  if ((RangeToCompare->CpuStart >= ReservedRangeToCompare->SmramReservedStart) &&\r
+      (RangeToCompare->CpuStart < ReservedRangeToCompareEnd)) {\r
+    return TRUE;\r
+  } else if ((ReservedRangeToCompare->SmramReservedStart >= RangeToCompare->CpuStart) &&\r
+             (ReservedRangeToCompare->SmramReservedStart < RangeToCompareEnd)) {\r
+    return TRUE;\r
+  }\r
+  return FALSE;\r
+}\r
+\r
+/**\r
+  Get full SMRAM ranges.\r
+\r
+  It will get SMRAM ranges from SmmAccess protocol and SMRAM reserved ranges from\r
+  SmmConfiguration protocol, split the entries if there is overlap between them.\r
+  It will also reserve one entry for SMM core.\r
+\r
+  @param[out] FullSmramRangeCount   Output pointer to full SMRAM range count.\r
+\r
+  @return Pointer to full SMRAM ranges.\r
+\r
+**/\r
+EFI_SMRAM_DESCRIPTOR *\r
+GetFullSmramRanges (\r
+  OUT UINTN     *FullSmramRangeCount\r
+  )\r
+{\r
+  EFI_STATUS                        Status;\r
+  EFI_SMM_CONFIGURATION_PROTOCOL    *SmmConfiguration;\r
+  UINTN                             Size;\r
+  UINTN                             Index;\r
+  UINTN                             Index2;\r
+  EFI_SMRAM_DESCRIPTOR              *FullSmramRanges;\r
+  UINTN                             TempSmramRangeCount;\r
+  EFI_SMRAM_DESCRIPTOR              *TempSmramRanges;\r
+  UINTN                             SmramRangeCount;\r
+  EFI_SMRAM_DESCRIPTOR              *SmramRanges;\r
+  UINTN                             SmramReservedCount;\r
+  EFI_SMM_RESERVED_SMRAM_REGION     *SmramReservedRanges;\r
+  UINTN                             MaxCount;\r
+  BOOLEAN                           Rescan;\r
+\r
+  //\r
+  // Get SMM Configuration Protocol if it is present.\r
   //\r
-  // Always free memory allocted by GetFileBufferByFilePath ()\r
+  SmmConfiguration = NULL;\r
+  Status = gBS->LocateProtocol (&gEfiSmmConfigurationProtocolGuid, NULL, (VOID **) &SmmConfiguration);\r
+\r
   //\r
-  FreePool (SourceBuffer);\r
+  // Get SMRAM information.\r
+  //\r
+  Size = 0;\r
+  Status = mSmmAccess->GetCapabilities (mSmmAccess, &Size, NULL);\r
+  ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
 \r
-  return Status;\r
+  SmramRangeCount = Size / sizeof (EFI_SMRAM_DESCRIPTOR);\r
+\r
+  //\r
+  // Get SMRAM reserved region count.\r
+  //\r
+  SmramReservedCount = 0;\r
+  if (SmmConfiguration != NULL) {\r
+    while (SmmConfiguration->SmramReservedRegions[SmramReservedCount].SmramReservedSize != 0) {\r
+      SmramReservedCount++;\r
+    }\r
+  }\r
+\r
+  if (SmramReservedCount == 0) {\r
+    //\r
+    // No reserved SMRAM entry from SMM Configuration Protocol.\r
+    // Reserve one entry for SMM Core in the full SMRAM ranges.\r
+    //\r
+    *FullSmramRangeCount = SmramRangeCount + 1;\r
+    Size = (*FullSmramRangeCount) * sizeof (EFI_SMRAM_DESCRIPTOR);\r
+    FullSmramRanges = (EFI_SMRAM_DESCRIPTOR *) AllocateZeroPool (Size);\r
+    ASSERT (FullSmramRanges != NULL);\r
+\r
+    Status = mSmmAccess->GetCapabilities (mSmmAccess, &Size, FullSmramRanges);\r
+    ASSERT_EFI_ERROR (Status);\r
+\r
+    return FullSmramRanges;\r
+  }\r
+\r
+  //\r
+  // Why MaxCount = X + 2 * Y?\r
+  // Take Y = 1 as example below, Y > 1 case is just the iteration of Y = 1.\r
+  //\r
+  //   X = 1 Y = 1     MaxCount = 3 = 1 + 2 * 1\r
+  //   ----            ----\r
+  //   |  |  ----      |--|\r
+  //   |  |  |  |  ->  |  |\r
+  //   |  |  ----      |--|\r
+  //   ----            ----\r
+  //\r
+  //   X = 2 Y = 1     MaxCount = 4 = 2 + 2 * 1\r
+  //   ----            ----\r
+  //   |  |            |  |\r
+  //   |  |  ----      |--|\r
+  //   |  |  |  |      |  |\r
+  //   |--|  |  |  ->  |--|\r
+  //   |  |  |  |      |  |\r
+  //   |  |  ----      |--|\r
+  //   |  |            |  |\r
+  //   ----            ----\r
+  //\r
+  //   X = 3 Y = 1     MaxCount = 5 = 3 + 2 * 1\r
+  //   ----            ----\r
+  //   |  |            |  |\r
+  //   |  |  ----      |--|\r
+  //   |--|  |  |      |--|\r
+  //   |  |  |  |  ->  |  |\r
+  //   |--|  |  |      |--|\r
+  //   |  |  ----      |--|\r
+  //   |  |            |  |\r
+  //   ----            ----\r
+  //\r
+  //   ......\r
+  //\r
+  MaxCount = SmramRangeCount + 2 * SmramReservedCount;\r
+\r
+  Size = MaxCount * sizeof (EFI_SMM_RESERVED_SMRAM_REGION);\r
+  SmramReservedRanges = (EFI_SMM_RESERVED_SMRAM_REGION *) AllocatePool (Size);\r
+  ASSERT (SmramReservedRanges != NULL);\r
+  for (Index = 0; Index < SmramReservedCount; Index++) {\r
+    CopyMem (&SmramReservedRanges[Index], &SmmConfiguration->SmramReservedRegions[Index], sizeof (EFI_SMM_RESERVED_SMRAM_REGION));\r
+  }\r
+\r
+  Size = MaxCount * sizeof (EFI_SMRAM_DESCRIPTOR);\r
+  TempSmramRanges = (EFI_SMRAM_DESCRIPTOR *) AllocatePool (Size);\r
+  ASSERT (TempSmramRanges != NULL);\r
+  TempSmramRangeCount = 0;\r
+\r
+  SmramRanges = (EFI_SMRAM_DESCRIPTOR *) AllocatePool (Size);\r
+  ASSERT (SmramRanges != NULL);\r
+  Status = mSmmAccess->GetCapabilities (mSmmAccess, &Size, SmramRanges);\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  do {\r
+    Rescan = FALSE;\r
+    for (Index = 0; (Index < SmramRangeCount) && !Rescan; Index++) {\r
+      //\r
+      // Skip zero size entry.\r
+      //\r
+      if (SmramRanges[Index].PhysicalSize != 0) {\r
+        for (Index2 = 0; (Index2 < SmramReservedCount) && !Rescan; Index2++) {\r
+          //\r
+          // Skip zero size entry.\r
+          //\r
+          if (SmramReservedRanges[Index2].SmramReservedSize != 0) {\r
+            if (SmmIsSmramOverlap (\r
+                  &SmramRanges[Index],\r
+                  &SmramReservedRanges[Index2]\r
+                  )) {\r
+              //\r
+              // There is overlap, need to split entry and then rescan.\r
+              //\r
+              SmmSplitSmramEntry (\r
+                &SmramRanges[Index],\r
+                &SmramReservedRanges[Index2],\r
+                SmramRanges,\r
+                &SmramRangeCount,\r
+                SmramReservedRanges,\r
+                &SmramReservedCount,\r
+                TempSmramRanges,\r
+                &TempSmramRangeCount\r
+                );\r
+              Rescan = TRUE;\r
+            }\r
+          }\r
+        }\r
+        if (!Rescan) {\r
+          //\r
+          // No any overlap, copy the entry to the temp SMRAM ranges.\r
+          // Zero SmramRanges[Index].PhysicalSize = 0;\r
+          //\r
+          CopyMem (&TempSmramRanges[TempSmramRangeCount++], &SmramRanges[Index], sizeof (EFI_SMRAM_DESCRIPTOR));\r
+          SmramRanges[Index].PhysicalSize = 0;\r
+        }\r
+      }\r
+    }\r
+  } while (Rescan);\r
+  ASSERT (TempSmramRangeCount <= MaxCount);\r
+\r
+  //\r
+  // Sort the entries,\r
+  // and reserve one entry for SMM Core in the full SMRAM ranges.\r
+  //\r
+  FullSmramRanges = AllocateZeroPool ((TempSmramRangeCount + 1) * sizeof (EFI_SMRAM_DESCRIPTOR));\r
+  ASSERT (FullSmramRanges != NULL);\r
+  *FullSmramRangeCount = 0;\r
+  do {\r
+    for (Index = 0; Index < TempSmramRangeCount; Index++) {\r
+      if (TempSmramRanges[Index].PhysicalSize != 0) {\r
+        break;\r
+      }\r
+    }\r
+    ASSERT (Index < TempSmramRangeCount);\r
+    for (Index2 = 0; Index2 < TempSmramRangeCount; Index2++) {\r
+      if ((Index2 != Index) && (TempSmramRanges[Index2].PhysicalSize != 0) && (TempSmramRanges[Index2].CpuStart < TempSmramRanges[Index].CpuStart)) {\r
+        Index = Index2;\r
+      }\r
+    }\r
+    CopyMem (&FullSmramRanges[*FullSmramRangeCount], &TempSmramRanges[Index], sizeof (EFI_SMRAM_DESCRIPTOR));\r
+    *FullSmramRangeCount += 1;\r
+    TempSmramRanges[Index].PhysicalSize = 0;\r
+  } while (*FullSmramRangeCount < TempSmramRangeCount);\r
+  ASSERT (*FullSmramRangeCount == TempSmramRangeCount);\r
+  *FullSmramRangeCount += 1;\r
+\r
+  FreePool (SmramRanges);\r
+  FreePool (SmramReservedRanges);\r
+  FreePool (TempSmramRanges);\r
+\r
+  return FullSmramRanges;\r
 }\r
 \r
 /**\r
@@ -959,15 +1457,13 @@ SmmIplEntry (
   )\r
 {\r
   EFI_STATUS                      Status;\r
-  EFI_SMM_CONFIGURATION_PROTOCOL  *SmmConfiguration;\r
-  UINTN                           Size;\r
   UINTN                           Index;\r
-  EFI_SMM_RESERVED_SMRAM_REGION   *SmramResRegion;\r
   UINT64                          MaxSize;\r
   VOID                            *Registration;\r
   UINT64                          SmmCodeSize;\r
   EFI_LOAD_FIXED_ADDRESS_CONFIGURATION_TABLE    *LMFAConfigurationTable;\r
   EFI_CPU_ARCH_PROTOCOL           *CpuArch;\r
+  EFI_STATUS                      SetAttrStatus;\r
 \r
   //\r
   // Fill in the image handle of the SMM IPL so the SMM Core can use this as the \r
@@ -988,26 +1484,7 @@ SmmIplEntry (
   Status = gBS->LocateProtocol (&gEfiSmmControl2ProtocolGuid, NULL, (VOID **)&mSmmControl2);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  //\r
-  // Get SMM Configuration Protocol if it is present\r
-  //\r
-  SmmConfiguration = NULL;\r
-  Status = gBS->LocateProtocol (&gEfiSmmConfigurationProtocolGuid, NULL, (VOID **) &SmmConfiguration);\r
-\r
-  //\r
-  // Get SMRAM information\r
-  //\r
-  Size = 0;\r
-  Status = mSmmAccess->GetCapabilities (mSmmAccess, &Size, NULL);\r
-  ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
-\r
-  gSmmCorePrivate->SmramRanges = (EFI_SMRAM_DESCRIPTOR *)AllocatePool (Size);\r
-  ASSERT (gSmmCorePrivate->SmramRanges != NULL);\r
-\r
-  Status = mSmmAccess->GetCapabilities (mSmmAccess, &Size, gSmmCorePrivate->SmramRanges);\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  gSmmCorePrivate->SmramRangeCount = Size / sizeof (EFI_SMRAM_DESCRIPTOR);\r
+  gSmmCorePrivate->SmramRanges = GetFullSmramRanges (&gSmmCorePrivate->SmramRangeCount);\r
 \r
   //\r
   // Open all SMRAM ranges\r
@@ -1019,26 +1496,6 @@ SmmIplEntry (
   // Print debug message that the SMRAM window is now open.\r
   //\r
   DEBUG ((DEBUG_INFO, "SMM IPL opened SMRAM window\n"));\r
-\r
-  //\r
-  // Subtract SMRAM any reserved SMRAM regions.\r
-  //\r
-  if (SmmConfiguration != NULL) {\r
-    SmramResRegion = SmmConfiguration->SmramReservedRegions;\r
-    while (SmramResRegion->SmramReservedSize != 0) {\r
-      for (Index = 0; Index < gSmmCorePrivate->SmramRangeCount; Index ++) {\r
-        if ((SmramResRegion->SmramReservedStart >= gSmmCorePrivate->SmramRanges[Index].CpuStart)  &&      \\r
-           ((SmramResRegion->SmramReservedStart + SmramResRegion->SmramReservedSize) <=   \\r
-           (gSmmCorePrivate->SmramRanges[Index].CpuStart + gSmmCorePrivate->SmramRanges[Index].PhysicalSize))) {\r
-          //\r
-          // This range has reserved area, calculate the left free size\r
-          //\r
-          gSmmCorePrivate->SmramRanges[Index].PhysicalSize = SmramResRegion->SmramReservedStart - gSmmCorePrivate->SmramRanges[Index].CpuStart;\r
-        }\r
-      }\r
-      SmramResRegion++;\r
-    }\r
-  }\r
   \r
   //\r
   // Find the largest SMRAM range between 1MB and 4GB that is at least 256KB - 4K in size\r
@@ -1120,7 +1577,11 @@ SmmIplEntry (
     //\r
     // Load SMM Core into SMRAM and execute it from SMRAM\r
     //\r
-    Status = ExecuteSmmCoreFromSmram (mCurrentSmramRange, gSmmCorePrivate);\r
+    Status = ExecuteSmmCoreFromSmram (\r
+               mCurrentSmramRange,\r
+               &gSmmCorePrivate->SmramRanges[gSmmCorePrivate->SmramRangeCount - 1],\r
+               gSmmCorePrivate\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       //\r
       // Print error message that the SMM Core failed to be loaded and executed.\r
@@ -1131,12 +1592,12 @@ SmmIplEntry (
       // Attempt to reset SMRAM cacheability to UC\r
       //\r
       if (CpuArch != NULL) {\r
-        Status = gDS->SetMemorySpaceAttributes(\r
-                        mSmramCacheBase, \r
-                        mSmramCacheSize,\r
-                        EFI_MEMORY_UC\r
-                        );\r
-        if (EFI_ERROR (Status)) {\r
+        SetAttrStatus = gDS->SetMemorySpaceAttributes(\r
+                               mSmramCacheBase, \r
+                               mSmramCacheSize,\r
+                               EFI_MEMORY_UC\r
+                               );\r
+        if (EFI_ERROR (SetAttrStatus)) {\r
           DEBUG ((DEBUG_WARN, "SMM IPL failed to reset SMRAM window to EFI_MEMORY_UC\n"));\r
         }  \r
       }\r
@@ -1168,7 +1629,7 @@ SmmIplEntry (
     // Free all allocated resources\r
     //\r
     FreePool (gSmmCorePrivate->SmramRanges);\r
-    \r
+\r
     return EFI_UNSUPPORTED;\r
   }\r
   \r
@@ -1190,7 +1651,7 @@ SmmIplEntry (
     if (mSmmIplEvents[Index].Protocol) {\r
       mSmmIplEvents[Index].Event = EfiCreateProtocolNotifyEvent (\r
                                      mSmmIplEvents[Index].Guid,\r
-                                    TPL_CALLBACK,\r
+                                     mSmmIplEvents[Index].NotifyTpl,\r
                                      mSmmIplEvents[Index].NotifyFunction,\r
                                      mSmmIplEvents[Index].NotifyContext,\r
                                     &Registration\r
@@ -1198,7 +1659,7 @@ SmmIplEntry (
     } else {\r
       Status = gBS->CreateEventEx (\r
                       EVT_NOTIFY_SIGNAL,\r
-                      TPL_CALLBACK,\r
+                      mSmmIplEvents[Index].NotifyTpl,\r
                       mSmmIplEvents[Index].NotifyFunction,\r
                       mSmmIplEvents[Index].NotifyContext,\r
                       mSmmIplEvents[Index].Guid,\r