Update PeiCore to support load PEIM into memory on S3 boot path.

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14757 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 2063fa4dbb26f1883071564b59cebf534c7bf0de..b0e4b6d12aab297cd38333f54fdb00a019737529 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -653,7 +653,7 @@ PeiDispatcher (
   PeimFileHandle = NULL;\r
   EntryPoint     = 0;\r
 \r
-  if ((Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
+  if ((Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) {\r
     //\r
     // Once real memory is available, shadow the RegisterForShadow modules. And meanwhile\r
     // update the modules' status from PEIM_STATE_REGISITER_FOR_SHADOW to PEIM_STATE_DONE.\r
@@ -972,7 +972,7 @@ PeiDispatcher (
             ProcessNotifyList (Private);\r
 \r
             if ((Private->PeiMemoryInstalled) && (Private->Fv[FvCount].PeimState[PeimCount] == PEIM_STATE_REGISITER_FOR_SHADOW) &&   \\r
-                (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
+                (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) {\r
               //\r
               // If memory is availble we shadow images by default for performance reasons.\r
               // We call the entry point a 2nd time so the module knows it's shadowed.\r

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index 85e5e3fcf3ec35074e5d757ba5f716e3275eb925..7a1d815b2b327bde2101527c7d128780735471a5 100644 (file)
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -117,7 +117,7 @@ GetImageReadFunction (
 \r
   Private = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
   \r
-  if ((Private->PeiMemoryInstalled  && !(Private->HobList.HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME))  &&\r
+  if (Private->PeiMemoryInstalled  && ((Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME) || PcdGetBool (PcdShadowPeimOnS3Boot))  &&\r
       (EFI_IMAGE_MACHINE_TYPE_SUPPORTED(EFI_IMAGE_MACHINE_X64) || EFI_IMAGE_MACHINE_TYPE_SUPPORTED(EFI_IMAGE_MACHINE_IA32))) {\r
     // \r
     // Shadow algorithm makes lots of non ANSI C assumptions and only works for IA32 and X64 \r
@@ -335,6 +335,9 @@ GetPeCoffImageFixLoadingAssignedAddress(
 \r
   @retval EFI_SUCCESS           The file was loaded and relocated\r
   @retval EFI_OUT_OF_RESOURCES  There was not enough memory to load and relocate the PE/COFF file\r
+  @retval EFI_WARN_BUFFER_TOO_SMALL \r
+                                There is not enough heap to allocate the requested size.\r
+                                This will not prevent the XIP image from being invoked.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -349,9 +352,13 @@ LoadAndRelocatePeCoffImage (
   PE_COFF_LOADER_IMAGE_CONTEXT          ImageContext;\r
   PEI_CORE_INSTANCE                     *Private;\r
   UINT64                                AlignImageSize;\r
+  BOOLEAN                               IsXipImage;\r
+  EFI_STATUS                            ReturnStatus;\r
 \r
   Private = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
 \r
+  ReturnStatus = EFI_SUCCESS;\r
+  IsXipImage   = FALSE;\r
   ZeroMem (&ImageContext, sizeof (ImageContext));\r
   ImageContext.Handle = Pe32Data;\r
   Status              = GetImageReadFunction (&ImageContext);\r
@@ -362,10 +369,18 @@ LoadAndRelocatePeCoffImage (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+  \r
+  //\r
+  // XIP image that ImageAddress is same to Image handle.\r
+  //\r
+  if (ImageContext.ImageAddress == (EFI_PHYSICAL_ADDRESS)(UINTN) Pe32Data) {\r
+    IsXipImage = TRUE;\r
+  }\r
+\r
   //\r
   // When Image has no reloc section, it can't be relocated into memory.\r
   //\r
-  if (ImageContext.RelocationsStripped && (Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
+  if (ImageContext.RelocationsStripped && (Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) {\r
     DEBUG ((EFI_D_INFO|EFI_D_LOAD, "The image at 0x%08x without reloc section can't be loaded into memory\n", (UINTN) Pe32Data));\r
   }\r
 \r
@@ -377,7 +392,7 @@ LoadAndRelocatePeCoffImage (
   //\r
   // Allocate Memory for the image when memory is ready, boot mode is not S3, and image is relocatable.\r
   //\r
-  if ((!ImageContext.RelocationsStripped) && (Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
+  if ((!ImageContext.RelocationsStripped) && (Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) {\r
     //\r
     // Allocate more buffer to avoid buffer overflow.\r
     //\r
@@ -391,7 +406,7 @@ LoadAndRelocatePeCoffImage (
       AlignImageSize += ImageContext.SectionAlignment;\r
     }\r
 \r
-    if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r
+    if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
       Status = GetPeCoffImageFixLoadingAssignedAddress(&ImageContext, Private);\r
       if (EFI_ERROR (Status)){\r
         DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED ERROR: Failed to load module at fixed address. \n"));\r
@@ -403,27 +418,41 @@ LoadAndRelocatePeCoffImage (
     } else {\r
       ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN) AllocatePages (EFI_SIZE_TO_PAGES ((UINT32) AlignImageSize));\r
     }\r
-    ASSERT (ImageContext.ImageAddress != 0);\r
-    if (ImageContext.ImageAddress == 0) {\r
-      return EFI_OUT_OF_RESOURCES;\r
-    }\r
-\r
-    //\r
-    // Adjust the Image Address to make sure it is section alignment.\r
-    //\r
-    if (ImageContext.SectionAlignment > EFI_PAGE_SIZE) {\r
-      ImageContext.ImageAddress =\r
-          (ImageContext.ImageAddress + ImageContext.SectionAlignment - 1) &\r
-          ~((UINTN)ImageContext.SectionAlignment - 1);\r
-    }\r
-    //\r
-    // Fix alignment requirement when Load IPF TeImage into memory.\r
-    // Skip the reserved space for the stripped PeHeader when load TeImage into memory.\r
-    //\r
-    if (ImageContext.IsTeImage) {\r
-      ImageContext.ImageAddress = ImageContext.ImageAddress +\r
-                                  ((EFI_TE_IMAGE_HEADER *) Pe32Data)->StrippedSize -\r
-                                  sizeof (EFI_TE_IMAGE_HEADER);\r
+    if (ImageContext.ImageAddress != 0) {\r
+      //\r
+      // Adjust the Image Address to make sure it is section alignment.\r
+      //\r
+      if (ImageContext.SectionAlignment > EFI_PAGE_SIZE) {\r
+        ImageContext.ImageAddress =\r
+            (ImageContext.ImageAddress + ImageContext.SectionAlignment - 1) &\r
+            ~((UINTN)ImageContext.SectionAlignment - 1);\r
+      }\r
+      //\r
+      // Fix alignment requirement when Load IPF TeImage into memory.\r
+      // Skip the reserved space for the stripped PeHeader when load TeImage into memory.\r
+      //\r
+      if (ImageContext.IsTeImage) {\r
+        ImageContext.ImageAddress = ImageContext.ImageAddress +\r
+                                    ((EFI_TE_IMAGE_HEADER *) Pe32Data)->StrippedSize -\r
+                                    sizeof (EFI_TE_IMAGE_HEADER);\r
+      }\r
+    } else {\r
+      //\r
+      // No enough memory resource.\r
+      //\r
+      if (IsXipImage) {\r
+        //\r
+        // XIP image can still be invoked.\r
+        //\r
+        ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN) Pe32Data;\r
+        ReturnStatus = EFI_WARN_BUFFER_TOO_SMALL;\r
+      } else {\r
+        //\r
+        // Non XIP image can't be loaded because no enough memory is allocated.\r
+        //\r
+        ASSERT (FALSE);\r
+        return EFI_OUT_OF_RESOURCES;\r
+      }\r
     }\r
   }\r
 \r
@@ -445,7 +474,7 @@ LoadAndRelocatePeCoffImage (
   //\r
   // Flush the instruction cache so the image data is written before we execute it\r
   //\r
-  if ((!ImageContext.RelocationsStripped) && (Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
+  if (ImageContext.ImageAddress != (EFI_PHYSICAL_ADDRESS)(UINTN) Pe32Data) {\r
     InvalidateInstructionCacheRange ((VOID *)(UINTN)ImageContext.ImageAddress, (UINTN)ImageContext.ImageSize);\r
   }\r
 \r
@@ -453,7 +482,7 @@ LoadAndRelocatePeCoffImage (
   *ImageSize    = ImageContext.ImageSize;\r
   *EntryPoint   = ImageContext.EntryPoint;\r
 \r
-  return EFI_SUCCESS;\r
+  return ReturnStatus;\r
 }\r
 \r
 /**\r
@@ -471,6 +500,9 @@ LoadAndRelocatePeCoffImage (
   @retval EFI_SUCCESS      Image is successfully loaded.\r
   @retval EFI_NOT_FOUND    Fail to locate necessary PPI.\r
   @retval EFI_UNSUPPORTED  Image Machine Type is not supported.\r
+  @retval EFI_WARN_BUFFER_TOO_SMALL \r
+                           There is not enough heap to allocate the requested size.\r
+                           This will not prevent the XIP image from being invoked.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -785,7 +817,7 @@ PeiLoadImage (
                           EntryPoint,\r
                           AuthenticationState\r
                           );\r
-      if (!EFI_ERROR (Status)) {\r
+      if (!EFI_ERROR (Status) || Status == EFI_WARN_BUFFER_TOO_SMALL) {\r
         //\r
         // The shadowed PEIM must be relocatable.\r
         //\r
@@ -804,7 +836,7 @@ PeiLoadImage (
         if (!EFI_IMAGE_MACHINE_TYPE_SUPPORTED (PeCoffLoaderGetMachineType ((VOID *) (UINTN) ImageAddress))) {\r
           return EFI_UNSUPPORTED;\r
         }\r
-        return Status;\r
+        return EFI_SUCCESS;\r
       }\r
     }\r
     Index++;\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 2cf9df7ce10ef4c47cc1d665e2c379e89854d2dd..7cfce0b31a142c5800f48a6c5c9d39daefe0f6e8 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -4,7 +4,7 @@
 # 2) Dispatch PEIM from discovered FV.\r
 # 3) Handoff control to DxeIpl to load DXE core and enter DXE phase.\r
 #\r
-# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -98,4 +98,4 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber     ## SOMETIMES_CONSUMES \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber      ## SOMETIMES_CONSUMES \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable             ## CONSUMES  \r
-  \r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnS3Boot                       ## SOMETIMES_CONSUMES \r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index d3fcf95f0bee3bb05dde3b432f955fd078fdff35..fc9f9ccd9946695f728465140ea49158ae5be249 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -662,6 +662,9 @@
   #\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxEfiSystemTablePointerAddress|0x0|UINT64|0x30001027\r
 \r
+  ## This PCD specifies whether to shadow PEIM on S3 boot path after memory is ready. \r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnS3Boot|FALSE|BOOLEAN|0x30001028\r
+\r
   ## Default OEM ID for ACPI table creation, its length must be 0x6 bytes to follow ACPI specification.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId|"INTEL "|VOID*|0x30001034\r
 \r

diff --git a/MdePkg/Include/Ppi/LoadFile.h b/MdePkg/Include/Ppi/LoadFile.h
index fdc9ce26054a4e32a2c2d75a5620eabac93aeb66..03bfb32af00a6d9696e4df7ad5154072e28a4d1c 100644 (file)
--- a/MdePkg/Include/Ppi/LoadFile.h
+++ b/MdePkg/Include/Ppi/LoadFile.h
@@ -1,7 +1,7 @@
 /** @file\r
   Load image file from fv to memory. \r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -47,7 +47,10 @@ typedef struct _EFI_PEI_LOAD_FILE_PPI EFI_PEI_LOAD_FILE_PPI;
   @retval EFI_INVALID_PARAMETER EntryPoint was NULL.\r
   @retval EFI_UNSUPPORTED       An image requires relocations or is not\r
                                 memory mapped.\r
-   \r
+  @retval EFI_WARN_BUFFER_TOO_SMALL \r
+                                There is not enough heap to allocate the requested size.\r
+                                This will not prevent the XIP image from being invoked.\r
+\r
 **/\r
 typedef\r
 EFI_STATUS\r