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

13 files changed, 724 insertions, 7 deletions

diff --git a/MdePkg/Include/Library/HobLib.h b/MdePkg/Include/Library/HobLib.h
index 0e1555d..50e0d10 100644
--- a/MdePkg/Include/Library/HobLib.h
+++ b/MdePkg/Include/Library/HobLib.h
@@ -263,6 +263,30 @@ BuildFvHob (
 ;

 

 /**

+  Builds a EFI_HOB_TYPE_FV2 HOB.

+

+  This function builds a EFI_HOB_TYPE_FV2 HOB.

+  It can only be invoked during PEI phase;

+  for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.

+  If there is no additional space for HOB creation, then ASSERT().

+

+  @param  BaseAddress   The base address of the Firmware Volume.

+  @param  Length        The size of the Firmware Volume in bytes.

+  @param  FvName       The name of the Firmware Volume.

+  @param  FileName      The name of the file.

+  

+**/

+VOID

+EFIAPI

+BuildFv2Hob (

+  IN          EFI_PHYSICAL_ADDRESS        BaseAddress,

+  IN          UINT64                      Length,

+  IN CONST    EFI_GUID                    *FvName,

+  IN CONST    EFI_GUID                    *FileName

+  )

+;

+

+/**

   Builds a Capsule Volume HOB.

 

   This function builds a Capsule Volume HOB.

diff --git a/MdePkg/Include/Library/PeiPiLib.h b/MdePkg/Include/Library/PeiPiLib.h
new file mode 100644
index 0000000..a34fd50
--- /dev/null
+++ b/MdePkg/Include/Library/PeiPiLib.h
@@ -0,0 +1,30 @@
+/** @file

+  MDE PI library functions and macros for PEI phase

+

+  Copyright (c) 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        

+  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.             

+

+**/

+

+#ifndef __PEI_PI_LIB_H__

+#define __PEI_PI_LIB_H__

+

+#include <Pi/PiFirmwareFile.h>

+

+VOID

+EFIAPI

+PeiPiLibBuildPiFvInfoPpi (

+  IN EFI_PHYSICAL_ADDRESS    FvStart,

+  IN UINT64                  FvLength,

+  IN EFI_GUID                *ParentFvName,

+  IN EFI_GUID                *PraentFileName

+);

+

+#endif

+

diff --git a/MdePkg/Include/Library/PeiServicesLib.h b/MdePkg/Include/Library/PeiServicesLib.h
index 3d0deb9..2d02823 100644
--- a/MdePkg/Include/Library/PeiServicesLib.h
+++ b/MdePkg/Include/Library/PeiServicesLib.h
@@ -293,4 +293,35 @@ PeiServicesResetSystem (
   );

 

 

+EFI_STATUS

+EFIAPI

+PeiServicesFfsFindByName (

+  IN CONST  EFI_GUID            *FileName,

+  IN CONST  EFI_PEI_FV_HANDLE   VolumeHandle,

+  OUT       EFI_PEI_FILE_HANDLE *FileHandle

+  );

+

+

+EFI_STATUS

+EFIAPI 

+PeiServicesFfsGetFileInfo (

+  IN CONST  EFI_PEI_FILE_HANDLE   FileHandle,

+  OUT EFI_FV_FILE_INFO            *FileInfo

+  );

+

+EFI_STATUS

+EFIAPI

+PeiServicesFfsGetVolumeInfo (

+  IN  EFI_PEI_FV_HANDLE       VolumeHandle,

+  OUT EFI_FV_INFO             *VolumeInfo

+  );

+

+

+EFI_STATUS

+EFIAPI

+PeiServicesRegisterForShadow (

+  IN  EFI_PEI_FILE_HANDLE FileHandle

+  );

+

+

 #endif

diff --git a/MdePkg/Include/Library/PeiServicesTablePointerLib.h b/MdePkg/Include/Library/PeiServicesTablePointerLib.h
index ede0337..7a602f9 100644
--- a/MdePkg/Include/Library/PeiServicesTablePointerLib.h
+++ b/MdePkg/Include/Library/PeiServicesTablePointerLib.h
@@ -30,5 +30,11 @@ GetPeiServicesTablePointer (
   VOID

   );

 

+VOID

+EFIAPI

+SetPeiServicesTablePointer (

+  EFI_PEI_SERVICES ** PeiServicesTablePointer

+  );

+

 #endif

 

diff --git a/MdePkg/Include/Library/PiLib.h b/MdePkg/Include/Library/PiLib.h
index d15a712..8aaad25 100644
--- a/MdePkg/Include/Library/PiLib.h
+++ b/MdePkg/Include/Library/PiLib.h
@@ -75,6 +75,233 @@ GetSectionFromFvFile (
   )

 ;

 

+/**

+  Identify the device handle from which the Image is loaded from. As this device handle is passed to

+  GetSectionFromFv as the identifier for a Firmware Volume, an EFI_FIRMWARE_VOLUME2_PROTOCOL 

+  protocol instance should be located succesfully by calling gBS->HandleProtocol ().

+

+  This function locates the EFI_LOADED_IMAGE_PROTOCOL instance installed

+  on ImageHandle. It then returns EFI_LOADED_IMAGE_PROTOCOL.DeviceHandle.

+  

+  If ImageHandle is NULL, then ASSERT ();

+  If failed to locate a EFI_LOADED_IMAGE_PROTOCOL on ImageHandle, then ASSERT ();

+  

+  @param  ImageHandle         The firmware allocated handle for UEFI image.

+

+  @retval  EFI_HANDLE	        The device handle from which the Image is loaded from.

+

+**/

+

+EFI_HANDLE

+EFIAPI

+ImageHandleToFvHandle (

+  EFI_HANDLE ImageHandle

+  )

+;

+

+/**

+    Allocate and fill a buffer from the Firmware Section identified by a Firmware File GUID name and a Firmware 

+    Section type and instance number from the any Firmware Volumes in the system.

+  

+    The function will read the first Firmware Section found sepcifed by NameGuid and SectionType from the 

+    any Firmware Volume in the system. 

+

+    The search order for Firmware Volumes in the system is determistic but abitrary if no new Firmware Volume is installed

+    into the system. The search order for the section specified by SectionType within a Firmware File is defined by

+    EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection (). Please check Section 2.4 of Volume 3: Platform Initialization 

+    Shared Architectural Elements for detailes.

+    

+    If SectionType is EFI_SECTION_TE, EFI_SECTION_TE will be used as Firmware Section type to read Firmware Section 

+    data from the Firmware File. If no such section exists, EFI_SECTION_PE32 will be used as Firmware Section type to 

+    read Firmware Section data from the Firmware File. If no such section specified is found to match , 

+    EFI_NOT_FOUND is returned.

+

+    The data and size is returned by Buffer and Size. The caller is responsible to free the Buffer allocated 

+    by this function. This function can only be called at TPL_NOTIFY and below.

+    

+    If NameGuid is NULL, then ASSERT();

+    If Buffer is NULL, then ASSERT();

+    If Size is NULL, then ASSERT().

+  

+    @param  NameGuid             The GUID name of a Firmware File.

+    @param  SectionType         The Firmware Section type.

+    @param  Instance              The instance number of Firmware Section to read from starting from 0.

+    @param  Buffer                  On output, Buffer contains the the data read from the section in the Firmware File found.

+    @param  Size                    On output, the size of Buffer.

+  

+    @retval  EFI_SUCCESS        The image is found and data and size is returned.

+    @retval  EFI_NOT_FOUND      The image specified by NameGuid and SectionType can't be found.

+    @retval  EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations.

+    @retval  EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume.

+    @retval  EFI_ACCESS_DENIED  The firmware volume containing the searched Firmware File is configured to disallow reads.

+  

+  **/

+

+EFI_STATUS

+EFIAPI

+GetSectionFromAnyFv (

+  IN  CONST EFI_GUID                *NameGuid,

+  IN  EFI_SECTION_TYPE              SectionType,

+  IN  UINTN                         Instance,

+  OUT VOID                          **Buffer,

+  OUT UINTN                         *Size

+  )

+;

+

+/**

+    Allocate and fill a buffer from a Firmware Section identified by a Firmware File GUID name, a Firmware 

+    Section type and instance number from the specified Firmware Volume.

+  

+    This functions first locate the EFI_FIRMWARE_VOLUME2_PROTOCOL protocol instance on FvHandle in order to 

+    carry out the Firmware Volume read operation. The function then reads the Firmware Section found sepcifed 

+    by NameGuid, SectionType and Instance. 

+    

+    The search order for the section specified by SectionType within a Firmware File is defined by

+    EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection (). Please check Section 2.4 of Volume 3: Platform Initialization 

+    Shared Architectural Elements for detailes.

+    

+    If SectionType is EFI_SECTION_TE, EFI_SECTION_TE will be used as Firmware Section type to read Firmware Section 

+    data from the Firmware File. If no such section exists, EFI_SECTION_PE32 will be used as Firmware Section type to 

+    read Firmware Section data from the Firmware File. If no such section specified is found to match , 

+    EFI_NOT_FOUND is returned.

+    

+    The data and size is returned by Buffer and Size. The caller is responsible to free the Buffer allocated 

+    by this function. This function can be only called at TPL_NOTIFY and below.

+    

+    If FvHandle is NULL, then ASSERT ();

+    If NameGuid is NULL, then ASSERT();

+    If Buffer is NULL, then ASSERT();

+    If Size is NULL, then ASSERT().

+

+    @param  FvHandle              The device handle that contains a instance of EFI_FIRMWARE_VOLUME2_PROTOCOL instance.

+    @param  NameGuid             The GUID name of a Firmware File.

+    @param  SectionType         The Firmware Section type.

+    @param  Instance              The instance number of Firmware Section to read from starting from 0.

+    @param  Buffer                  On output, Buffer contains the the data read from the section in the Firmware File found.

+    @param  Size                    On output, the size of Buffer.

+  

+    @retval  EFI_SUCCESS        The image is found and data and size is returned.

+    @retval  EFI_UNSUPPORTED   FvHandle does not support EFI_FIRMWARE_VOLUME2_PROTOCOL.

+    @retval  EFI_NOT_FOUND      The image specified by NameGuid and SectionType can't be found.

+    @retval  EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations.

+    @retval  EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume.

+    @retval  EFI_ACCESS_DENIED  The firmware volume containing the searched Firmware File is configured to disallow reads.

+  

+  **/

+

+EFI_STATUS

+EFIAPI

+GetSectionFromFv (

+  IN  EFI_HANDLE                    FvHandle,

+  IN  CONST EFI_GUID                *NameGuid,

+  IN  EFI_SECTION_TYPE              SectionType,

+  IN  UINTN                         Instance,

+  OUT VOID                          **Buffer,

+  OUT UINTN                         *Size

+  )

+;

+

+/**

+    Allocate and fill a buffer from a Firmware Section identified by a Firmware File GUID name, a Firmware 

+    Section type and instance number from the same Firmware Volume with the caller's FFS.

+  

+    This functions first locates the EFI_FIRMWARE_VOLUME2_PROTOCOL protocol instance for same Firmrware Volume

+    which also contains the FFS of the caller in order to carry out the Firmware Volume read operation. 

+    The function then reads the Firmware Section found sepcifed by NameGuid, SectionType and Instance. 

+    

+    The search order for the section specified by SectionType within a Firmware File is defined by

+    EFI_FIRMWARE_VOLUME2_PROTOCOL.ReadSection (). Please check Section 2.4 of Volume 3: Platform Initialization 

+    Shared Architectural Elements for detailes.

+    

+    If SectionType is EFI_SECTION_TE, EFI_SECTION_TE will be used as Firmware Section type to read Firmware Section 

+    data from the Firmware File. If no such section exists, EFI_SECTION_PE32 will be used as Firmware Section type to 

+    read Firmware Section data from the Firmware File. If no such section specified is found to match , 

+    EFI_NOT_FOUND is returned.

+    

+    The data and size is returned by Buffer and Size. The caller is responsible to free the Buffer allocated 

+    by this function. This function can be only called at TPL_NOTIFY and below.

+    

+    If FvHandle is NULL, then ASSERT ();

+    If NameGuid is NULL, then ASSERT();

+    If Buffer is NULL, then ASSERT();

+    If Size is NULL, then ASSERT().

+

+    @param  NameGuid             The GUID name of a Firmware File.

+    @param  SectionType         The Firmware Section type.

+    @param  Instance              The instance number of Firmware Section to read from starting from 0.

+    @param  Buffer                  On output, Buffer contains the the data read from the section in the Firmware File found.

+    @param  Size                    On output, the size of Buffer.

+  

+    @retval  EFI_SUCCESS        The image is found and data and size is returned.

+    @retval  EFI_UNSUPPORTED   FvHandle does not support EFI_FIRMWARE_VOLUME2_PROTOCOL.

+    @retval  EFI_NOT_FOUND      The image specified by NameGuid and SectionType can't be found.

+    @retval  EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations.

+    @retval  EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume.

+    @retval  EFI_ACCESS_DENIED  The firmware volume containing the searched Firmware File is configured to disallow reads.

+  

+  **/

+

+EFI_STATUS

+EFIAPI

+GetSectionFromCurrentFv (

+  IN  CONST EFI_GUID                *NameGuid,

+  IN  EFI_SECTION_TYPE              SectionType,

+  IN  UINTN                         Instance,

+  OUT VOID                          **Buffer,

+  OUT UINTN                         *Size

+  )

+;

+

+

+/**

+    Allocate and fill a buffer from the first Firmware Section in the same Firmware File as the caller of this function.

+  

+    The function will read the first Firmware Section found sepcifed by NameGuid and SectionType from the 

+    Firmware Volume specified by FvHandle. On this FvHandle, an EFI_FIRMWARE_VOLUME2_PROTOCOL protocol instance 

+    should be located succesfully in order to carry out the Firmware Volume operations.

+    

+    The search order for the section type specified by SectionType in the Firmware File is using a depth-first 

+    and left-to-right algorithm through all sections. The first section found to match SectionType will be returned. 

+    

+    If SectionType is EFI_SECTION_PE32, EFI_SECTION_PE32 will be used as Firmware Section type 

+    to read Firmware Section data from the Firmware File. If no such section exists, the function will try 

+    to read a Firmware File named with NameGuid. If no such file exists, EFI_NOT_FOUND is returned.

+    

+    If SectionType is EFI_SECTION_TE, EFI_SECTION_TE will be used as Firmware Section type to read Firmware Section 

+    data from the Firmware File. If no such section exists, EFI_SECTION_PE32 will be used as Firmware Section type to 

+    read Firmware Section data from the Firmware File. If no such section exists, the function will try to read a Firmware 

+    File named with NameGuid. If no such file exists, EFI_NOT_FOUND is returned.

+    

+    The data and size is returned by Buffer and Size. The caller is responsible to free the Buffer allocated 

+    by this function. This function can only be called at TPL_NOTIFY and below.

+    

+    If FvHandle is NULL and WithinImage is TRUE, then ASSERT ();

+    If NameGuid is NULL, then ASSERT();

+    If Buffer is NULL, then ASSERT();

+    If Size is NULL, then ASSERT().

+  

+    @param  NameGuid             The GUID name of a Firmware File.

+    @param  SectionType         The Firmware Section type.

+    @param  Buffer                  On output, Buffer contains the the data read from the section in the Firmware File found.

+    @param  Size                    On output, the size of Buffer.

+  

+    @retval  EFI_SUCCESS        The image is found and data and size is returned.

+    @retval  EFI_NOT_FOUND      The image specified by NameGuid and SectionType can't be found.

+    @retval  EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations.

+    @retval  EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume.

+    @retval  EFI_ACCESS_DENIED  The firmware volume containing the searched Firmware File is configured to disallow reads.

+  

+  **/

+

+EFI_STATUS

+EFIAPI

+GetSectionFromCurrentFfs (

+  IN  EFI_SECTION_TYPE              SectionType,

+  IN  UINTN                         Instance,

+  OUT VOID                          **Buffer,

+  OUT UINTN                         *Size

+  )

+;

 

 #endif

 

diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index 4d95c7f..d75a79c 100644
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -51,8 +51,8 @@ typedef struct _EFI_PEI_NOTIFY_DESCRIPTOR EFI_PEI_NOTIFY_DESCRIPTOR;
 typedef

 EFI_STATUS

 (EFIAPI *EFI_PEIM_ENTRY_POINT2)(

-  IN EFI_PEI_FILE_HANDLE       *FileHandle,

-  IN EFI_PEI_SERVICES          **PeiServices

+  IN EFI_PEI_FILE_HANDLE             FileHandle,

+  IN CONST EFI_PEI_SERVICES          **PeiServices

   );

 

 /**

@@ -491,7 +491,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_PEI_RESET_SYSTEM) (

-  IN EFI_PEI_SERVICES   **PeiServices

+  IN CONST EFI_PEI_SERVICES   **PeiServices

   );

 

 /**

diff --git a/MdePkg/Library/DxePiLib/DxePiLib.c b/MdePkg/Library/DxePiLib/DxePiLib.c
index 3261e08..32e0337 100644
--- a/MdePkg/Library/DxePiLib/DxePiLib.c
+++ b/MdePkg/Library/DxePiLib/DxePiLib.c
@@ -16,6 +16,7 @@
 #include <Library/DebugLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/UefiBootServicesTableLib.h>

+#include <Library/PiLib.h>

 #include <Protocol/FirmwareVolume2.h>

 #include <Protocol/LoadedImage.h>

 

@@ -40,7 +41,7 @@
 **/

 STATIC

 EFI_STATUS

-GetImageFromFv (

+InternalGetImageFromFv (

   IN         EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv,

   IN  CONST  EFI_GUID           *NameGuid,

   IN         EFI_SECTION_TYPE   SectionType,

@@ -193,7 +194,7 @@ GetSectionFromFvFile (
                     (VOID **) &ImageFv

                     );

     if (!EFI_ERROR (Status)) {

-      Status = GetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size);

+      Status = InternalGetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size);

     }

   }

 

@@ -231,7 +232,7 @@ GetSectionFromFvFile (
       continue;

     }

 

-    Status = GetImageFromFv (Fv, NameGuid, SectionType, Buffer, Size);

+    Status = InternalGetImageFromFv (Fv, NameGuid, SectionType, Buffer, Size);

 

     if (!EFI_ERROR (Status)) {

       goto Done;

@@ -254,3 +255,216 @@ Done:
   return Status;

 }

 

+EFI_HANDLE

+EFIAPI

+ImageHandleToFvHandle (

+  EFI_HANDLE ImageHandle

+  )

+{

+  EFI_STATUS                    Status;

+  EFI_LOADED_IMAGE_PROTOCOL     *LoadedImage;

+  

+  ASSERT (ImageHandle != NULL);

+

+  Status = gBS->HandleProtocol (

+             (EFI_HANDLE *) ImageHandle,

+             &gEfiLoadedImageProtocolGuid,

+             (VOID **) &LoadedImage

+             );

+

+  ASSERT_EFI_ERROR (Status);

+

+  return LoadedImage->DeviceHandle;

+

+}

+

+EFI_STATUS

+EFIAPI

+GetSectionFromAnyFv (

+  IN CONST  EFI_GUID           *NameGuid,

+  IN        EFI_SECTION_TYPE   SectionType,

+  IN        UINTN              Instance,

+  OUT       VOID               **Buffer,

+  OUT       UINTN              *Size

+  )

+{

+  EFI_STATUS                    Status;

+  EFI_HANDLE                    *HandleBuffer;

+  UINTN                         HandleCount;

+  UINTN                         Index;

+  EFI_HANDLE                    FvHandle;

+  EFI_TPL                       OldTpl;

+

+  //

+  // Search the FV that contain the caller's FFS first.

+  // FV builder can choose to build FFS into the this FV

+  // so that this implementation of GetSectionFromAnyFv

+  // will locate the FFS faster.

+  //

+  FvHandle = ImageHandleToFvHandle (gImageHandle);

+  Status = GetSectionFromFv (

+             FvHandle,

+             NameGuid,

+             SectionType,

+             Instance,

+             Buffer,

+             Size

+             );

+  if (!EFI_ERROR (Status)) {

+    return EFI_SUCCESS;

+  }

+

+  OldTpl = gBS->RaiseTPL (TPL_NOTIFY);

+  

+  HandleBuffer = NULL;

+  Status = gBS->LocateHandleBuffer (

+                  ByProtocol,

+                  &gEfiFirmwareVolume2ProtocolGuid,

+                  NULL,

+                  &HandleCount,

+                  &HandleBuffer

+                  );

+  if (EFI_ERROR (Status)) {

+    goto Done;

+  }

+

+  for (Index = 0; Index < HandleCount; ++Index) {

+    //

+    // Skip the FV that contain the caller's FFS

+    //

+    if (HandleBuffer[Index] == FvHandle) {

+      continue;

+    }

+

+    Status = GetSectionFromFv (

+               HandleBuffer[Index], 

+               NameGuid, 

+               SectionType, 

+               Instance,

+               Buffer, 

+               Size

+               );

+

+    if (!EFI_ERROR (Status)) {

+      goto Done;

+    }

+  }

+

+  if (Index == HandleCount) {

+    Status = EFI_NOT_FOUND;

+  }

+

+Done:

+  

+  gBS->RestoreTPL (OldTpl);

+  

+  if (HandleBuffer != NULL) {  

+    FreePool(HandleBuffer);

+  }

+  return Status;

+  

+}

+

+EFI_STATUS

+EFIAPI

+GetSectionFromFv (

+  IN  EFI_HANDLE                    FvHandle,

+  IN  CONST EFI_GUID                *NameGuid,

+  IN  EFI_SECTION_TYPE              SectionType,

+  IN  UINTN                         Instance,

+  OUT VOID                          **Buffer,

+  OUT UINTN                         *Size

+  )

+{

+  EFI_STATUS                    Status;

+  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;

+  UINT32                        AuthenticationStatus;

+

+  ASSERT (FvHandle != NULL);

+

+  Status = gBS->HandleProtocol (

+                  FvHandle,

+                  &gEfiFirmwareVolume2ProtocolGuid,

+                  (VOID **) &Fv

+                  );

+  if (EFI_ERROR (Status)) {

+    return Status;

+  }

+

+  //

+  // Read desired section content in NameGuid file

+  //

+  *Buffer     = NULL;

+  *Size       = 0;

+  Status      = Fv->ReadSection (

+                      Fv,

+                      NameGuid,

+                      SectionType,

+                      0,

+                      Buffer,

+                      Size,

+                      &AuthenticationStatus

+                      );

+

+  if (EFI_ERROR (Status) && (SectionType == EFI_SECTION_TE)) {

+    //

+    // Try reading PE32 section, if the required section is TE type 

+    //

+    *Buffer = NULL;

+    *Size   = 0;

+    Status  = Fv->ReadSection (

+                    Fv,

+                    NameGuid,

+                    EFI_SECTION_PE32,

+                    0,

+                    Buffer,

+                    Size,

+                    &AuthenticationStatus

+                    );

+  }

+

+  return Status;

+}

+

+

+EFI_STATUS

+EFIAPI

+GetSectionFromCurrentFv (

+  IN  CONST EFI_GUID                *NameGuid,

+  IN  EFI_SECTION_TYPE              SectionType,

+  IN  UINTN                         Instance,

+  OUT VOID                          **Buffer,

+  OUT UINTN                         *Size

+    )

+{

+  return GetSectionFromFv(

+          ImageHandleToFvHandle(gImageHandle),

+          NameGuid,

+          SectionType,

+          Instance,

+          Buffer,

+          Size

+          );

+}

+

+

+

+EFI_STATUS

+EFIAPI

+GetSectionFromCurrentFfs (

+  IN  EFI_SECTION_TYPE              SectionType,

+  IN  UINTN                         Instance,

+  OUT VOID                          **Buffer,

+  OUT UINTN                         *Size

+    )

+{

+  return GetSectionFromFv(

+          ImageHandleToFvHandle(gImageHandle),

+          &gEfiCallerIdGuid,

+          SectionType,

+          Instance,

+          Buffer,

+          Size

+          );

+}

+

diff --git a/MdePkg/Library/PeiPiLib/PeiPiLib.c b/MdePkg/Library/PeiPiLib/PeiPiLib.c
new file mode 100644
index 0000000..49894df
--- /dev/null
+++ b/MdePkg/Library/PeiPiLib/PeiPiLib.c
@@ -0,0 +1,67 @@
+/** @file

+  MDE PI library functions and macros for PEI phase

+

+  Copyright (c) 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        

+  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.             

+

+**/

+

+#include <PiPei.h>

+#include <Ppi/FirmwareVolumeInfo.h>

+#include <Guid/FirmwareFileSystem2.h>

+

+

+#include <Library/DebugLib.h>

+#include <Library/MemoryAllocationLib.h>

+#include <Library/PeiServicesLib.h>

+#include <Library/PeiPiLib.h>

+

+

+STATIC CONST EFI_PEI_FIRMWARE_VOLUME_INFO_PPI mFvInfoPpiTemplate = {

+  EFI_FIRMWARE_FILE_SYSTEM2_GUID,

+  NULL,

+  0,    //FvInfoSize

+  NULL, //ParentFvName

+  NULL //ParentFileName;

+};

+

+VOID

+EFIAPI

+PeiPiLibBuildPiFvInfoPpi (

+  IN EFI_PHYSICAL_ADDRESS    FvStart,

+  IN UINT64                  FvLength,

+  IN EFI_GUID                *ParentFvName,

+  IN EFI_GUID                *ParentFileName

+  ) {

+  

+  EFI_STATUS                       Status;   

+  EFI_PEI_FIRMWARE_VOLUME_INFO_PPI *FvInfoPpi;

+  EFI_PEI_PPI_DESCRIPTOR           *FvInfoPpiDescriptor;

+

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

+  ASSERT( FvInfoPpi != NULL);

+

+  FvInfoPpi->FvInfo = (VOID *) (UINTN) FvStart;

+  FvInfoPpi->FvInfoSize = (UINT32) FvLength;

+  FvInfoPpi->ParentFvName = ParentFvName;

+  FvInfoPpi->ParentFileName = ParentFileName;

+

+

+  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;

+  Status = PeiServicesInstallPpi (FvInfoPpiDescriptor);

+  ASSERT_EFI_ERROR (Status);

+

+   

+}

+

diff --git a/MdePkg/Library/PeiPiLib/PeiPiLib.inf b/MdePkg/Library/PeiPiLib/PeiPiLib.inf
new file mode 100644
index 0000000..61e9061
--- /dev/null
+++ b/MdePkg/Library/PeiPiLib/PeiPiLib.inf
@@ -0,0 +1,50 @@
+#/** @file

+# Component description file library instance for PiLib for PEI phase.

+#

+# Library to abstract utility functions that is related to PI Specification.

+#

+# Copyright (c) 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

+#  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.

+#

+#

+#**/

+

+[Defines]

+  INF_VERSION                    = 0x00010005

+  BASE_NAME                      = PeiPiLib

+  FILE_GUID                      = 6196FE81-4FA4-469a-B759-2C4DFE935B79

+  MODULE_TYPE                    = PEIM

+  VERSION_STRING                 = 1.0

+  LIBRARY_CLASS                  = PiLib|PEIM

+  EDK_RELEASE_VERSION            = 0x00020000

+  EFI_SPECIFICATION_VERSION      = 0x00020000

+

+

+#

+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#

+

+[Sources.common]

+  PeiPiLib.c

+

+[Packages]

+  MdePkg/MdePkg.dec

+

+

+[LibraryClasses]

+  MemoryAllocationLib

+  DebugLib

+

+[Guids]

+

+[Ppis]

+  gEfiPeiFirmwareVolumeInfoPpiGuid

+

+

+

diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
index c5b12be..29aaaaa 100644
--- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
+++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c
@@ -380,8 +380,57 @@ PeiServicesResetSystem (
   VOID

   )

 {

+  CONST EFI_PEI_SERVICES **PeiServices;

+

+  PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();

+  return (*PeiServices)->ResetSystem (PeiServices);

+}

+

+EFI_STATUS

+EFIAPI

+PeiServicesRegisterForShadow (

+  IN  EFI_PEI_FILE_HANDLE FileHandle

+  )

+{

   EFI_PEI_SERVICES **PeiServices;

 

   PeiServices = GetPeiServicesTablePointer ();

-  return (*PeiServices)->ResetSystem (PeiServices);

+  return (*PeiServices)->RegisterForShadow (FileHandle);

 }

+

+EFI_STATUS

+EFIAPI

+PeiServicesFfsGetFileInfo (

+  IN CONST  EFI_PEI_FILE_HANDLE   FileHandle,

+  OUT EFI_FV_FILE_INFO            *FileInfo

+  )

+{

+  EFI_PEI_SERVICES **PeiServices;

+

+  PeiServices = GetPeiServicesTablePointer ();

+  return (*PeiServices)->FfsGetFileInfo (FileHandle, FileInfo);

+}

+

+

+EFI_STATUS

+EFIAPI

+PeiServicesFfsFindFileByName (

+  IN CONST  EFI_GUID            *FileName,

+  IN CONST  EFI_PEI_FV_HANDLE   VolumeHandle,

+  OUT       EFI_PEI_FILE_HANDLE *FileHandle

+  )

+{

+  return (*GetPeiServicesTablePointer())->FfsFindFileByName (FileName, VolumeHandle, FileHandle);

+}

+

+

+EFI_STATUS

+EFIAPI

+PeiServicesFfsGetVolumeInfo (

+  IN  EFI_PEI_FV_HANDLE       VolumeHandle,

+  OUT EFI_FV_INFO             *VolumeInfo

+  )

+{

+  return (*GetPeiServicesTablePointer())->FfsGetVolumeInfo (VolumeHandle, VolumeInfo);

+}

+

diff --git a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index 49c233c..54a500a 100644
--- a/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
@@ -20,6 +20,15 @@
 

 static EFI_PEI_SERVICES  **gPeiServices;

 

+VOID

+EFIAPI

+SetPeiServicesTablePointer (

+  EFI_PEI_SERVICES  **PeiServices

+  )

+{

+  gPeiServices = PeiServices;

+}

+

 /**

   The function returns the pointer to PEI services.

 

diff --git a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
index d26a0be..4c439eb 100644
--- a/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
+++ b/MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
@@ -22,6 +22,15 @@
 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

 

+VOID

+EFIAPI

+SetPeiServicesTablePointer (

+  IN EFI_PEI_SERVICES     **PeiServices

+  )

+{

+  AsmWriteMm7 ((UINT64)(UINTN)PeiServices);

+}

+

 /**

   The function returns the pointer to PeiServices.

 

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index c7c8d97..4f0e19d 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -82,6 +82,7 @@
   MdePkg/Library/PeiMemoryLib/PeiMemoryLib.inf

   MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

   MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

+  MdePkg/Library/PeiPiLib/PeiPiLib.inf

   MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf

   MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

   MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf