/** @file\r
Pei Core Firmware File System service routines.\r
\r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
FirmwareVolmeInfoPpiNotifyCallback \r
};\r
\r
-EFI_PEI_FIRMWARE_VOLUME_PPI mPeiFfs2FvPpi = {\r
- PeiFfs2FvPpiProcessVolume,\r
- PeiFfs2FvPpiFindFileByType,\r
- PeiFfs2FvPpiFindFileByName,\r
- PeiFfs2FvPpiGetFileInfo,\r
- PeiFfs2FvPpiGetVolumeInfo,\r
- PeiFfs2FvPpiFindSectionByType\r
+PEI_FW_VOL_INSTANCE mPeiFfs2FwVol = {\r
+ PEI_FW_VOL_SIGNATURE,\r
+ FALSE,\r
+ {\r
+ PeiFfsFvPpiProcessVolume,\r
+ PeiFfsFvPpiFindFileByType,\r
+ PeiFfsFvPpiFindFileByName,\r
+ PeiFfsFvPpiGetFileInfo,\r
+ PeiFfsFvPpiGetVolumeInfo,\r
+ PeiFfsFvPpiFindSectionByType\r
+ }\r
+};\r
+\r
+PEI_FW_VOL_INSTANCE mPeiFfs3FwVol = {\r
+ PEI_FW_VOL_SIGNATURE,\r
+ TRUE,\r
+ {\r
+ PeiFfsFvPpiProcessVolume,\r
+ PeiFfsFvPpiFindFileByType,\r
+ PeiFfsFvPpiFindFileByName,\r
+ PeiFfsFvPpiGetFileInfo,\r
+ PeiFfsFvPpiGetVolumeInfo,\r
+ PeiFfsFvPpiFindSectionByType\r
+ }\r
};\r
\r
EFI_PEI_PPI_DESCRIPTOR mPeiFfs2FvPpiList = {\r
(EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
&gEfiFirmwareFileSystem2Guid,\r
- &mPeiFfs2FvPpi\r
+ &mPeiFfs2FwVol.Fv\r
+};\r
+\r
+EFI_PEI_PPI_DESCRIPTOR mPeiFfs3FvPpiList = {\r
+ (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
+ &gEfiFirmwareFileSystem3Guid,\r
+ &mPeiFfs3FwVol.Fv\r
};\r
\r
/**\r
IN EFI_FFS_FILE_HEADER *FileHeader\r
)\r
{\r
- EFI_FFS_FILE_HEADER TestFileHeader;\r
- \r
- CopyMem (&TestFileHeader, FileHeader, sizeof (EFI_FFS_FILE_HEADER));\r
- //\r
- // Ingore State and File field in FFS header.\r
- //\r
- TestFileHeader.State = 0;\r
- TestFileHeader.IntegrityCheck.Checksum.File = 0;\r
+ EFI_FFS_FILE_HEADER2 TestFileHeader;\r
\r
- return CalculateSum8 ((CONST UINT8 *) &TestFileHeader, sizeof (EFI_FFS_FILE_HEADER));\r
+ if (IS_FFS_FILE2 (FileHeader)) {\r
+ CopyMem (&TestFileHeader, FileHeader, sizeof (EFI_FFS_FILE_HEADER2));\r
+ //\r
+ // Ingore State and File field in FFS header.\r
+ //\r
+ TestFileHeader.State = 0;\r
+ TestFileHeader.IntegrityCheck.Checksum.File = 0;\r
+\r
+ return CalculateSum8 ((CONST UINT8 *) &TestFileHeader, sizeof (EFI_FFS_FILE_HEADER2));\r
+ } else {\r
+ CopyMem (&TestFileHeader, FileHeader, sizeof (EFI_FFS_FILE_HEADER));\r
+ //\r
+ // Ingore State and File field in FFS header.\r
+ //\r
+ TestFileHeader.State = 0;\r
+ TestFileHeader.IntegrityCheck.Checksum.File = 0;\r
+\r
+ return CalculateSum8 ((CONST UINT8 *) &TestFileHeader, sizeof (EFI_FFS_FILE_HEADER));\r
+ }\r
}\r
\r
/**\r
UINT8 ErasePolarity;\r
UINT8 FileState;\r
UINT8 DataCheckSum;\r
+ BOOLEAN IsFfs3Fv;\r
\r
//\r
// Convert the handle of FV to FV header for memory-mapped firmware volume\r
FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) FvHandle;\r
FileHeader = (EFI_FFS_FILE_HEADER **)FileHandle;\r
\r
+ IsFfs3Fv = CompareGuid (&FwVolHeader->FileSystemGuid, &gEfiFirmwareFileSystem3Guid);\r
+\r
FvLength = FwVolHeader->FvLength;\r
if ((FwVolHeader->Attributes & EFI_FVB2_ERASE_POLARITY) != 0) {\r
ErasePolarity = 1;\r
if ((*FileHeader == NULL) || (FileName != NULL)) {\r
FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FwVolHeader + FwVolHeader->HeaderLength);\r
} else {\r
+ if (IS_FFS_FILE2 (*FileHeader)) {\r
+ if (!IsFfs3Fv) {\r
+ DEBUG ((EFI_D_ERROR, "It is a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &(*FileHeader)->Name));\r
+ }\r
+ FileLength = FFS_FILE2_SIZE (*FileHeader);\r
+ ASSERT (FileLength > 0x00FFFFFF);\r
+ } else {\r
+ FileLength = FFS_FILE_SIZE (*FileHeader);\r
+ }\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 = GET_OCCUPIED_SIZE (FileLength, 8);\r
FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)*FileHeader + FileOccupiedSize);\r
}\r
FileState = GetFileState (ErasePolarity, FfsFileHeader);\r
switch (FileState) {\r
\r
+ case EFI_FILE_HEADER_CONSTRUCTION:\r
case EFI_FILE_HEADER_INVALID:\r
- FileOffset += sizeof(EFI_FFS_FILE_HEADER);\r
- FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + sizeof(EFI_FFS_FILE_HEADER));\r
+ if (IS_FFS_FILE2 (FfsFileHeader)) {\r
+ if (!IsFfs3Fv) {\r
+ DEBUG ((EFI_D_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
+ }\r
+ FileOffset += sizeof (EFI_FFS_FILE_HEADER2);\r
+ FfsFileHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER2));\r
+ } else {\r
+ FileOffset += sizeof (EFI_FFS_FILE_HEADER);\r
+ FfsFileHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER));\r
+ }\r
break;\r
\r
case EFI_FILE_DATA_VALID:\r
return EFI_NOT_FOUND;\r
}\r
\r
- FileLength = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
- FileOccupiedSize = GET_OCCUPIED_SIZE(FileLength, 8);\r
+ if (IS_FFS_FILE2 (FfsFileHeader)) {\r
+ FileLength = FFS_FILE2_SIZE (FfsFileHeader);\r
+ ASSERT (FileLength > 0x00FFFFFF);\r
+ FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
+ if (!IsFfs3Fv) {\r
+ DEBUG ((EFI_D_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
+ FileOffset += FileOccupiedSize;\r
+ FfsFileHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsFileHeader + FileOccupiedSize);\r
+ break;\r
+ }\r
+ } else {\r
+ FileLength = FFS_FILE_SIZE (FfsFileHeader);\r
+ FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
+ }\r
\r
DataCheckSum = FFS_FIXED_CHECKSUM;\r
if ((FfsFileHeader->Attributes & FFS_ATTRIB_CHECKSUM) == FFS_ATTRIB_CHECKSUM) {\r
- DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *)FfsFileHeader + sizeof(EFI_FFS_FILE_HEADER), FileLength - sizeof(EFI_FFS_FILE_HEADER));\r
+ if (IS_FFS_FILE2 (FfsFileHeader)) {\r
+ DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER2), FileLength - sizeof(EFI_FFS_FILE_HEADER2));\r
+ } else {\r
+ DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER), FileLength - sizeof(EFI_FFS_FILE_HEADER));\r
+ }\r
}\r
if (FfsFileHeader->IntegrityCheck.Checksum.File != DataCheckSum) {\r
ASSERT (FALSE);\r
break;\r
\r
case EFI_FILE_DELETED:\r
- FileLength = *(UINT32 *)(FfsFileHeader->Size) & 0x00FFFFFF;\r
+ if (IS_FFS_FILE2 (FfsFileHeader)) {\r
+ if (!IsFfs3Fv) {\r
+ DEBUG ((EFI_D_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
+ }\r
+ FileLength = FFS_FILE2_SIZE (FfsFileHeader);\r
+ ASSERT (FileLength > 0x00FFFFFF);\r
+ } else {\r
+ FileLength = FFS_FILE_SIZE (FfsFileHeader);\r
+ }\r
FileOccupiedSize = GET_OCCUPIED_SIZE(FileLength, 8);\r
FileOffset += FileOccupiedSize;\r
FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)FfsFileHeader + FileOccupiedSize);\r
// Install FV_PPI for FFS2 file system.\r
//\r
PeiServicesInstallPpi (&mPeiFfs2FvPpiList);\r
- \r
+\r
+ //\r
+ // Install FV_PPI for FFS3 file system.\r
+ //\r
+ PeiServicesInstallPpi (&mPeiFfs3FvPpiList);\r
+\r
BfvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)SecCoreData->BootFirmwareVolumeBase;\r
\r
//\r
@param SectionSize The file size to search.\r
@param OutputBuffer A pointer to the discovered section, if successful.\r
NULL if section not found\r
+ @param IsFfs3Fv Indicates the FV format.\r
\r
@return EFI_NOT_FOUND The match section is not found.\r
@return EFI_SUCCESS The match section is found.\r
IN EFI_SECTION_TYPE SectionType,\r
IN EFI_COMMON_SECTION_HEADER *Section,\r
IN UINTN SectionSize,\r
- OUT VOID **OutputBuffer\r
+ OUT VOID **OutputBuffer,\r
+ IN BOOLEAN IsFfs3Fv\r
)\r
{\r
EFI_STATUS Status;\r
PpiOutput = NULL;\r
PpiOutputSize = 0;\r
while (ParsedLength < SectionSize) {\r
+\r
+ if (IS_SECTION2 (Section)) {\r
+ ASSERT (SECTION2_SIZE (Section) > 0x00FFFFFF);\r
+ if (!IsFfs3Fv) {\r
+ DEBUG ((EFI_D_ERROR, "Found a FFS3 formatted section in a non-FFS3 formatted FV.\n"));\r
+ SectionLength = SECTION2_SIZE (Section);\r
+ //\r
+ // SectionLength is adjusted it is 4 byte aligned.\r
+ // Go to the next section\r
+ //\r
+ SectionLength = GET_OCCUPIED_SIZE (SectionLength, 4);\r
+ ASSERT (SectionLength != 0);\r
+ ParsedLength += SectionLength;\r
+ Section = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) Section + SectionLength);\r
+ continue;\r
+ }\r
+ }\r
+\r
if (Section->Type == SectionType) {\r
- *OutputBuffer = (VOID *)(Section + 1);\r
+ if (IS_SECTION2 (Section)) {\r
+ *OutputBuffer = (VOID *)((UINT8 *) Section + sizeof (EFI_COMMON_SECTION_HEADER2));\r
+ } else {\r
+ *OutputBuffer = (VOID *)((UINT8 *) Section + sizeof (EFI_COMMON_SECTION_HEADER));\r
+ }\r
return EFI_SUCCESS;\r
} else if ((Section->Type == EFI_SECTION_GUID_DEFINED) || (Section->Type == EFI_SECTION_COMPRESSION)) {\r
//\r
SectionType, \r
PpiOutput, \r
PpiOutputSize, \r
- OutputBuffer \r
+ OutputBuffer,\r
+ IsFfs3Fv\r
);\r
}\r
}\r
\r
Status = EFI_NOT_FOUND;\r
if (Section->Type == EFI_SECTION_GUID_DEFINED) {\r
- Status = PeiServicesLocatePpi (\r
- &((EFI_GUID_DEFINED_SECTION *)Section)->SectionDefinitionGuid, \r
- 0, \r
- NULL, \r
- (VOID **) &GuidSectionPpi\r
- );\r
+ if (IS_SECTION2 (Section)) {\r
+ Status = PeiServicesLocatePpi (\r
+ &((EFI_GUID_DEFINED_SECTION2 *)Section)->SectionDefinitionGuid, \r
+ 0, \r
+ NULL, \r
+ (VOID **) &GuidSectionPpi\r
+ );\r
+ } else {\r
+ Status = PeiServicesLocatePpi (\r
+ &((EFI_GUID_DEFINED_SECTION *)Section)->SectionDefinitionGuid, \r
+ 0, \r
+ NULL, \r
+ (VOID **) &GuidSectionPpi\r
+ );\r
+ }\r
if (!EFI_ERROR (Status)) {\r
Status = GuidSectionPpi->ExtractSection (\r
GuidSectionPpi,\r
SectionType, \r
PpiOutput, \r
PpiOutputSize, \r
- OutputBuffer \r
+ OutputBuffer,\r
+ IsFfs3Fv\r
);\r
}\r
}\r
\r
+ if (IS_SECTION2 (Section)) {\r
+ SectionLength = SECTION2_SIZE (Section);\r
+ } else {\r
+ SectionLength = SECTION_SIZE (Section);\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 = GET_OCCUPIED_SIZE (SectionLength, 4);\r
ASSERT (SectionLength != 0);\r
ParsedLength += SectionLength;\r
\r
//\r
// To make backward compatiblity, if can not find corresponding the handle of FV\r
- // then treat FV as build-in FFS2 format and memory mapped FV that FV handle is pointed\r
+ // then treat FV as build-in FFS2/FFS3 format and memory mapped FV that FV handle is pointed\r
// to the address of first byte of FV.\r
//\r
if ((CoreFvHandle == NULL) && FeaturePcdGet (PcdFrameworkCompatibilitySupport)) {\r
**/\r
EFI_STATUS\r
EFIAPI\r
-PeiFfs2FvPpiProcessVolume (\r
+PeiFfsFvPpiProcessVolume (\r
IN CONST EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
IN VOID *Buffer,\r
IN UINTN BufferSize,\r
}\r
\r
//\r
- // The build-in EFI_PEI_FIRMWARE_VOLUME_PPI for FFS2 support memory-mapped\r
+ // The build-in EFI_PEI_FIRMWARE_VOLUME_PPI for FFS2/FFS3 support memory-mapped\r
// FV image and the handle is pointed to Fv image's buffer.\r
//\r
*FvHandle = (EFI_PEI_FV_HANDLE) Buffer;\r
**/\r
EFI_STATUS\r
EFIAPI\r
-PeiFfs2FvPpiFindFileByType (\r
+PeiFfsFvPpiFindFileByType (\r
IN CONST EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
IN EFI_FV_FILETYPE SearchType,\r
IN EFI_PEI_FV_HANDLE FvHandle,\r
**/\r
EFI_STATUS\r
EFIAPI\r
-PeiFfs2FvPpiFindFileByName (\r
+PeiFfsFvPpiFindFileByName (\r
IN CONST EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
IN CONST EFI_GUID *FileName,\r
IN EFI_PEI_FV_HANDLE *FvHandle,\r
**/ \r
EFI_STATUS\r
EFIAPI\r
-PeiFfs2FvPpiGetFileInfo (\r
+PeiFfsFvPpiGetFileInfo (\r
IN CONST EFI_PEI_FIRMWARE_VOLUME_PPI *This, \r
IN EFI_PEI_FILE_HANDLE FileHandle, \r
OUT EFI_FV_FILE_INFO *FileInfo\r
UINT8 ErasePolarity;\r
EFI_FFS_FILE_HEADER *FileHeader;\r
PEI_CORE_FV_HANDLE *CoreFvHandle;\r
- \r
+ PEI_FW_VOL_INSTANCE *FwVolInstance;\r
+\r
if ((FileHandle == NULL) || (FileInfo == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
+ FwVolInstance = PEI_FW_VOL_INSTANCE_FROM_FV_THIS (This);\r
+\r
if ((CoreFvHandle->FvHeader->Attributes & EFI_FVB2_ERASE_POLARITY) != 0) {\r
ErasePolarity = 1;\r
} else {\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
+ if (IS_FFS_FILE2 (FileHeader)) {\r
+ ASSERT (FFS_FILE2_SIZE (FileHeader) > 0x00FFFFFF);\r
+ if (!FwVolInstance->IsFfs3Fv) {\r
+ DEBUG ((EFI_D_ERROR, "It is a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FileHeader->Name));\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ FileInfo->BufferSize = FFS_FILE2_SIZE (FileHeader) - sizeof (EFI_FFS_FILE_HEADER2);\r
+ FileInfo->Buffer = (UINT8 *) FileHeader + sizeof (EFI_FFS_FILE_HEADER2);\r
+ } else {\r
+ FileInfo->BufferSize = FFS_FILE_SIZE (FileHeader) - sizeof (EFI_FFS_FILE_HEADER);\r
+ FileInfo->Buffer = (UINT8 *) FileHeader + sizeof (EFI_FFS_FILE_HEADER);\r
+ }\r
return EFI_SUCCESS; \r
} \r
\r
**/ \r
EFI_STATUS\r
EFIAPI\r
-PeiFfs2FvPpiGetVolumeInfo (\r
+PeiFfsFvPpiGetVolumeInfo (\r
IN CONST EFI_PEI_FIRMWARE_VOLUME_PPI *This, \r
IN EFI_PEI_FV_HANDLE FvHandle, \r
OUT EFI_FV_INFO *VolumeInfo\r
type.\r
@param FileHandle Handle of firmware file in which to\r
search.\r
- @param SectionData Updated upon return to point to the\r
+ @param SectionData Updated upon return to point to the\r
section found.\r
\r
@retval EFI_SUCCESS Section was found.\r
**/\r
EFI_STATUS\r
EFIAPI\r
-PeiFfs2FvPpiFindSectionByType (\r
+PeiFfsFvPpiFindSectionByType (\r
IN CONST EFI_PEI_FIRMWARE_VOLUME_PPI *This,\r
IN EFI_SECTION_TYPE SearchType,\r
IN EFI_PEI_FILE_HANDLE FileHandle,\r
EFI_FFS_FILE_HEADER *FfsFileHeader;\r
UINT32 FileSize;\r
EFI_COMMON_SECTION_HEADER *Section;\r
- \r
+ PEI_FW_VOL_INSTANCE *FwVolInstance;\r
+\r
+ FwVolInstance = PEI_FW_VOL_INSTANCE_FROM_FV_THIS (This);\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
+ if (IS_FFS_FILE2 (FfsFileHeader)) {\r
+ ASSERT (FFS_FILE2_SIZE (FfsFileHeader) > 0x00FFFFFF);\r
+ if (!FwVolInstance->IsFfs3Fv) {\r
+ DEBUG ((EFI_D_ERROR, "It is a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
+ return EFI_NOT_FOUND;\r
+ }\r
+ Section = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER2));\r
+ FileSize = FFS_FILE2_SIZE (FfsFileHeader) - sizeof (EFI_FFS_FILE_HEADER2);\r
+ } else {\r
+ Section = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER));\r
+ FileSize = FFS_FILE_SIZE (FfsFileHeader) - sizeof (EFI_FFS_FILE_HEADER);\r
+ }\r
\r
return ProcessSection (\r
GetPeiServicesTablePointer (),\r
SearchType, \r
Section, \r
FileSize, \r
- SectionData\r
+ SectionData,\r
+ FwVolInstance->IsFfs3Fv\r
); \r
} \r
\r
IN PEI_CORE_INSTANCE *PrivateData\r
)\r
{\r
- VOID *OldFfs2FvPpi;\r
+ VOID *OldFfsFvPpi;\r
EFI_PEI_PPI_DESCRIPTOR *OldDescriptor;\r
UINTN Index;\r
EFI_STATUS Status;\r
&gEfiFirmwareFileSystem2Guid,\r
0,\r
&OldDescriptor,\r
- &OldFfs2FvPpi\r
+ &OldFfsFvPpi\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
//\r
Status = PeiServicesReInstallPpi (OldDescriptor, &mPeiFfs2FvPpiList);\r
ASSERT_EFI_ERROR (Status);\r
- \r
+\r
//\r
// Fixup all FvPpi pointers for the implementation in flash to permanent memory.\r
//\r
for (Index = 0; Index < FixedPcdGet32 (PcdPeiCoreMaxFvSupported); Index ++) {\r
- if (PrivateData->Fv[Index].FvPpi == OldFfs2FvPpi) {\r
- PrivateData->Fv[Index].FvPpi = &mPeiFfs2FvPpi;\r
+ if (PrivateData->Fv[Index].FvPpi == OldFfsFvPpi) {\r
+ PrivateData->Fv[Index].FvPpi = &mPeiFfs2FwVol.Fv;\r
}\r
}\r
-} \r
+\r
+ //\r
+ // Locate old build-in Ffs3 EFI_PEI_FIRMWARE_VOLUME_PPI which\r
+ // in flash.\r
+ //\r
+ Status = PeiServicesLocatePpi (\r
+ &gEfiFirmwareFileSystem3Guid,\r
+ 0,\r
+ &OldDescriptor,\r
+ &OldFfsFvPpi\r
+ );\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
+ //\r
+ // Re-install the EFI_PEI_FIRMWARE_VOLUME_PPI for build-in Ffs3\r
+ // which is shadowed from flash to permanent memory within PeiCore image.\r
+ //\r
+ Status = PeiServicesReInstallPpi (OldDescriptor, &mPeiFfs3FvPpiList);\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
+ //\r
+ // Fixup all FvPpi pointers for the implementation in flash to permanent memory.\r
+ //\r
+ for (Index = 0; Index < FixedPcdGet32 (PcdPeiCoreMaxFvSupported); Index ++) {\r
+ if (PrivateData->Fv[Index].FvPpi == OldFfsFvPpi) {\r
+ PrivateData->Fv[Index].FvPpi = &mPeiFfs3FwVol.Fv;\r
+ }\r
+ }\r
+}\r
\r
/**\r
Report the information for a new discoveried FV in unknown third-party format.\r
projects / mirror_edk2.git / commitdiff