MdeModulePkg/Core/Pei: fix REGISITER -> REGISTER typo

[mirror_edk2.git] / MdeModulePkg / Core / Pei / Image / Image.c

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index d659de8b3e64781b8a3170d187256ec856c57b11..f07f48823117aa0373f7f6fb9f8abdac7819340e 100644 (file)
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -1,7 +1,7 @@
 /** @file\r
   Pei Core Load Image Support\r
 \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, 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
@@ -112,22 +112,23 @@ GetImageReadFunction (
   IN      PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r
   )\r
 {\r
-  PEI_CORE_INSTANCE  *Private;\r
-  VOID*  MemoryBuffer;\r
+#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64)\r
+  PEI_CORE_INSTANCE     *Private;\r
+  EFI_PHYSICAL_ADDRESS  MemoryBuffer;\r
 \r
   Private = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
-  \r
+  MemoryBuffer = 0;\r
+\r
   if (Private->PeiMemoryInstalled  && (((Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME) && PcdGetBool (PcdShadowPeimOnBoot)) || \r
-      ((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
+      ((Private->HobList.HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME) && PcdGetBool (PcdShadowPeimOnS3Boot)))) {\r
     // \r
     // Shadow algorithm makes lots of non ANSI C assumptions and only works for IA32 and X64 \r
     //  compilers that have been tested\r
     //\r
     if (Private->ShadowedImageRead == NULL) {\r
-      MemoryBuffer = AllocatePages (0x400 / EFI_PAGE_SIZE + 1);\r
-      ASSERT (MemoryBuffer != NULL);\r
-      CopyMem (MemoryBuffer, (CONST VOID *) (UINTN) PeiImageReadForShadow, 0x400);\r
+      PeiServicesAllocatePages (EfiBootServicesCode, 0x400 / EFI_PAGE_SIZE + 1, &MemoryBuffer);\r
+      ASSERT (MemoryBuffer != 0);\r
+      CopyMem ((VOID *)(UINTN)MemoryBuffer, (CONST VOID *) (UINTN) PeiImageReadForShadow, 0x400);\r
       Private->ShadowedImageRead = (PE_COFF_LOADER_READ_FILE) (UINTN) MemoryBuffer;\r
     }\r
 \r
@@ -135,7 +136,9 @@ GetImageReadFunction (
   } else {\r
     ImageContext->ImageRead = PeiImageRead;\r
   }\r
-\r
+#else\r
+  ImageContext->ImageRead = PeiImageRead;\r
+#endif\r
   return EFI_SUCCESS;\r
 }\r
 /**\r
@@ -250,12 +253,10 @@ GetPeCoffImageFixLoadingAssignedAddress(
      SectionHeaderOffset = sizeof (EFI_TE_IMAGE_HEADER);\r
      NumberOfSections = ImgHdr->Te.NumberOfSections;\r
    } else {\r
-     SectionHeaderOffset = (UINTN)(\r
-                                 ImageContext->PeCoffHeaderOffset +\r
-                                 sizeof (UINT32) +\r
-                                 sizeof (EFI_IMAGE_FILE_HEADER) +\r
-                                 ImgHdr->Pe32.FileHeader.SizeOfOptionalHeader\r
-                                 );\r
+     SectionHeaderOffset = ImageContext->PeCoffHeaderOffset +\r
+                           sizeof (UINT32) +\r
+                           sizeof (EFI_IMAGE_FILE_HEADER) +\r
+                           ImgHdr->Pe32.FileHeader.SizeOfOptionalHeader;\r
       NumberOfSections = ImgHdr->Pe32.FileHeader.NumberOfSections;\r
    }\r
    //\r
@@ -386,7 +387,7 @@ LoadAndRelocatePeCoffImage (
   }\r
   IsRegisterForShadow = FALSE;\r
   if ((Private->CurrentFileHandle == FileHandle) \r
-    && (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] == PEIM_STATE_REGISITER_FOR_SHADOW)) {\r
+    && (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] == PEIM_STATE_REGISTER_FOR_SHADOW)) {\r
     IsRegisterForShadow = TRUE;\r
   }\r
 \r
@@ -453,12 +454,16 @@ LoadAndRelocatePeCoffImage (
         //\r
         // The PEIM is not assiged valid address, try to allocate page to load it.\r
         //\r
-        ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN) AllocatePages (EFI_SIZE_TO_PAGES ((UINT32) AlignImageSize));\r
+        Status = PeiServicesAllocatePages (EfiBootServicesCode,\r
+                                           EFI_SIZE_TO_PAGES ((UINT32) AlignImageSize),\r
+                                           &ImageContext.ImageAddress);\r
       }\r
     } else {\r
-      ImageContext.ImageAddress = (EFI_PHYSICAL_ADDRESS)(UINTN) AllocatePages (EFI_SIZE_TO_PAGES ((UINT32) AlignImageSize));\r
+      Status = PeiServicesAllocatePages (EfiBootServicesCode,\r
+                                         EFI_SIZE_TO_PAGES ((UINT32) AlignImageSize),\r
+                                         &ImageContext.ImageAddress);\r
     }\r
-    if (ImageContext.ImageAddress != 0) {\r
+    if (!EFI_ERROR (Status)) {\r
       //\r
       // Adjust the Image Address to make sure it is section alignment.\r
       //\r
@@ -501,6 +506,9 @@ LoadAndRelocatePeCoffImage (
   //\r
   Status = PeCoffLoaderLoadImage (&ImageContext);\r
   if (EFI_ERROR (Status)) {\r
+    if (ImageContext.ImageError == IMAGE_ERROR_INVALID_SECTION_ALIGNMENT) {\r
+      DEBUG ((DEBUG_ERROR, "PEIM Image Address 0x%11p doesn't meet with section alignment 0x%x.\n", (VOID*)(UINTN)ImageContext.ImageAddress, ImageContext.SectionAlignment));\r
+    }\r
     return Status;\r
   }\r
   //\r
@@ -607,6 +615,8 @@ PeiLoadImageLoadImage (
     }\r
   }\r
 \r
+  DEBUG ((DEBUG_INFO, "Loading PEIM %g\n", FileHandle));\r
+\r
   //\r
   // If memory is installed, perform the shadow operations\r
   //\r
@@ -866,7 +876,7 @@ PeiLoadImage (
         //\r
         // The shadowed PEIM must be relocatable.\r
         //\r
-        if (PeimState == PEIM_STATE_REGISITER_FOR_SHADOW) {\r
+        if (PeimState == PEIM_STATE_REGISTER_FOR_SHADOW) {\r
           IsStrip = RelocationIsStrip ((VOID *) (UINTN) ImageAddress);\r
           ASSERT (!IsStrip);\r
           if (IsStrip) {\r