]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Core/Pei/FwVol/FwVol.c
1) add gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported and gEfiMdeModulePkgTo...
[mirror_edk2.git] / MdeModulePkg / Core / Pei / FwVol / FwVol.c
index d144fb85ec68df2e76d42b98c9826f9affd39499..181cfa0b5c653b3b5256dc87d9f83ede3eaf1765 100644 (file)
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
 All rights reserved. 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
@@ -21,7 +21,14 @@ Abstract:
 \r
 #include <PeiMain.h>\r
 \r
-#define GETOCCUPIEDSIZE(ActualSize, Alignment) \\r
+STATIC EFI_PEI_NOTIFY_DESCRIPTOR mNotifyOnFvInfoList = {\r
+  (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
+  &gEfiPeiFirmwareVolumeInfoPpiGuid,\r
+  FirmwareVolmeInfoPpiNotifyCallback \r
+};\r
+\r
+\r
+#define GET_OCCUPIED_SIZE(ActualSize, Alignment) \\r
   (ActualSize) + (((Alignment) - ((ActualSize) & ((Alignment) - 1))) & ((Alignment) - 1))\r
 \r
 STATIC\r
@@ -121,12 +128,37 @@ Bugbug: For PEI performance reason, we comments this code at this time.
 }\r
 \r
 STATIC\r
+BOOLEAN\r
+EFIAPI\r
+PeiFileHandleToVolume (\r
+  IN   EFI_PEI_FILE_HANDLE     FileHandle,\r
+  OUT  EFI_PEI_FV_HANDLE       *VolumeHandle\r
+  )\r
+{\r
+  UINTN                       Index;\r
+  PEI_CORE_INSTANCE           *PrivateData;\r
+  EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;\r
+\r
+  PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (GetPeiServicesTablePointer ());\r
+  for (Index = 0; Index < PrivateData->FvCount; Index++) {\r
+    FwVolHeader = PrivateData->Fv[Index].FvHeader;\r
+    if (((UINT64) (UINTN) FileHandle > (UINT64) (UINTN) FwVolHeader ) &&   \\r
+        ((UINT64) (UINTN) FileHandle <= ((UINT64) (UINTN) FwVolHeader + FwVolHeader->FvLength - 1))) {\r
+      *VolumeHandle = (EFI_PEI_FV_HANDLE)FwVolHeader;\r
+      return TRUE;\r
+    }\r
+  }\r
+  return FALSE;\r
+}\r
+\r
+\r
 EFI_STATUS\r
-PeiFfsFindNextFileEx (\r
-  IN     EFI_FV_FILETYPE             SearchType,\r
-  IN     EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader,\r
-  IN OUT EFI_FFS_FILE_HEADER         **FileHeader,\r
-  IN     BOOLEAN                     Flag\r
+PeiFindFileEx (\r
+  IN  CONST EFI_PEI_FV_HANDLE        FvHandle,\r
+  IN  CONST EFI_GUID                 *FileName,   OPTIONAL\r
+  IN        EFI_FV_FILETYPE          SearchType,\r
+  IN OUT    EFI_PEI_FILE_HANDLE      *FileHandle,\r
+  IN OUT    EFI_PEI_FV_HANDLE        *AprioriFile  OPTIONAL\r
   )\r
 /*++\r
 \r
@@ -144,53 +176,63 @@ Arguments:
     FileHeader  - Pointer to the current file from which to begin searching.\r
       This pointer will be updated upon return to reflect the file found.\r
     Flag        - Indicator for if this is for PEI Dispath search \r
+    \r
 Returns:\r
     EFI_NOT_FOUND - No files matching the search criteria were found\r
     EFI_SUCCESS\r
 \r
 --*/\r
 {\r
-  EFI_FFS_FILE_HEADER  *FfsFileHeader;\r
-  UINT32               FileLength;\r
-  UINT32               FileOccupiedSize;\r
-  UINT32               FileOffset;\r
-  UINT64               FvLength;\r
-  UINT8                ErasePolarity;\r
-  UINT8                FileState;\r
-  \r
+  EFI_FIRMWARE_VOLUME_HEADER           *FwVolHeader;\r
+  EFI_FFS_FILE_HEADER                   **FileHeader;\r
+  EFI_FFS_FILE_HEADER                   *FfsFileHeader;\r
+  EFI_FIRMWARE_VOLUME_EXT_HEADER        *FwVolExHeaderInfo;\r
+  UINT32                                FileLength;\r
+  UINT32                                FileOccupiedSize;\r
+  UINT32                                FileOffset;\r
+  UINT64                                FvLength;\r
+  UINT8                                 ErasePolarity;\r
+  UINT8                                 FileState;\r
+\r
+  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)FvHandle;\r
+  FileHeader  = (EFI_FFS_FILE_HEADER **)FileHandle;\r
 \r
   FvLength = FwVolHeader->FvLength;\r
-  if (FwVolHeader->Attributes & EFI_FVB2_ERASE_POLARITY) {\r
+  if (FwVolHeader->Attributes & EFI_FVB_ERASE_POLARITY) {\r
     ErasePolarity = 1;\r
   } else {\r
     ErasePolarity = 0;\r
   }\r
   \r
   //\r
-  // If FileHeader is not specified (NULL) start with the first file in the\r
-  // firmware volume.  Otherwise, start from the FileHeader.\r
+  // If FileHeader is not specified (NULL) or FileName is not NULL,\r
+  // start with the first file in the firmware volume.  Otherwise,\r
+  // start from the FileHeader.\r
   //\r
-  if (*FileHeader == NULL)  {\r
+  if ((*FileHeader == NULL) || (FileName != NULL)) {\r
     FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FwVolHeader + FwVolHeader->HeaderLength);\r
+    if (FwVolHeader->ExtHeaderOffset != 0) {\r
+      FwVolExHeaderInfo = (EFI_FIRMWARE_VOLUME_EXT_HEADER *)(((UINT8 *)FwVolHeader) + FwVolHeader->ExtHeaderOffset);\r
+      FfsFileHeader = (EFI_FFS_FILE_HEADER *)(((UINT8 *)FwVolExHeaderInfo) + FwVolExHeaderInfo->ExtHeaderSize);\r
+    }\r
   } else {\r
     //\r
     // Length is 24 bits wide so mask upper 8 bits\r
     // FileLength is adjusted to FileOccupiedSize as it is 8 byte aligned.\r
     //\r
     FileLength = *(UINT32 *)(*FileHeader)->Size & 0x00FFFFFF;\r
-    FileOccupiedSize = GETOCCUPIEDSIZE(FileLength, 8);\r
+    FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
     FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)*FileHeader + FileOccupiedSize);\r
   }\r
 \r
   FileOffset = (UINT32) ((UINT8 *)FfsFileHeader - (UINT8 *)FwVolHeader);\r
   ASSERT (FileOffset <= 0xFFFFFFFF);\r
   \r
-  while (FileOffset < (FvLength - sizeof(EFI_FFS_FILE_HEADER))) {\r
+  while (FileOffset < (FvLength - sizeof (EFI_FFS_FILE_HEADER))) {\r
     //\r
     // Get FileState which is the highest bit of the State \r
     //\r
     FileState = GetFileState (ErasePolarity, FfsFileHeader);\r
-\r
     switch (FileState) {\r
 \r
     case EFI_FILE_HEADER_INVALID:\r
@@ -200,40 +242,44 @@ Returns:
         \r
     case EFI_FILE_DATA_VALID:\r
     case EFI_FILE_MARKED_FOR_UPDATE:\r
-       if (CalculateHeaderChecksum (FfsFileHeader) == 0) {\r
-        FileLength = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
-        FileOccupiedSize = GETOCCUPIEDSIZE(FileLength, 8);\r
-        if (Flag) {\r
-          if ((FfsFileHeader->Type == EFI_FV_FILETYPE_PEIM) || \r
-              (FfsFileHeader->Type == EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER)) { \r
-            \r
-            *FileHeader = FfsFileHeader;\r
-        \r
-        \r
-            return EFI_SUCCESS;\r
-          }\r
-        } else {        \r
-          if ((SearchType == FfsFileHeader->Type) || \r
-              (SearchType == EFI_FV_FILETYPE_ALL)) { \r
-          \r
-            *FileHeader = FfsFileHeader;\r
-        \r
-        \r
-            return EFI_SUCCESS;\r
-          }\r
-        }\r
-\r
-        FileOffset += FileOccupiedSize; \r
-        FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
-      } else {\r
+      if (CalculateHeaderChecksum (FfsFileHeader) != 0) {\r
         ASSERT (FALSE);\r
         return EFI_NOT_FOUND;\r
       }\r
+\r
+      FileLength = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
+      FileOccupiedSize = GET_OCCUPIED_SIZE(FileLength, 8);\r
+\r
+      if (FileName != NULL) {\r
+        if (CompareGuid (&FfsFileHeader->Name, (EFI_GUID*)FileName)) {\r
+          *FileHeader = FfsFileHeader;\r
+          return EFI_SUCCESS;\r
+        }\r
+      } else if (SearchType == PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE) {\r
+        if ((FfsFileHeader->Type == EFI_FV_FILETYPE_PEIM) || \r
+            (FfsFileHeader->Type == EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER)) { \r
+          \r
+          *FileHeader = FfsFileHeader;\r
+          return EFI_SUCCESS;\r
+        } else if (AprioriFile != NULL) {\r
+          if (FfsFileHeader->Type == EFI_FV_FILETYPE_FREEFORM) {\r
+            if (CompareGuid (&FfsFileHeader->Name, &gPeiAprioriFileNameGuid)) {\r
+              *AprioriFile = FfsFileHeader;\r
+            }           \r
+          } \r
+        }\r
+      } else if ((SearchType == FfsFileHeader->Type) || (SearchType == EFI_FV_FILETYPE_ALL)) { \r
+        *FileHeader = FfsFileHeader;\r
+        return EFI_SUCCESS;\r
+      }\r
+\r
+      FileOffset += FileOccupiedSize; \r
+      FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
       break;\r
     \r
     case EFI_FILE_DELETED:\r
       FileLength = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
-      FileOccupiedSize = GETOCCUPIEDSIZE(FileLength, 8);\r
+      FileOccupiedSize = GET_OCCUPIED_SIZE(FileLength, 8);\r
       FileOffset += FileOccupiedSize;\r
       FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
       break;\r
@@ -247,72 +293,260 @@ Returns:
   return EFI_NOT_FOUND;  \r
 }\r
 \r
+VOID \r
+PeiInitializeFv (\r
+  IN  PEI_CORE_INSTANCE           *PrivateData,\r
+  IN CONST EFI_SEC_PEI_HAND_OFF   *SecCoreData\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Initialize PeiCore Fv List.\r
+\r
+Arguments:\r
+  PrivateData     - Pointer to PEI_CORE_INSTANCE.\r
+  SecCoreData     - Pointer to EFI_SEC_PEI_HAND_OFF.\r
+\r
+Returns:\r
+  NONE  \r
+  \r
+--*/  \r
+{\r
+  EFI_STATUS  Status;\r
+  //\r
+  // The BFV must be the first entry. The Core FV support is stateless \r
+  // The AllFV list has a single entry per FV in PEI. \r
+  // The Fv list only includes FV that PEIMs will be dispatched from and\r
+  // its File System Format is PI 1.0 definition.\r
+  //\r
+  PrivateData->FvCount = 1;\r
+  PrivateData->Fv[0].FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)SecCoreData->BootFirmwareVolumeBase;\r
+\r
+  PrivateData->AllFvCount = 1;\r
+  PrivateData->AllFv[0] = (EFI_PEI_FV_HANDLE)PrivateData->Fv[0].FvHeader;\r
+\r
+\r
+  //\r
+  // Post a call-back for the FvInfoPPI services to expose\r
+  // additional Fvs to PeiCore.\r
+  //\r
+  Status = PeiServicesNotifyPpi (&mNotifyOnFvInfoList);\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+}\r
 \r
 EFI_STATUS\r
 EFIAPI\r
-PeiFfsFindSectionData (\r
-  IN     EFI_PEI_SERVICES      **PeiServices,\r
-  IN     EFI_SECTION_TYPE      SectionType,\r
-  IN     EFI_FFS_FILE_HEADER   *FfsFileHeader,\r
-  IN OUT VOID                  **SectionData\r
+FirmwareVolmeInfoPpiNotifyCallback (\r
+  IN EFI_PEI_SERVICES              **PeiServices,\r
+  IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,\r
+  IN VOID                          *Ppi\r
   )\r
 /*++\r
 \r
 Routine Description:\r
-    Given the input file pointer, search for the next matching section in the\r
-    FFS volume.\r
+\r
+  Process Firmware Volum Information once FvInfoPPI install.\r
 \r
 Arguments:\r
-    PeiServices - Pointer to the PEI Core Services Table.\r
-    SearchType - Filter to find only sections of this type.\r
-    FfsFileHeader  - Pointer to the current file to search.\r
-    SectionData - Pointer to the Section matching SectionType in FfsFileHeader.\r
-                - NULL if section not found\r
 \r
+  PeiServices - General purpose services available to every PEIM.\r
+    \r
 Returns:\r
-    EFI_NOT_FOUND - No files matching the search criteria were found\r
-    EFI_SUCCESS\r
+\r
+  Status -  EFI_SUCCESS if the interface could be successfully\r
+            installed\r
 \r
 --*/\r
 {\r
-  UINT32                        FileSize;\r
-  EFI_COMMON_SECTION_HEADER     *Section;\r
-  UINT32                        SectionLength;\r
-  UINT32                        ParsedLength;\r
+  UINT8                                 FvCount;\r
+  EFI_PEI_FIRMWARE_VOLUME_INFO_PPI      *Fv;\r
+  PEI_CORE_INSTANCE                     *PrivateData;\r
   \r
+  PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r
+\r
+  if (PrivateData->FvCount >= FixedPcdGet32 (PcdPeiCoreMaxFvSupported)) {\r
+    ASSERT (FALSE);\r
+  }\r
+\r
+  Fv = (EFI_PEI_FIRMWARE_VOLUME_INFO_PPI *)Ppi;\r
+\r
+   if (CompareGuid (&Fv->FvFormat, &gEfiFirmwareFileSystem2Guid)) {\r
+     for (FvCount = 0; FvCount < PrivateData->FvCount; FvCount ++) {\r
+       if ((UINTN)PrivateData->Fv[FvCount].FvHeader == (UINTN)Fv->FvInfo) {\r
+         return EFI_SUCCESS;\r
+       }\r
+     }\r
+    PrivateData->Fv[PrivateData->FvCount++].FvHeader = (EFI_FIRMWARE_VOLUME_HEADER*)Fv->FvInfo;\r
+  }\r
 \r
   //\r
-  // Size is 24 bits wide so mask upper 8 bits. \r
-  //    Does not include FfsFileHeader header size\r
-  // FileSize is adjusted to FileOccupiedSize as it is 8 byte aligned.\r
+  // Allways add to the All list\r
   //\r
-  Section = (EFI_COMMON_SECTION_HEADER *)(FfsFileHeader + 1);\r
-  FileSize = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
-  FileSize -= sizeof(EFI_FFS_FILE_HEADER);\r
+  PrivateData->AllFv[PrivateData->AllFvCount++] = (EFI_PEI_FV_HANDLE)Fv->FvInfo;\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+EFI_STATUS\r
+PeiFfsProcessSection (\r
+  IN CONST EFI_PEI_SERVICES     **PeiServices,\r
+  IN EFI_SECTION_TYPE           SectionType,\r
+  IN EFI_COMMON_SECTION_HEADER  *Section,\r
+  IN UINTN                      SectionSize,\r
+  OUT VOID                      **OutputBuffer,\r
+  OUT UINTN                     *OutputSize,\r
+  OUT UINT32                    *Authentication\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Go through the file to search SectionType section,\r
+  when meeting an encapsuled section, search recursively. \r
   \r
-  *SectionData = NULL;\r
+Arguments:\r
+  PeiServices  - Pointer to the PEI Core Services Table.\r
+  SearchType   - Filter to find only section of this type.\r
+  Section      - From where to search.\r
+  SectionSize  - The file size to search.\r
+  OutputBuffer - Pointer to the section to search.\r
+  OutputSize   - The size of the section to search.\r
+  Authentication -  Authenticate the section.\r
+\r
+Returns:\r
+  EFI_STATUS\r
+  \r
+--*/\r
+{\r
+  EFI_STATUS                              Status;\r
+  UINT32                                  SectionLength;\r
+  UINT32                                  ParsedLength;\r
+  EFI_GUID_DEFINED_SECTION                *GuidSection; \r
+  EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI   *GuidSectionPpi;\r
+  EFI_COMPRESSION_SECTION                 *CompressionSection;\r
+  EFI_PEI_DECOMPRESS_PPI                  *DecompressPpi;\r
+  VOID                                    *PpiOutput;\r
+  UINTN                                   PpiOutputSize;\r
+\r
+  *OutputBuffer = NULL;\r
   ParsedLength = 0;\r
-  while (ParsedLength < FileSize) {\r
+  while (ParsedLength < SectionSize) {\r
     if (Section->Type == SectionType) {\r
-      *SectionData = (VOID *)(Section + 1);\r
-\r
-\r
+      *OutputBuffer = (VOID *)(Section + 1);\r
       return EFI_SUCCESS;\r
+    } else if (Section->Type == EFI_SECTION_GUID_DEFINED) {\r
+      GuidSection = (EFI_GUID_DEFINED_SECTION *)Section;\r
+      Status = PeiServicesLocatePpi (&GuidSection->SectionDefinitionGuid, 0, NULL, (VOID **) &GuidSectionPpi);\r
+      if (!EFI_ERROR (Status)) {\r
+        Status = GuidSectionPpi->ExtractSection (\r
+                                  GuidSectionPpi,\r
+                                  Section,\r
+                                  &PpiOutput,\r
+                                  &PpiOutputSize,\r
+                                  Authentication\r
+                                  );\r
+        if (!EFI_ERROR (Status)) {\r
+          return PeiFfsProcessSection (\r
+                  PeiServices,\r
+                  SectionType, \r
+                  PpiOutput, \r
+                  PpiOutputSize, \r
+                  OutputBuffer, \r
+                  OutputSize, \r
+                  Authentication\r
+                  );\r
+        }\r
+      }\r
+    } else if (Section->Type == EFI_SECTION_COMPRESSION) {\r
+      CompressionSection = (EFI_COMPRESSION_SECTION *)Section;\r
+      Status = PeiServicesLocatePpi (&gEfiPeiDecompressPpiGuid, 0, NULL, (VOID **) &DecompressPpi);\r
+      if (!EFI_ERROR (Status)) {\r
+        Status = DecompressPpi->Decompress (\r
+                                  DecompressPpi,\r
+                                  CompressionSection,\r
+                                  &PpiOutput,\r
+                                  &PpiOutputSize\r
+                                  );\r
+        if (!EFI_ERROR (Status)) {\r
+          return PeiFfsProcessSection (\r
+                  PeiServices, SectionType, PpiOutput, PpiOutputSize, OutputBuffer, OutputSize, Authentication\r
+                  );\r
+        }\r
+      }\r
     }\r
+\r
     //\r
     // Size is 24 bits wide so mask upper 8 bits. \r
     // SectionLength is adjusted it is 4 byte aligned.\r
     // Go to the next section\r
     //\r
     SectionLength = *(UINT32 *)Section->Size & 0x00FFFFFF;\r
-    SectionLength = GETOCCUPIEDSIZE (SectionLength, 4);\r
+    SectionLength = GET_OCCUPIED_SIZE (SectionLength, 4);\r
     ASSERT (SectionLength != 0);\r
     ParsedLength += SectionLength;\r
     Section = (EFI_COMMON_SECTION_HEADER *)((UINT8 *)Section + SectionLength);\r
   }\r
   \r
   return EFI_NOT_FOUND;\r
-  \r
+}\r
+\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+PeiFfsFindSectionData (\r
+  IN CONST EFI_PEI_SERVICES      **PeiServices,\r
+  IN     EFI_SECTION_TYPE      SectionType,\r
+  IN     EFI_PEI_FILE_HANDLE   FileHandle,\r
+  IN OUT VOID                  **SectionData\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+    Given the input file pointer, search for the next matching section in the\r
+    FFS volume.\r
+\r
+Arguments:\r
+    PeiServices - Pointer to the PEI Core Services Table.\r
+    SearchType - Filter to find only sections of this type.\r
+    FfsFileHeader  - Pointer to the current file to search.\r
+    SectionData - Pointer to the Section matching SectionType in FfsFileHeader.\r
+                - NULL if section not found\r
+\r
+Returns:\r
+    EFI_NOT_FOUND - No files matching the search criteria were found\r
+    EFI_SUCCESS\r
+\r
+--*/\r
+{\r
+  EFI_FFS_FILE_HEADER                     *FfsFileHeader;\r
+  UINT32                                  FileSize;\r
+  EFI_COMMON_SECTION_HEADER               *Section;\r
+  UINTN                                   OutputSize;\r
+  UINT32                                  AuthenticationStatus;\r
+\r
+\r
+  FfsFileHeader = (EFI_FFS_FILE_HEADER *)(FileHandle);\r
+\r
+  //\r
+  // Size is 24 bits wide so mask upper 8 bits. \r
+  // Does not include FfsFileHeader header size\r
+  // FileSize is adjusted to FileOccupiedSize as it is 8 byte aligned.\r
+  //\r
+  Section = (EFI_COMMON_SECTION_HEADER *)(FfsFileHeader + 1);\r
+  FileSize = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
+  FileSize -= sizeof (EFI_FFS_FILE_HEADER);\r
+\r
+  return PeiFfsProcessSection (\r
+          PeiServices, \r
+          SectionType, \r
+          Section, \r
+          FileSize, \r
+          SectionData, \r
+          &OutputSize, \r
+          &AuthenticationStatus\r
+          );\r
 }\r
 \r
 \r
@@ -344,21 +578,22 @@ Returns:
 \r
 --*/\r
 {\r
-  return PeiFfsFindNextFileEx ( \r
-           0,\r
-           FwVolHeader,\r
-           PeimFileHeader,\r
-           TRUE\r
+  return PeiFindFileEx (\r
+           (EFI_PEI_FV_HANDLE) FwVolHeader, \r
+           NULL, \r
+           EFI_FV_FILETYPE_PEIM, \r
+           (EFI_PEI_FILE_HANDLE *)PeimFileHeader, \r
+           NULL\r
            );\r
 }\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 PeiFfsFindNextFile (\r
-  IN     EFI_PEI_SERVICES            **PeiServices,\r
-  IN     EFI_FV_FILETYPE             SearchType,\r
-  IN     EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader,\r
-  IN OUT EFI_FFS_FILE_HEADER         **FileHeader\r
+  IN CONST EFI_PEI_SERVICES      **PeiServices,\r
+  IN UINT8                       SearchType,\r
+  IN EFI_PEI_FV_HANDLE           VolumeHandle,\r
+  IN OUT EFI_PEI_FILE_HANDLE     *FileHandle\r
   )\r
 /*++\r
 \r
@@ -385,20 +620,16 @@ Returns:
 \r
 --*/\r
 {\r
-  return PeiFfsFindNextFileEx ( \r
-           SearchType,\r
-           FwVolHeader,\r
-           FileHeader,\r
-           FALSE\r
-           );\r
+  return PeiFindFileEx (VolumeHandle, NULL, SearchType, FileHandle, NULL);\r
 }\r
 \r
+\r
 EFI_STATUS \r
 EFIAPI\r
 PeiFvFindNextVolume (\r
-  IN     EFI_PEI_SERVICES           **PeiServices,\r
+  IN CONST EFI_PEI_SERVICES           **PeiServices,\r
   IN     UINTN                      Instance,\r
-  IN OUT EFI_FIRMWARE_VOLUME_HEADER **FwVolHeader\r
+  IN OUT EFI_PEI_FV_HANDLE          *VolumeHandle\r
   )\r
 /*++\r
 \r
@@ -425,50 +656,162 @@ Returns:
 \r
 --*/\r
 {\r
-  PEI_CORE_INSTANCE       *PrivateData;\r
-  EFI_STATUS              Status;\r
-  EFI_PEI_FIND_FV_PPI     *FindFvPpi;\r
-  UINT8                   LocalInstance;\r
+  PEI_CORE_INSTANCE   *Private;\r
+\r
+  Private = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r
+  if (VolumeHandle == NULL) {\r
+   return EFI_INVALID_PARAMETER;\r
+  } \r
+\r
+  if (Instance >= Private->AllFvCount) {\r
+   VolumeHandle = NULL;\r
+   return EFI_NOT_FOUND;\r
+  }\r
+\r
+  *VolumeHandle = Private->AllFv[Instance];\r
+  return EFI_SUCCESS;\r
+}\r
 \r
 \r
-  LocalInstance = (UINT8) Instance;\r
+EFI_STATUS\r
+EFIAPI \r
+PeiFfsFindFileByName (\r
+  IN  CONST EFI_GUID        *FileName,\r
+  IN  EFI_PEI_FV_HANDLE     VolumeHandle,\r
+  OUT EFI_PEI_FILE_HANDLE   *FileHandle\r
+  )\r
+/*++\r
 \r
-  Status = EFI_SUCCESS;\r
-  PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r
+Routine Description:\r
 \r
-  if (FwVolHeader == NULL) {\r
+  Given the input VolumeHandle, search for the next matching name file.\r
 \r
+Arguments:\r
+\r
+  FileName      - File name to search.\r
+  VolumeHandle  - The current FV to search.\r
+  FileHandle    - Pointer to the file matching name in VolumeHandle.\r
+                - NULL if file not found\r
+Returns:\r
+  EFI_STATUS\r
+  \r
+--*/  \r
+{\r
+  EFI_STATUS  Status;\r
+  if ((VolumeHandle == NULL) || (FileName == NULL) || (FileHandle == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+  Status = PeiFindFileEx (VolumeHandle, FileName, 0, FileHandle, NULL);\r
+  if (Status == EFI_NOT_FOUND) {\r
+    *FileHandle = NULL;\r
+  }\r
+  return Status;\r
+}\r
+\r
+EFI_STATUS\r
+EFIAPI \r
+PeiFfsGetFileInfo (\r
+  IN EFI_PEI_FILE_HANDLE  FileHandle,\r
+  OUT EFI_FV_FILE_INFO    *FileInfo\r
+  )\r
+/*++\r
 \r
-  if (Instance == 0) {\r
-    *FwVolHeader = PrivateData->DispatchData.BootFvAddress;\r
+Routine Description:\r
+\r
+  Collect information of given file.\r
+\r
+Arguments:\r
+  FileHandle   - The handle to file.\r
+  FileInfo     - Pointer to the file information.\r
+\r
+Returns:\r
+  EFI_STATUS\r
+  \r
+--*/    \r
+{\r
+  UINT8                       FileState;\r
+  UINT8                       ErasePolarity;\r
+  EFI_FFS_FILE_HEADER         *FileHeader;\r
+  EFI_PEI_FV_HANDLE           VolumeHandle;\r
+\r
+  if ((FileHandle == NULL) || (FileInfo == NULL)) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
 \r
+  //\r
+  // Retrieve the FirmwareVolume which the file resides in.\r
+  //\r
+  if (!PeiFileHandleToVolume(FileHandle, &VolumeHandle)) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
 \r
-    return Status;\r
+  if (((EFI_FIRMWARE_VOLUME_HEADER*)VolumeHandle)->Attributes & EFI_FVB_ERASE_POLARITY) {\r
+    ErasePolarity = 1;\r
   } else {\r
-    //\r
-    // Locate all instances of FindFV\r
-    // Alternately, could use FV HOBs, but the PPI is cleaner\r
-    //\r
-    Status = PeiServicesLocatePpi (\r
-               &gEfiFindFvPpiGuid,\r
-               0,\r
-               NULL,\r
-               (VOID **)&FindFvPpi\r
-               );\r
-\r
-    if (Status != EFI_SUCCESS) {\r
-      Status = EFI_NOT_FOUND;\r
-    } else {\r
-      Status = FindFvPpi->FindFv (\r
-                            FindFvPpi,\r
-                            PeiServices,\r
-                            &LocalInstance,\r
-                            FwVolHeader\r
-                            );  \r
+    ErasePolarity = 0;\r
+  }\r
+\r
+  //\r
+  // Get FileState which is the highest bit of the State \r
+  //\r
+  FileState = GetFileState (ErasePolarity, (EFI_FFS_FILE_HEADER*)FileHandle);\r
 \r
+  switch (FileState) {\r
+    case EFI_FILE_DATA_VALID:\r
+    case EFI_FILE_MARKED_FOR_UPDATE:\r
+      break;  \r
+    default:\r
+      return EFI_INVALID_PARAMETER;\r
     }\r
+\r
+  FileHeader = (EFI_FFS_FILE_HEADER *)FileHandle;\r
+  CopyMem (&FileInfo->FileName, &FileHeader->Name, sizeof(EFI_GUID));\r
+  FileInfo->FileType = FileHeader->Type;\r
+  FileInfo->FileAttributes = FileHeader->Attributes;\r
+  FileInfo->BufferSize = ((*(UINT32 *)FileHeader->Size) & 0x00FFFFFF) -  sizeof (EFI_FFS_FILE_HEADER);\r
+  FileInfo->Buffer = (FileHeader + 1);\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+\r
+EFI_STATUS\r
+EFIAPI \r
+PeiFfsGetVolumeInfo (\r
+  IN EFI_PEI_FV_HANDLE  VolumeHandle,\r
+  OUT EFI_FV_INFO       *VolumeInfo\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+  Collect information of given Fv Volume.\r
+\r
+Arguments:\r
+  VolumeHandle    - The handle to Fv Volume.\r
+  VolumeInfo      - The pointer to volume information.\r
+  \r
+Returns:\r
+  EFI_STATUS\r
+  \r
+--*/    \r
+{\r
+  EFI_FIRMWARE_VOLUME_HEADER             *FwVolHeader;\r
+  EFI_FIRMWARE_VOLUME_EXT_HEADER         *FwVolExHeaderInfo;\r
+\r
+  if (VolumeInfo == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
   }\r
-  return Status;\r
+\r
+  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(VolumeHandle);\r
+  VolumeInfo->FvAttributes = FwVolHeader->Attributes;\r
+  VolumeInfo->FvStart = FwVolHeader;\r
+  VolumeInfo->FvSize = FwVolHeader->FvLength;\r
+  CopyMem (&VolumeInfo->FvFormat, &FwVolHeader->FileSystemGuid,sizeof(EFI_GUID));\r
+\r
+  if (FwVolHeader->ExtHeaderOffset != 0) {\r
+    FwVolExHeaderInfo = (EFI_FIRMWARE_VOLUME_EXT_HEADER*)(((UINT8 *)FwVolHeader) + FwVolHeader->ExtHeaderOffset);\r
+    CopyMem (&VolumeInfo->FvName, &FwVolExHeaderInfo->FvName, sizeof(EFI_GUID));\r
+  }\r
+  return EFI_SUCCESS;\r
 }\r
+\r