Merge branch of PI tree to main trunk

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3918 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 456 insertions, 656 deletions

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 1907077..3cd9eba 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -32,6 +32,11 @@ Abstract:
 #include <Ppi/FvLoadFile.h>

 #include <Ppi/RecoveryModule.h>

 #include <Ppi/MemoryDiscovered.h>

+#include <Ppi/Decompress.h>

+#include <Ppi/FirmwareVolumeInfo.h>

+

+#include <Guid/FirmwareFileSystem2.h>

+

 #include <Library/DebugLib.h>

 #include <Library/PeimEntryPoint.h>

 #include <Library/BaseLib.h>

@@ -67,14 +72,27 @@ PeiFindFile (
 

 EFI_STATUS

 PeiLoadFile (

-  IN  EFI_PEI_PE_COFF_LOADER_PROTOCOL           *PeiEfiPeiPeCoffLoader,

-  IN  VOID                                      *Pe32Data,

+  IN  EFI_PEI_FILE_HANDLE                       FileHandle,

   OUT EFI_PHYSICAL_ADDRESS                      *ImageAddress,

   OUT UINT64                                    *ImageSize,

   OUT EFI_PHYSICAL_ADDRESS                      *EntryPoint

   )

 ;

 

+EFI_STATUS

+DxeIplAddEncapsulatedFirmwareVolumes (

+  VOID

+  )

+;

+

+EFI_STATUS

+DxeIplFindFirmwareVolumeInstance (

+  IN OUT UINTN              *Instance,

+  IN  EFI_FV_FILETYPE       SeachType,

+  OUT EFI_PEI_FV_HANDLE     *VolumeHandle,

+  OUT EFI_PEI_FILE_HANDLE   *FileHandle

+  )

+;

 

 EFI_STATUS

 GetImageReadFunction (

@@ -133,9 +151,10 @@ PeiProcessFile (
 EFI_STATUS

 EFIAPI

 PeimInitializeDxeIpl (

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,

+  IN EFI_PEI_FILE_HANDLE       FfsHandle,

   IN EFI_PEI_SERVICES          **PeiServices

-  );

+  )

+;

 

 

 #endif

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index d76e904..ff003e1 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -58,8 +58,6 @@
   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   IntelFrameworkPkg/IntelFrameworkPkg.dec

-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

-

 

 [LibraryClasses]

   PeCoffLib

@@ -91,10 +89,10 @@
   gEfiPeiS3ResumePpiGuid                        # PPI SOMETIMES_CONSUMED

   gEfiPeiRecoveryModulePpiGuid                  # PPI SOMETIMES_CONSUMED

   gEfiEndOfPeiSignalPpiGuid                     # PPI SOMETIMES_PRODUCED

-  gEfiPeiFvFileLoaderPpiGuid                    # PPI SOMETIMES_PRODUCED

   gEfiDxeIplPpiGuid                             # PPI SOMETIMES_PRODUCED

   gEfiPeiPeCoffLoaderGuid                       

-

+  gEfiPeiDecompressPpiGuid

+  gEfiPeiFirmwareVolumeInfoPpiGuid

 

 [FeaturePcd.common]

   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 32486a2..089e3bf 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -1,6 +1,8 @@
-/*++

+/**@file

+  Last PEIM.

+  Responsibility of this module is to load the DXE Core from a Firmware Volume.

 

-Copyright (c) 2006, Intel Corporation

+Copyright (c) 2006 - 2007 Intel Corporation

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -9,23 +11,11 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-Module Name:

-

-  DxeLoad.c

-

-Abstract:

-

-  Last PEIM.

-  Responsibility of this module is to load the DXE Core from a Firmware Volume.

-

---*/

+**/

 

 #include "DxeIpl.h"

 #include <Ppi/GuidedSectionExtraction.h>

-

-// porting note remove later

-#include "FrameworkPei.h"

-// end of remove later

+#include <FrameworkPei.h>

 

 EFI_STATUS

 CustomDecompressExtractSection (

@@ -36,6 +26,17 @@ CustomDecompressExtractSection (
   OUT       UINT32                                *AuthenticationStatus

 );

 

+STATIC

+EFI_STATUS

+EFIAPI 

+Decompress (

+  IN CONST  EFI_PEI_DECOMPRESS_PPI  *This,

+  IN CONST  EFI_COMPRESSION_SECTION *InputSection,

+  OUT       VOID                    **OutputBuffer,

+  OUT       UINTN                   *OutputSize

+);

+

+

 BOOLEAN gInMemory = FALSE;

 

 //

@@ -46,24 +47,24 @@ static EFI_DXE_IPL_PPI mDxeIplPpi = {
   DxeLoadCore

 };

 

-static EFI_PEI_FV_FILE_LOADER_PPI mLoadFilePpi = {

-  DxeIplLoadFile

+STATIC EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI mCustomDecompressExtractiongPpi = {

+  CustomDecompressExtractSection

 };

 

-static EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI mCustomDecompressExtractiongPpi = {

-  CustomDecompressExtractSection

+STATIC EFI_PEI_DECOMPRESS_PPI mDecompressPpi = {

+  Decompress

 };

 

 static EFI_PEI_PPI_DESCRIPTOR     mPpiList[] = {

   {

-  EFI_PEI_PPI_DESCRIPTOR_PPI,

-  &gEfiPeiFvFileLoaderPpiGuid,

-  &mLoadFilePpi

+    EFI_PEI_PPI_DESCRIPTOR_PPI,

+    &gEfiDxeIplPpiGuid,

+    &mDxeIplPpi

   },

   {

-  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

-  &gEfiDxeIplPpiGuid,

-  &mDxeIplPpi

+    (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

+    &gEfiPeiDecompressPpiGuid,

+    &mDecompressPpi

   }

 };

 

@@ -73,31 +74,30 @@ static EFI_PEI_PPI_DESCRIPTOR     mPpiSignal = {
   NULL

 };

 

+STATIC EFI_PEI_FIRMWARE_VOLUME_INFO_PPI mFvInfoPpiTemplate = {

+  EFI_FIRMWARE_FILE_SYSTEM2_GUID,

+  NULL,

+  0,    //FvInfoSize

+  NULL, //ParentFvName

+  NULL //ParentFileName;

+};

+

+/**

+  Initializes the Dxe Ipl PPI

+

+  @param  FfsHandle   The handle of FFS file.

+  @param  PeiServices General purpose services available to

+                      every PEIM.

+  @return EFI_SUCESS 

+*/ 

 EFI_STATUS

 EFIAPI

 PeimInitializeDxeIpl (

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,

+  IN EFI_PEI_FILE_HANDLE       FfsHandle,

   IN EFI_PEI_SERVICES          **PeiServices

   )

-/*++

-

-Routine Description:

-

-  Initializes the Dxe Ipl PPI

-

-Arguments:

-

-  FfsHeader   - Pointer to FFS file header

-  PeiServices - General purpose services available to every PEIM.

-

-Returns:

-

-  EFI_SUCCESS

-

---*/

 {

   EFI_STATUS                                Status;

-  EFI_PEI_PE_COFF_LOADER_PROTOCOL           *PeiEfiPeiPeCoffLoader;

   EFI_BOOT_MODE                             BootMode;

   EFI_GUID                                  **DecompressGuidList;

   UINT32                                    DecompressMethodNumber;

@@ -106,56 +106,70 @@ Returns:
   Status = PeiServicesGetBootMode (&BootMode);

   ASSERT_EFI_ERROR (Status);

 

-  if (!gInMemory && (BootMode != BOOT_ON_S3_RESUME)) {   

-    //

-    // The DxeIpl has not yet been shadowed

-    //

-    PeiEfiPeiPeCoffLoader = (EFI_PEI_PE_COFF_LOADER_PROTOCOL *)GetPeCoffLoaderProtocol ();

+  if (BootMode != BOOT_ON_S3_RESUME) {

+    Status = PeiServicesRegisterForShadow (FfsHandle);

+    if (Status == EFI_SUCCESS) {

 

-    //

-    // Shadow DxeIpl and then re-run its entry point

-    //

-    Status = ShadowDxeIpl (FfsHeader, PeiEfiPeiPeCoffLoader);

-  } else {

-    //

-    // Get custom decompress method guid list 

-    //

-    DecompressGuidList     = NULL;

-    DecompressMethodNumber = 0;

-    Status = CustomDecompressGetAlgorithms (DecompressGuidList, &DecompressMethodNumber);

-    if (Status == EFI_OUT_OF_RESOURCES) {

+      gInMemory = TRUE;

+      //

+      // EFI_SUCESS means the first time call register for shadow 

+      // 

+      return Status;

+    } else if (Status == EFI_ALREADY_STARTED) {

+

+

+      //

+      // Get custom decompress method guid list 

+      //

+      DecompressGuidList     = NULL;

+      DecompressMethodNumber = 0;

+      Status = CustomDecompressGetAlgorithms (DecompressGuidList, &DecompressMethodNumber);

+      if (Status == EFI_OUT_OF_RESOURCES) {

       DecompressGuidList = (EFI_GUID **) AllocatePages (EFI_SIZE_TO_PAGES (DecompressMethodNumber * sizeof (EFI_GUID *)));

       ASSERT (DecompressGuidList != NULL);

       Status = CustomDecompressGetAlgorithms (DecompressGuidList, &DecompressMethodNumber);

-    }

-    ASSERT_EFI_ERROR(Status);

-

-    //

-    // Install custom decompress extraction guid ppi

-    //

-    if (DecompressMethodNumber > 0) {

-      GuidPpi = NULL;

-      GuidPpi = (EFI_PEI_PPI_DESCRIPTOR *) AllocatePages (EFI_SIZE_TO_PAGES (DecompressMethodNumber * sizeof (EFI_PEI_PPI_DESCRIPTOR)));

-      ASSERT (GuidPpi != NULL);

-      while (DecompressMethodNumber-- > 0) {

-        GuidPpi->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;

-        GuidPpi->Ppi   = &mCustomDecompressExtractiongPpi;

-        GuidPpi->Guid  = DecompressGuidList [DecompressMethodNumber];

-        Status = PeiServicesInstallPpi (GuidPpi++);

-        ASSERT_EFI_ERROR(Status);

       }

+      ASSERT_EFI_ERROR(Status);

+      

+      //

+      // Install custom decompress extraction guid ppi

+      //

+      if (DecompressMethodNumber > 0) {

+      	GuidPpi = NULL;

+      	GuidPpi = (EFI_PEI_PPI_DESCRIPTOR *) AllocatePages (EFI_SIZE_TO_PAGES (DecompressMethodNumber * sizeof (EFI_PEI_PPI_DESCRIPTOR)));

+      	ASSERT (GuidPpi != NULL);

+      	while (DecompressMethodNumber-- > 0) {

+      	  GuidPpi->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;

+      	  GuidPpi->Ppi   = &mCustomDecompressExtractiongPpi;

+      	  GuidPpi->Guid  = DecompressGuidList [DecompressMethodNumber];

+      	  Status = PeiServicesInstallPpi (GuidPpi++);

+      	  ASSERT_EFI_ERROR(Status);

+      	}

+      }

+    } else {

+      ASSERT_EFI_ERROR (FALSE);

     }

-    

-    //

-    // Install FvFileLoader and DxeIpl PPIs.

-    //

-    Status = PeiServicesInstallPpi (mPpiList);

-    ASSERT_EFI_ERROR(Status);

   }

   

+  //

+  // Install FvFileLoader and DxeIpl PPIs.

+  //

+  Status = PeiServicesInstallPpi (mPpiList);

+  ASSERT_EFI_ERROR(Status);  

+	

   return Status;

 }

 

+/**

+   Main entry point to last PEIM 

+    

+   @param This          Entry point for DXE IPL PPI

+   @param PeiServices   General purpose services available to every PEIM.

+   @param HobList       Address to the Pei HOB list

+   

+   @return EFI_SUCCESS              DXE core was successfully loaded. 

+   @return EFI_OUT_OF_RESOURCES     There are not enough resources to load DXE core.

+**/

 EFI_STATUS

 EFIAPI

 DxeLoadCore (

@@ -163,29 +177,9 @@ DxeLoadCore (
   IN EFI_PEI_SERVICES      **PeiServices,

   IN EFI_PEI_HOB_POINTERS  HobList

   )

-/*++

-

-Routine Description:

-

-  Main entry point to last PEIM

-

-Arguments:

-  This         - Entry point for DXE IPL PPI

-  PeiServices  - General purpose services available to every PEIM.

-  HobList      - Address to the Pei HOB list

-

-Returns:

-

-  EFI_SUCCESS          - DEX core was successfully loaded.

-  EFI_OUT_OF_RESOURCES - There are not enough resources to load DXE core.

-

---*/

 {

   EFI_STATUS                                Status;

   EFI_GUID                                  DxeCoreFileName;

-  EFI_GUID                                  FirmwareFileName;

-  VOID                                      *Pe32Data;

-  VOID                                      *FvImageData;     

   EFI_PHYSICAL_ADDRESS                      DxeCoreAddress;

   UINT64                                    DxeCoreSize;

   EFI_PHYSICAL_ADDRESS                      DxeCoreEntryPoint;

@@ -193,8 +187,9 @@ Returns:
   EFI_BOOT_MODE                             BootMode;

   EFI_PEI_RECOVERY_MODULE_PPI               *PeiRecovery;

   EFI_PEI_S3_RESUME_PPI                     *S3Resume;

-

-//  PERF_START (PeiServices, L"DxeIpl", NULL, 0);

+  EFI_PEI_FV_HANDLE                         VolumeHandle;

+  EFI_PEI_FILE_HANDLE                       FileHandle;

+  UINTN                                     Instance;

 

   //

   // if in S3 Resume, restore configure

@@ -237,42 +232,33 @@ Returns:
   //

   // Install the PEI Protocols that are shared between PEI and DXE

   //

-  PeiEfiPeiPeCoffLoader = (EFI_PEI_PE_COFF_LOADER_PROTOCOL *)GetPeCoffLoaderProtocol ();

+  PeiEfiPeiPeCoffLoader = (EFI_PEI_PE_COFF_LOADER_PROTOCOL *) GetPeCoffLoaderProtocol ();

   ASSERT (PeiEfiPeiPeCoffLoader != NULL);

-

+  

   //

-  // Find the EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE type compressed Firmware Volume file

-  // The file found will be processed by PeiProcessFile: It will first be decompressed to

-  // a normal FV, then a corresponding FV type hob will be built. 

+  // If any FV contains an encapsulated FV extract that FV

   //

-  Status = PeiFindFile (

-             EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE,

-             EFI_SECTION_FIRMWARE_VOLUME_IMAGE,

-             &FirmwareFileName,

-             &FvImageData

-             );

-

+  DxeIplAddEncapsulatedFirmwareVolumes ();

+  

   //

-  // Find the DXE Core in a Firmware Volume

+  // Look in all the FVs present in PEI and find the DXE Core

   //

-  Status = PeiFindFile (

-            EFI_FV_FILETYPE_DXE_CORE,

-            EFI_SECTION_PE32,

-            &DxeCoreFileName,

-            &Pe32Data

-            );

+  Instance = 0;

+  Status = DxeIplFindFirmwareVolumeInstance (&Instance, EFI_FV_FILETYPE_DXE_CORE, &VolumeHandle, &FileHandle);

   ASSERT_EFI_ERROR (Status);

 

+  CopyMem(&DxeCoreFileName, &(((EFI_FFS_FILE_HEADER*)FileHandle)->Name), sizeof (EFI_GUID));

+

   //

   // Load the DXE Core from a Firmware Volume

   //

   Status = PeiLoadFile (

-             PeiEfiPeiPeCoffLoader,

-             Pe32Data,

-             &DxeCoreAddress,

-             &DxeCoreSize,

-             &DxeCoreEntryPoint

-             );

+            FileHandle,

+            &DxeCoreAddress,

+            &DxeCoreSize,

+            &DxeCoreEntryPoint

+            );

+

   ASSERT_EFI_ERROR (Status);

 

   //

@@ -305,7 +291,6 @@ Returns:
   // Transfer control to the DXE Core

   // The handoff state is simply a pointer to the HOB list

   //

-

   DEBUG ((EFI_D_INFO, "DXE Core Entry Point 0x%08x\n", (UINTN) DxeCoreEntryPoint));

   HandOffToDxeCore (DxeCoreEntryPoint, HobList, &mPpiSignal);

   //

@@ -318,124 +303,235 @@ Returns:
   return EFI_OUT_OF_RESOURCES;

 }

 

+

+STATIC

 EFI_STATUS

-PeiFindFile (

-  IN  UINT8                  Type,

-  IN  EFI_SECTION_TYPE       SectionType,

-  OUT EFI_GUID               *FileName,

-  OUT VOID                   **Pe32Data

+GetFvAlignment (

+  IN    EFI_FIRMWARE_VOLUME_HEADER   *FvHeader,

+  OUT   UINT32                      *FvAlignment

   )

-/*++

-

-Routine Description:

-

-  Finds a PE/COFF of a specific Type and SectionType in the Firmware Volumes

-  described in the HOB list. Able to search in a compression set in a FFS file.

-  But only one level of compression is supported, that is, not able to search

-  in a compression set that is within another compression set.

-

-Arguments:

+{

+  //

+  // Because FvLength in FvHeader is UINT64 type, 

+  // so FvHeader must meed at least 8 bytes alignment.

+  // Get the appropriate alignment requirement.

+  // 

+  if ((FvHeader->Attributes & EFI_FVB2_ALIGNMENT) < EFI_FVB2_ALIGNMENT_8) {

+    return EFI_UNSUPPORTED;

+  }

+  

+   *FvAlignment = 1 << ((FvHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16);

+   return EFI_SUCCESS;

+}

 

-  Type        - The Type of file to retrieve

+/**

+   Search EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE image and expand 

+   as memory FV 

+    

+   @return EFI_OUT_OF_RESOURCES There are no memory space to exstract FV

+   @return EFI_SUCESS           Sucess to find the FV 

+**/

+EFI_STATUS

+DxeIplAddEncapsulatedFirmwareVolumes (

+  VOID

+  )

+{

+  EFI_STATUS                  Status;

+  EFI_STATUS                  VolumeStatus;

+  UINTN                       Index;

+  EFI_FV_INFO                 VolumeInfo; 

+  EFI_PEI_FV_HANDLE           VolumeHandle;

+  EFI_PEI_FILE_HANDLE         FileHandle;

+  UINT32                      SectionLength;

+  EFI_FIRMWARE_VOLUME_HEADER  *FvHeader;

+  EFI_FIRMWARE_VOLUME_IMAGE_SECTION *SectionHeader;

+  VOID                        *DstBuffer;

+  UINT32                       FvAlignment;

+  EFI_PEI_FIRMWARE_VOLUME_INFO_PPI *FvInfoPpi;

+  EFI_PEI_PPI_DESCRIPTOR           *FvInfoPpiDescriptor;

+

+  Status = EFI_NOT_FOUND;

+  Index  = 0;

 

-  SectionType - The type of section to retrieve from a file

+  do {

+    VolumeStatus = DxeIplFindFirmwareVolumeInstance (

+                    &Index, 

+                    EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE, 

+                    &VolumeHandle, 

+                    &FileHandle

+                    );

+                    

+    if (!EFI_ERROR (VolumeStatus)) {

+         Status = PeiServicesFfsFindSectionData (

+                    EFI_SECTION_FIRMWARE_VOLUME_IMAGE, 

+                    (EFI_FFS_FILE_HEADER *)FileHandle, 

+                    (VOID **)&FvHeader

+                    );

+                    

+      if (!EFI_ERROR (Status)) {

+        if (FvHeader->Signature == EFI_FVH_SIGNATURE) {

+          //

+          // Because FvLength in FvHeader is UINT64 type, 

+          // so FvHeader must meed at least 8 bytes alignment.

+          // If current FvImage base address doesn't meet its alignment,

+          // we need to reload this FvImage to another correct memory address.

+          //

+          Status = GetFvAlignment(FvHeader, &FvAlignment); 

+          if (EFI_ERROR(Status)) {

+            return Status;

+          }

+          if (((UINTN) FvHeader % FvAlignment) != 0) {

+            SectionHeader = (EFI_FIRMWARE_VOLUME_IMAGE_SECTION*)((UINTN)FvHeader - sizeof(EFI_FIRMWARE_VOLUME_IMAGE_SECTION));

+            SectionLength =  *(UINT32 *)SectionHeader->Size & 0x00FFFFFF;

+            

+            DstBuffer = AllocateAlignedPages (EFI_SIZE_TO_PAGES ((UINTN) SectionLength - sizeof (EFI_COMMON_SECTION_HEADER)), FvAlignment);

+            if (DstBuffer == NULL) {

+              return EFI_OUT_OF_RESOURCES;

+            }

+            CopyMem (DstBuffer, FvHeader, (UINTN) SectionLength - sizeof (EFI_COMMON_SECTION_HEADER));

+            FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) DstBuffer;  

+          }

 

-  FileName    - The name of the file found in the Firmware Volume

+          //

+          // This new Firmware Volume comes from a firmware file within a firmware volume.

+          // Record the original Firmware Volume Name.

+          //

+          PeiServicesFfsGetVolumeInfo (&VolumeHandle, &VolumeInfo);

 

-  Pe32Data    - Pointer to the beginning of the PE/COFF file found in the Firmware Volume

+          //

+          // Prepare to install FirmwareVolumeInfo PPI to expose new FV to PeiCore.

+          //

+          FvInfoPpi = AllocateCopyPool (sizeof (EFI_PEI_FIRMWARE_VOLUME_INFO_PPI), &mFvInfoPpiTemplate);

+          ASSERT(FvInfoPpi != NULL);

+

+          FvInfoPpi->FvInfo     = (VOID*)FvHeader;

+          FvInfoPpi->FvInfoSize = (UINT32)FvHeader->FvLength;

+          CopyMem (

+            &FvInfoPpi->ParentFvName,

+            &(VolumeInfo.FvName),

+            sizeof (EFI_GUID)

+            );

+          CopyMem (

+            &FvInfoPpi->ParentFileName,

+            &(((EFI_FFS_FILE_HEADER*)FileHandle)->Name),

+            sizeof (EFI_GUID)

+            );

 

-Returns:

+          FvInfoPpiDescriptor = AllocatePool (sizeof(EFI_PEI_PPI_DESCRIPTOR));

+          ASSERT (FvInfoPpiDescriptor != NULL);

+    	  

+          FvInfoPpiDescriptor->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI|EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;

+          FvInfoPpiDescriptor->Guid  = &gEfiPeiFirmwareVolumeInfoPpiGuid;

+          FvInfoPpiDescriptor->Ppi   = (VOID *) FvInfoPpi;

 

-  EFI_SUCCESS   - The file was found, and the name is returned in FileName, and a pointer to

-                  the PE/COFF image is returned in Pe32Data

+          Status          = PeiServicesInstallPpi (FvInfoPpiDescriptor);

+          ASSERT_EFI_ERROR (Status);

 

-  EFI_NOT_FOUND - The file was not found in the Firmware Volumes present in the HOB List

+          //

+          // Makes the encapsulated volume show up in DXE phase to skip processing of

+          // encapsulated file again.

+          //

+          BuildFv2Hob (

+            (EFI_PHYSICAL_ADDRESS)(UINTN)FvHeader,

+            FvHeader->FvLength, 

+            &VolumeInfo.FvName,

+            &(((EFI_FFS_FILE_HEADER *)FileHandle)->Name)

+            );

+          return Status;

+        }

+      }

+    }

+  } while (!EFI_ERROR (VolumeStatus));

+  

+  return Status;

+}

 

---*/

+/**

+   Find the First Volume that contains the first FileType.

+

+   @param Instance      The Fv instance.

+   @param SeachType     The type of file to search.

+   @param VolumeHandle  Pointer to Fv which contains the file to search. 

+   @param FileHandle    Pointer to FFS file to search.

+   

+   @return EFI_SUCESS   Success to find the FFS in specificed FV

+   @return others       Fail to find the FFS in specificed FV

+ */

+EFI_STATUS

+DxeIplFindFirmwareVolumeInstance (

+  IN OUT UINTN              *Instance,

+  IN  EFI_FV_FILETYPE       SeachType,

+  OUT EFI_PEI_FV_HANDLE     *VolumeHandle,

+  OUT EFI_PEI_FILE_HANDLE   *FileHandle

+  )

 {

-  EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;

-  EFI_FFS_FILE_HEADER         *FfsFileHeader;

-  EFI_STATUS                  Status;

-  EFI_PEI_HOB_POINTERS        Hob;

+  EFI_STATUS  Status;

+  EFI_STATUS  VolumeStatus;

 

-

-  FwVolHeader   = NULL;

-  FfsFileHeader = NULL;

-  Status        = EFI_SUCCESS;

-

-  //

-  // For each Firmware Volume, look for a specified type

-  // of file and break out until no one is found 

-  //

-  Hob.Raw = GetHobList ();

-  while ((Hob.Raw = GetNextHob (EFI_HOB_TYPE_FV, Hob.Raw)) != NULL) {

-    FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) (Hob.FirmwareVolume->BaseAddress);

-    //

-    // Make sure the FV HOB does not get corrupted.

-    //

-    ASSERT (FwVolHeader->Signature == EFI_FVH_SIGNATURE);

-

-    Status = PeiServicesFfsFindNextFile (

-               Type,

-               (EFI_PEI_FV_HANDLE)    FwVolHeader,

-               (EFI_PEI_FILE_HANDLE*) &FfsFileHeader

-               );

-    if (!EFI_ERROR (Status)) {

-      Status = PeiProcessFile (

-                 SectionType,

-                 FfsFileHeader,

-                 Pe32Data,

-                 &Hob

-                 );

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

-      //

-      // Find all Fv type ffs to get all FvImage and add them into FvHob

-      //

-      if (!EFI_ERROR (Status) && (Type != EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE)) {

-        return EFI_SUCCESS;

+  do {

+    VolumeStatus = PeiServicesFfsFindNextVolume (*Instance, VolumeHandle);

+    if (!EFI_ERROR (VolumeStatus)) {

+      *FileHandle = NULL;

+      Status = PeiServicesFfsFindNextFile (SeachType, *VolumeHandle, FileHandle);

+      if (!EFI_ERROR (Status)) {

+        return Status;

       }

     }

-    Hob.Raw = GET_NEXT_HOB (Hob);

-  }

-  return EFI_NOT_FOUND;

+    *Instance += 1;

+  } while (!EFI_ERROR (VolumeStatus));

+

+  return VolumeStatus;

 }

 

+/**

+   Loads and relocates a PE/COFF image into memory.

+

+   @param FileHandle        The image file handle

+   @param ImageAddress      The base address of the relocated PE/COFF image

+   @param ImageSize         The size of the relocated PE/COFF image

+   @param EntryPoint        The entry point of the relocated PE/COFF image

+   

+   @return EFI_SUCCESS           The file was loaded and relocated

+   @return EFI_OUT_OF_RESOURCES  There was not enough memory to load and relocate the PE/COFF file

+**/

 EFI_STATUS

 PeiLoadFile (

-  IN  EFI_PEI_PE_COFF_LOADER_PROTOCOL           *PeiEfiPeiPeCoffLoader,

-  IN  VOID                                      *Pe32Data,

+  IN  EFI_PEI_FILE_HANDLE                       FileHandle,

   OUT EFI_PHYSICAL_ADDRESS                      *ImageAddress,

   OUT UINT64                                    *ImageSize,

   OUT EFI_PHYSICAL_ADDRESS                      *EntryPoint

   )

-/*++

-

-Routine Description:

-

-  Loads and relocates a PE/COFF image into memory.

-

-Arguments:

-

-  PeiEfiPeiPeCoffLoader - Pointer to a PE COFF loader protocol

-

-  Pe32Data         - The base address of the PE/COFF file that is to be loaded and relocated

-

-  ImageAddress     - The base address of the relocated PE/COFF image

-

-  ImageSize        - The size of the relocated PE/COFF image

-

-  EntryPoint       - The entry point of the relocated PE/COFF image

-

-Returns:

+{

 

-  EFI_SUCCESS   - The file was loaded and relocated

+  EFI_STATUS                        Status;

+  PE_COFF_LOADER_IMAGE_CONTEXT      ImageContext;

+  VOID                              *Pe32Data;

+  EFI_PEI_PE_COFF_LOADER_PROTOCOL   *PeiEfiPeiPeCoffLoader;

 

-  EFI_OUT_OF_RESOURCES - There was not enough memory to load and relocate the PE/COFF file

+  PeiEfiPeiPeCoffLoader = (EFI_PEI_PE_COFF_LOADER_PROTOCOL *)GetPeCoffLoaderProtocol ();

+  //

+  // First try to find the required section in this ffs file.

+  //

+  Status = PeiServicesFfsFindSectionData (

+             EFI_SECTION_PE32,

+             FileHandle,

+             &Pe32Data

+             );

 

---*/

-{

-  EFI_STATUS                            Status;

-  PE_COFF_LOADER_IMAGE_CONTEXT          ImageContext;

+  if (EFI_ERROR (Status)) {

+    Status = PeiServicesFfsFindSectionData (

+               EFI_SECTION_TE,

+               FileHandle,

+               &Pe32Data

+               );

+  }

+  

+  if (EFI_ERROR (Status)) {

+    //

+    // NO image types we support so exit.

+    //

+    return Status;

+  }

 

   ZeroMem (&ImageContext, sizeof (ImageContext));

   ImageContext.Handle = Pe32Data;

@@ -480,430 +576,6 @@ Returns:
   return EFI_SUCCESS;

 }

 

-EFI_STATUS

-ShadowDxeIpl (

-  IN EFI_FFS_FILE_HEADER                       *DxeIplFileHeader,

-  IN EFI_PEI_PE_COFF_LOADER_PROTOCOL           *PeiEfiPeiPeCoffLoader

-  )

-/*++

-

-Routine Description:

-

-  Shadow the DXE IPL to a different memory location. This occurs after permanent

-  memory has been discovered.

-

-Arguments:

-

-  DxeIplFileHeader      - Pointer to the FFS file header of the DXE IPL driver

-

-  PeiEfiPeiPeCoffLoader - Pointer to a PE COFF loader protocol

-

-Returns:

-

-  EFI_SUCCESS   - DXE IPL was successfully shadowed to a different memory location.

-

-  EFI_ ERROR    - The shadow was unsuccessful.

-

-

---*/

-{

-  UINTN                     SectionLength;

-  UINTN                     OccupiedSectionLength;

-  EFI_PHYSICAL_ADDRESS      DxeIplAddress;

-  UINT64                    DxeIplSize;

-  EFI_PHYSICAL_ADDRESS      DxeIplEntryPoint;

-  EFI_STATUS                Status;

-  EFI_COMMON_SECTION_HEADER *Section;

-

-  Section = (EFI_COMMON_SECTION_HEADER *) (DxeIplFileHeader + 1);

-

-  while ((Section->Type != EFI_SECTION_PE32) && (Section->Type != EFI_SECTION_TE)) {

-    SectionLength         = *(UINT32 *) (Section->Size) & 0x00ffffff;

-    OccupiedSectionLength = GET_OCCUPIED_SIZE (SectionLength, 4);

-    Section               = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) Section + OccupiedSectionLength);

-  }

-  //

-  // Relocate DxeIpl into memory by using loadfile service

-  //

-  Status = PeiLoadFile (

-            PeiEfiPeiPeCoffLoader,

-            (VOID *) (Section + 1),

-            &DxeIplAddress,

-            &DxeIplSize,

-            &DxeIplEntryPoint

-            );

-

-  if (Status == EFI_SUCCESS) {

-    //

-    // Set gInMemory global variable to TRUE to indicate the dxeipl is shadowed.

-    //

-    *(BOOLEAN *) ((UINTN) &gInMemory + (UINTN) DxeIplEntryPoint - (UINTN) _ModuleEntryPoint) = TRUE;

-    Status = ((EFI_PEIM_ENTRY_POINT2) (UINTN) DxeIplEntryPoint) ((EFI_PEI_FILE_HANDLE *) DxeIplFileHeader, GetPeiServicesTablePointer());

-  }

-

-  return Status;

-}

-

-EFI_STATUS

-EFIAPI

-DxeIplLoadFile (

-  IN EFI_PEI_FV_FILE_LOADER_PPI                 *This,

-  IN  EFI_FFS_FILE_HEADER                       *FfsHeader,

-  OUT EFI_PHYSICAL_ADDRESS                      *ImageAddress,

-  OUT UINT64                                    *ImageSize,

-  OUT EFI_PHYSICAL_ADDRESS                      *EntryPoint

-  )

-/*++

-

-Routine Description:

-

-  Given a pointer to an FFS file containing a PE32 image, get the

-  information on the PE32 image, and then "load" it so that it

-  can be executed.

-

-Arguments:

-

-  This  - pointer to our file loader protocol

-

-  FfsHeader - pointer to the FFS file header of the FFS file that

-              contains the PE32 image we want to load

-

-  ImageAddress  - returned address where the PE32 image is loaded

-

-  ImageSize     - returned size of the loaded PE32 image

-

-  EntryPoint    - entry point to the loaded PE32 image

-

-Returns:

-

-  EFI_SUCCESS  - The FFS file was successfully loaded.

-

-  EFI_ERROR    - Unable to load the FFS file.

-

---*/

-{

-  EFI_PEI_PE_COFF_LOADER_PROTOCOL           *PeiEfiPeiPeCoffLoader;

-  EFI_STATUS                                Status;

-  VOID                                      *Pe32Data;

-

-  Pe32Data = NULL;

-  PeiEfiPeiPeCoffLoader = (EFI_PEI_PE_COFF_LOADER_PROTOCOL *)GetPeCoffLoaderProtocol ();

-

-  //

-  // Preprocess the FFS file to get a pointer to the PE32 information

-  // in the enclosed PE32 image.

-  //

- Status = PeiProcessFile (

-            EFI_SECTION_TE,

-            FfsHeader,

-            &Pe32Data,

-            NULL

-            );

-  if (EFI_ERROR (Status)) {

-    Status = PeiProcessFile (

-              EFI_SECTION_PE32,

-              FfsHeader,

-              &Pe32Data,

-              NULL

-              );

-    

-    if (EFI_ERROR (Status)) {

-      return Status;

-    }

-  }

-  //

-  // Load the PE image from the FFS file

-  //

-  Status = PeiLoadFile (

-            PeiEfiPeiPeCoffLoader,

-            Pe32Data,

-            ImageAddress,

-            ImageSize,

-            EntryPoint

-            );

-

-  return Status;

-}

-

-EFI_STATUS

-PeiProcessFile (

-  IN      EFI_SECTION_TYPE       SectionType,

-  IN      EFI_FFS_FILE_HEADER    *FfsFileHeader,

-  OUT     VOID                   **Pe32Data,

-  IN      EFI_PEI_HOB_POINTERS   *OrigHob

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-  SectionType       - The type of section in the FFS file to process.

-

-  FfsFileHeader     - Pointer to the FFS file to process, looking for the

-                      specified SectionType

-

-  Pe32Data          - returned pointer to the start of the PE32 image found

-                      in the FFS file.

-

-Returns:

-

-  EFI_SUCCESS       - found the PE32 section in the FFS file

-

---*/

-{

-  EFI_STATUS                      Status;

-  UINT8                           *DstBuffer;

-  UINT8                           *ScratchBuffer;

-  UINTN                           DstBufferSize;

-  UINT32                          ScratchBufferSize;

-  EFI_COMMON_SECTION_HEADER       *CmpSection;

-  UINTN                           CmpSectionLength;

-  UINTN                           OccupiedCmpSectionLength;

-  VOID                            *CmpFileData;

-  UINTN                           CmpFileSize;

-  EFI_COMMON_SECTION_HEADER       *Section;

-  UINTN                           SectionLength;

-  UINTN                           OccupiedSectionLength;

-  UINTN                           FileSize;

-  EFI_FIRMWARE_VOLUME_HEADER      *FvHeader;

-  EFI_COMPRESSION_SECTION         *CompressionSection;

-  EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI  *SectionExtract;

-  UINT32                          AuthenticationStatus;

-

-  //

-  // First try to find the required section in this ffs file.

-  //

-  Status = PeiServicesFfsFindSectionData (

-             SectionType,

-             FfsFileHeader,

-             Pe32Data

-             );

-  if (!EFI_ERROR (Status)) {

-    return Status;

-  }

-  

-  //

-  // If not found, the required section may be in guided or compressed section.

-  // So, search guided or compressed section to process

-  //

-  Section   = (EFI_COMMON_SECTION_HEADER *) (UINTN) (VOID *) ((UINT8 *) (FfsFileHeader) + (UINTN) sizeof (EFI_FFS_FILE_HEADER));

-  FileSize  = FfsFileHeader->Size[0] & 0xFF;

-  FileSize += (FfsFileHeader->Size[1] << 8) & 0xFF00;

-  FileSize += (FfsFileHeader->Size[2] << 16) & 0xFF0000;

-  FileSize &= 0x00FFFFFF;

-  OccupiedSectionLength = 0;

-

-  do {

-    //

-    // Initialize local variables.

-    //

-    DstBuffer         = NULL;

-    DstBufferSize     = 0; 

-

-    Section               = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) Section + OccupiedSectionLength);

-    SectionLength         = *(UINT32 *) (Section->Size) & 0x00ffffff;

-    OccupiedSectionLength = GET_OCCUPIED_SIZE (SectionLength, 4);

-

-    //

-    // Was the DXE Core file encapsulated in a GUID'd section?

-    //

-    if (Section->Type == EFI_SECTION_GUID_DEFINED) {

-      //

-      // Set a default authenticatino state

-      //

-      AuthenticationStatus = 0;

-      //

-      // Locate extract guid section ppi

-      //

-      Status = PeiServicesLocatePpi (

-                 (EFI_GUID *) (Section + 1),

-                 0,

-                 NULL,

-                 (VOID **)&SectionExtract

-                 );

-

-      if (EFI_ERROR (Status)) {

-        //

-        // ignore the unknown guid section

-        //

-        continue;

-      }

-      //

-      // Extract the contents from guid section

-      //

-      Status = SectionExtract->ExtractSection (

-                                SectionExtract,

-                                (VOID *) Section,

-                                (VOID **) &DstBuffer,

-                                &DstBufferSize,

-                                &AuthenticationStatus

-                                );

-

-      if (EFI_ERROR (Status)) {

-        DEBUG ((EFI_D_ERROR, "Extract section content failed - %r\n", Status));

-        return Status;

-      }

-      

-      //

-      // Todo check AuthenticationStatus and do the verify

-      //

-    } else if (Section->Type == EFI_SECTION_COMPRESSION) {

-      //

-      // This is a compression set, expand it

-      //

-      CompressionSection  = (EFI_COMPRESSION_SECTION *) Section;

-

-      switch (CompressionSection->CompressionType) {

-      case EFI_STANDARD_COMPRESSION:

-        //

-        // Load EFI standard compression.

-        // For compressed data, decompress them to dstbuffer.

-        //

-        Status = UefiDecompressGetInfo (

-                   (UINT8 *) ((EFI_COMPRESSION_SECTION *) Section + 1),

-                   (UINT32) SectionLength - sizeof (EFI_COMPRESSION_SECTION),

-                   (UINT32 *) &DstBufferSize,

-                   &ScratchBufferSize

-                   );

-        if (EFI_ERROR (Status)) {

-          //

-          // GetInfo failed

-          //

-          DEBUG ((EFI_D_ERROR, "Decompress GetInfo Failed - %r\n", Status));

-          return EFI_NOT_FOUND;

-        }

-        //

-        // Allocate scratch buffer

-        //

-        ScratchBuffer = AllocatePages (EFI_SIZE_TO_PAGES (ScratchBufferSize));

-        if (ScratchBuffer == NULL) {

-          return EFI_OUT_OF_RESOURCES;

-        }

-        //

-        // Allocate destination buffer

-        //

-        DstBuffer = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize));

-        if (DstBuffer == NULL) {

-          return EFI_OUT_OF_RESOURCES;

-        }

-        //

-        // Call decompress function

-        //

-        Status = UefiDecompress (

-                    (CHAR8 *) ((EFI_COMPRESSION_SECTION *) Section + 1),

-                    DstBuffer,

-                    ScratchBuffer

-                    );

-        if (EFI_ERROR (Status)) {

-          //

-          // Decompress failed

-          //

-          DEBUG ((EFI_D_ERROR, "Decompress Failed - %r\n", Status));

-          return EFI_NOT_FOUND;

-        }

-        break;

-

-      // porting note the original branch for customized compress is removed, it should be change to use GUID compress

-

-      case EFI_NOT_COMPRESSED:

-        //

-        // Allocate destination buffer

-        //

-        DstBufferSize = CompressionSection->UncompressedLength;

-        DstBuffer     = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize));

-        if (DstBuffer == NULL) {

-          return EFI_OUT_OF_RESOURCES;

-        }

-        //

-        // stream is not actually compressed, just encapsulated.  So just copy it.

-        //

-        CopyMem (DstBuffer, CompressionSection + 1, DstBufferSize);

-        break;

-

-      default:

-        //

-        // Don't support other unknown compression type.

-        //

-        ASSERT_EFI_ERROR (Status);

-        return EFI_NOT_FOUND;

-      }

-    } else {

-      //

-      // ignore other type sections

-      //

-      continue;

-    }

-

-    //

-    // Extract contents from guided or compressed sections.

-    // Loop the decompressed data searching for expected section.

-    //

-    CmpSection = (EFI_COMMON_SECTION_HEADER *) DstBuffer;

-    CmpFileData = (VOID *) DstBuffer;

-    CmpFileSize = DstBufferSize;

-    do {

-      CmpSectionLength          = *(UINT32 *) (CmpSection->Size) & 0x00ffffff;

-      if (CmpSection->Type == SectionType) {

-        //

-        // This is what we want

-        //

-        if (SectionType == EFI_SECTION_FIRMWARE_VOLUME_IMAGE) {

-          // 

-          // Firmware Volume Image in this Section

-          // Skip the section header to get FvHeader

-          //

-          FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (CmpSection + 1);

-

-          if (FvHeader->Signature == EFI_FVH_SIGNATURE) {

-            //

-            // Because FvLength in FvHeader is UINT64 type, 

-            // so FvHeader must meed at least 8 bytes alignment.

-            // If current FvImage base address doesn't meet its alignment,

-            // we need to reload this FvImage to another correct memory address.

-            //

-            if (((UINTN) FvHeader % sizeof (UINT64)) != 0) {

-              CopyMem (DstBuffer, FvHeader, (UINTN) CmpSectionLength - sizeof (EFI_COMMON_SECTION_HEADER));

-              FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) DstBuffer;  

-            }

-

-            //

-            // Build new FvHob for new decompressed Fv image.

-            //

-            BuildFvHob ((EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader, FvHeader->FvLength);

-            

-            //

-            // Set the original FvHob to unused.

-            //

-            if (OrigHob != NULL) {

-              OrigHob->Header->HobType = EFI_HOB_TYPE_UNUSED;

-            }

-            //

-            // return found FvImage data.

-            //

-            *Pe32Data = (VOID *) FvHeader;

-            return EFI_SUCCESS;

-          }

-        } else {

-          //

-          // direct return the found section.

-          //

-          *Pe32Data = (VOID *) (CmpSection + 1);

-          return EFI_SUCCESS;

-        }

-      }

-      OccupiedCmpSectionLength  = GET_OCCUPIED_SIZE (CmpSectionLength, 4);

-      CmpSection                = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) CmpSection + OccupiedCmpSectionLength);

-    } while (CmpSection->Type != 0 && (UINTN) ((UINT8 *) CmpSection - (UINT8 *) CmpFileData) < CmpFileSize);

-  } while (Section->Type != 0 && (UINTN) ((UINT8 *) Section + OccupiedSectionLength - (UINT8 *) FfsFileHeader) < FileSize);

-

-  //

-  // search all sections (compression and non compression) in this FFS, don't 

-  // find expected section.

-  //

-  return EFI_NOT_FOUND;

-}

-

 /**

   The ExtractSection() function processes the input section and

   returns a pointer to the section contents. If the section being

@@ -1032,3 +704,114 @@ CustomDecompressExtractSection (
   

   return EFI_SUCCESS;

 }

+

+STATIC

+EFI_STATUS

+EFIAPI 

+Decompress (

+  IN CONST  EFI_PEI_DECOMPRESS_PPI  *This,

+  IN CONST  EFI_COMPRESSION_SECTION *CompressionSection,

+  OUT       VOID                    **OutputBuffer,

+  OUT       UINTN                   *OutputSize

+ )

+{

+  EFI_STATUS                      Status;

+  UINT8                           *DstBuffer;

+  UINT8                           *ScratchBuffer;

+  UINTN                           DstBufferSize;

+  UINT32                          ScratchBufferSize;

+  EFI_COMMON_SECTION_HEADER       *Section;

+  UINTN                           SectionLength;

+

+  if (CompressionSection->CommonHeader.Type != EFI_SECTION_COMPRESSION) {

+    ASSERT (FALSE);

+    return EFI_INVALID_PARAMETER;

+  }

+

+  Section = (EFI_COMMON_SECTION_HEADER *) CompressionSection;

+  SectionLength         = *(UINT32 *) (Section->Size) & 0x00ffffff;

+  

+  //

+  // This is a compression set, expand it

+  //

+  switch (CompressionSection->CompressionType) {

+  case EFI_STANDARD_COMPRESSION:

+    //

+    // Load EFI standard compression.

+    // For compressed data, decompress them to dstbuffer.

+    //

+    Status = UefiDecompressGetInfo (

+               (UINT8 *) ((EFI_COMPRESSION_SECTION *) Section + 1),

+               (UINT32) SectionLength - sizeof (EFI_COMPRESSION_SECTION),

+               (UINT32 *) &DstBufferSize,

+               &ScratchBufferSize

+               );

+    if (EFI_ERROR (Status)) {

+      //

+      // GetInfo failed

+      //

+      DEBUG ((EFI_D_ERROR, "Decompress GetInfo Failed - %r\n", Status));

+      return EFI_NOT_FOUND;

+    }

+    //

+    // Allocate scratch buffer

+    //

+    ScratchBuffer = AllocatePages (EFI_SIZE_TO_PAGES (ScratchBufferSize));

+    if (ScratchBuffer == NULL) {

+      return EFI_OUT_OF_RESOURCES;

+    }

+    //

+    // Allocate destination buffer

+    //

+    DstBuffer = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize));

+    if (DstBuffer == NULL) {

+      return EFI_OUT_OF_RESOURCES;

+    }

+    //

+    // Call decompress function

+    //

+    Status = UefiDecompress (

+                (CHAR8 *) ((EFI_COMPRESSION_SECTION *) Section + 1),

+                DstBuffer,

+                ScratchBuffer

+                );

+    if (EFI_ERROR (Status)) {

+      //

+      // Decompress failed

+      //

+      DEBUG ((EFI_D_ERROR, "Decompress Failed - %r\n", Status));

+      return EFI_NOT_FOUND;

+    }

+    break;

+

+  // porting note the original branch for customized compress is removed, it should be change to use GUID compress

+

+  case EFI_NOT_COMPRESSED:

+    //

+    // Allocate destination buffer

+    //

+    DstBufferSize = CompressionSection->UncompressedLength;

+    DstBuffer     = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize));

+    if (DstBuffer == NULL) {

+      return EFI_OUT_OF_RESOURCES;

+    }

+    //

+    // stream is not actually compressed, just encapsulated.  So just copy it.

+    //

+    CopyMem (DstBuffer, CompressionSection + 1, DstBufferSize);

+    break;

+

+  default:

+    //

+    // Don't support other unknown compression type.

+    //

+    ASSERT (FALSE);

+    return EFI_NOT_FOUND;

+  }

+

+  *OutputSize = DstBufferSize;

+  *OutputBuffer = DstBuffer;

+

+  return EFI_SUCCESS;

+}

+