git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1436 6f19259b...

[mirror_edk2.git] / EdkModulePkg / Core / DxeIplPeim / DxeLoad.c

diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c b/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
index 78008412759d21419033611e5ad08e952a8ddd66..8e1aeedac261b4ae56bb736e9ebffaa817cb4c9c 100644 (file)
--- a/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -130,7 +130,7 @@ Returns:
              NULL\r
              );\r
 \r
              NULL\r
              );\r
 \r

-  if (EFI_ERROR (Status) && (BootMode != BOOT_ON_S3_RESUME)) {   \r
+  if (EFI_ERROR (Status) && (BootMode != BOOT_ON_S3_RESUME)) {\r

     //\r
     // The DxeIpl has not yet been shadowed\r
     //\r
     //\r
     // The DxeIpl has not yet been shadowed\r
     //\r


@@ -320,7 +320,10 @@ Returns:
 \r
     ASSERT_EFI_ERROR (Status);\r
     Status = PeiRecovery->LoadRecoveryCapsule (PeiServices, PeiRecovery);\r
 \r
     ASSERT_EFI_ERROR (Status);\r
     Status = PeiRecovery->LoadRecoveryCapsule (PeiServices, PeiRecovery);\r

-    ASSERT_EFI_ERROR (Status);\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((EFI_D_ERROR, "Load Recovery Capsule Failed.(Status = %r)\n", Status));\r
+      CpuDeadLoop ();\r
+    }\r

 \r
     //\r
     // Now should have a HOB with the DXE core w/ the old HOB destroyed\r
 \r
     //\r
     // Now should have a HOB with the DXE core w/ the old HOB destroyed\r


@@ -371,7 +374,6 @@ Returns:
   // Transfer control to the DXE Core\r
   // The handoff state is simply a pointer to the HOB list\r
   //\r
   // Transfer control to the DXE Core\r
   // The handoff state is simply a pointer to the HOB list\r
   //\r

-//  PERF_END (PeiServices, L"DxeIpl", NULL, 0);\r

 \r
   Status = PeiServicesInstallPpi (&mPpiSignal);\r
 \r
 \r
   Status = PeiServicesInstallPpi (&mPpiSignal);\r
 \r


@@ -396,17 +398,20 @@ Returns:
     );\r
 \r
   DEBUG ((EFI_D_INFO, "DXE Core Entry\n"));\r
     );\r
 \r
   DEBUG ((EFI_D_INFO, "DXE Core Entry\n"));\r

-  SwitchStack (\r
+  SwitchIplStacks (\r

     (SWITCH_STACK_ENTRY_POINT)(UINTN)DxeCoreEntryPoint,\r
     HobList.Raw,\r
     (SWITCH_STACK_ENTRY_POINT)(UINTN)DxeCoreEntryPoint,\r
     HobList.Raw,\r

-    (VOID *) (UINTN) BspStore,\r
-    TopOfStack\r
+    NULL,\r
+    TopOfStack,\r
+    (VOID *) (UINTN) BspStore\r

     );\r
 \r
   //\r
   // If we get here, then the DXE Core returned.  This is an error\r
     );\r
 \r
   //\r
   // If we get here, then the DXE Core returned.  This is an error\r

+  // Dxe Core should not return.\r

   //\r
   //\r

-  ASSERT_EFI_ERROR (Status);\r
+  ASSERT (FALSE);\r
+  CpuDeadLoop ();\r

 \r
   return EFI_OUT_OF_RESOURCES;\r
 }\r
 \r
   return EFI_OUT_OF_RESOURCES;\r
 }\r


@@ -470,12 +475,12 @@ Returns:
                &FfsFileHeader\r
                );\r
     if (!EFI_ERROR (Status)) {\r
                &FfsFileHeader\r
                );\r
     if (!EFI_ERROR (Status)) {\r

-      CopyMem (FileName, &FfsFileHeader->Name, sizeof (EFI_GUID));\r

       Status = PeiProcessFile (\r
                  SectionType,\r
       Status = PeiProcessFile (\r
                  SectionType,\r

-                 FfsFileHeader,\r
+                 &FfsFileHeader,\r

                  Pe32Data\r
                  );\r
                  Pe32Data\r
                  );\r

+      CopyMem (FileName, &FfsFileHeader->Name, sizeof (EFI_GUID));\r

       return Status;\r
     }\r
     Hob.Raw = GET_NEXT_HOB (Hob);\r
       return Status;\r
     }\r
     Hob.Raw = GET_NEXT_HOB (Hob);\r


@@ -683,7 +688,7 @@ Returns:
   //\r
   Status = PeiProcessFile (\r
             EFI_SECTION_PE32,\r
   //\r
   Status = PeiProcessFile (\r
             EFI_SECTION_PE32,\r

-            FfsHeader,\r
+            &FfsHeader,\r

             &Pe32Data\r
             );\r
 \r
             &Pe32Data\r
             );\r
 \r


@@ -706,9 +711,9 @@ Returns:
 \r
 EFI_STATUS\r
 PeiProcessFile (\r
 \r
 EFI_STATUS\r
 PeiProcessFile (\r

-  IN  UINT16                 SectionType,\r
-  IN  EFI_FFS_FILE_HEADER    *FfsFileHeader,\r
-  OUT VOID                   **Pe32Data\r
+  IN      UINT16                 SectionType,\r
+  IN OUT  EFI_FFS_FILE_HEADER    **RealFfsFileHeader,\r
+  OUT     VOID                   **Pe32Data\r

   )\r
 /*++\r
 \r
   )\r
 /*++\r
 \r


@@ -756,6 +761,9 @@ Returns:
   EFI_GUID                        TempGuid;\r
   EFI_FIRMWARE_VOLUME_HEADER      *FvHeader;\r
   EFI_COMPRESSION_SECTION         *CompressionSection;\r
   EFI_GUID                        TempGuid;\r
   EFI_FIRMWARE_VOLUME_HEADER      *FvHeader;\r
   EFI_COMPRESSION_SECTION         *CompressionSection;\r

+  EFI_FFS_FILE_HEADER             *FfsFileHeader;\r
+\r
+  FfsFileHeader = *RealFfsFileHeader;\r

 \r
   Status = PeiServicesFfsFindSectionData (\r
              EFI_SECTION_COMPRESSION,\r
 \r
   Status = PeiServicesFfsFindSectionData (\r
              EFI_SECTION_COMPRESSION,\r


@@ -950,7 +958,11 @@ Returns:
               return EFI_NOT_FOUND;\r
             }\r
 \r
               return EFI_NOT_FOUND;\r
             }\r
 \r

-            return PeiProcessFile (SectionType, FfsFileHeader, Pe32Data);\r
+            //\r
+            // Reture the FfsHeader that contain Pe32Data.\r
+            //\r
+            *RealFfsFileHeader = FfsFileHeader;\r
+            return PeiProcessFile (SectionType, RealFfsFileHeader, Pe32Data);\r

           }\r
         }\r
         //\r
           }\r
         }\r
         //\r