Locates a section within a series of sections\r
with the specified section type.\r
\r
+ The Instance parameter indicates which instance of the section\r
+ type to return. (0 is first instance, 1 is second...)\r
+\r
@param[in] Sections The sections to search\r
@param[in] SizeOfSections Total size of all sections\r
@param[in] SectionType The section type to locate\r
+ @param[in] Instance The section instance number\r
@param[out] FoundSection The FFS section if found\r
\r
@retval EFI_SUCCESS The file and section was found\r
\r
**/\r
EFI_STATUS\r
-FindFfsSectionInSections (\r
+FindFfsSectionInstance (\r
IN VOID *Sections,\r
IN UINTN SizeOfSections,\r
IN EFI_SECTION_TYPE SectionType,\r
+ IN UINTN Instance,\r
OUT EFI_COMMON_SECTION_HEADER **FoundSection\r
)\r
{\r
// Look for the requested section type\r
//\r
if (Section->Type == SectionType) {\r
- *FoundSection = Section;\r
- return EFI_SUCCESS;\r
+ if (Instance == 0) {\r
+ *FoundSection = Section;\r
+ return EFI_SUCCESS;\r
+ } else {\r
+ Instance--;\r
+ }\r
}\r
}\r
\r
return EFI_NOT_FOUND;\r
}\r
\r
+/**\r
+ Locates a section within a series of sections\r
+ with the specified section type.\r
+\r
+ @param[in] Sections The sections to search\r
+ @param[in] SizeOfSections Total size of all sections\r
+ @param[in] SectionType The section type to locate\r
+ @param[out] FoundSection The FFS section if found\r
+\r
+ @retval EFI_SUCCESS The file and section was found\r
+ @retval EFI_NOT_FOUND The file and section was not found\r
+ @retval EFI_VOLUME_CORRUPTED The firmware volume was corrupted\r
+\r
+**/\r
+EFI_STATUS\r
+FindFfsSectionInSections (\r
+ IN VOID *Sections,\r
+ IN UINTN SizeOfSections,\r
+ IN EFI_SECTION_TYPE SectionType,\r
+ OUT EFI_COMMON_SECTION_HEADER **FoundSection\r
+ )\r
+{\r
+ return FindFfsSectionInstance (\r
+ Sections,\r
+ SizeOfSections,\r
+ SectionType,\r
+ 0,\r
+ FoundSection\r
+ );\r
+}\r
+\r
/**\r
Locates a FFS file with the specified file type and a section\r
within that file with the specified section type.\r
Locates the compressed main firmware volume and decompresses it.\r
\r
@param[in,out] Fv On input, the firmware volume to search\r
- On output, the decompressed main FV\r
+ On output, the decompressed BOOT/PEI FV\r
\r
@retval EFI_SUCCESS The file and section was found\r
@retval EFI_NOT_FOUND The file and section was not found\r
\r
**/\r
EFI_STATUS\r
-DecompressGuidedFv (\r
+DecompressMemFvs (\r
IN OUT EFI_FIRMWARE_VOLUME_HEADER **Fv\r
)\r
{\r
UINT32 AuthenticationStatus;\r
VOID *OutputBuffer;\r
VOID *ScratchBuffer;\r
- EFI_FIRMWARE_VOLUME_IMAGE_SECTION *NewFvSection;\r
- EFI_FIRMWARE_VOLUME_HEADER *NewFv;\r
+ EFI_FIRMWARE_VOLUME_IMAGE_SECTION *FvSection;\r
+ EFI_FIRMWARE_VOLUME_HEADER *PeiMemFv;\r
+ EFI_FIRMWARE_VOLUME_HEADER *DxeMemFv;\r
\r
- NewFvSection = (EFI_FIRMWARE_VOLUME_IMAGE_SECTION*) NULL;\r
+ FvSection = (EFI_FIRMWARE_VOLUME_IMAGE_SECTION*) NULL;\r
\r
Status = FindFfsFileAndSection (\r
*Fv,\r
return Status;\r
}\r
\r
- //PcdGet32 (PcdOvmfMemFvBase), PcdGet32 (PcdOvmfMemFvSize)\r
- OutputBuffer = (VOID*) ((UINT8*)(UINTN) PcdGet32 (PcdOvmfMemFvBase) + SIZE_1MB);\r
+ OutputBuffer = (VOID*) ((UINT8*)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase) + SIZE_1MB);\r
ScratchBuffer = ALIGN_POINTER ((UINT8*) OutputBuffer + OutputBufferSize, SIZE_1MB);\r
Status = ExtractGuidedSectionDecode (\r
Section,\r
return Status;\r
}\r
\r
- Status = FindFfsSectionInSections (\r
+ Status = FindFfsSectionInstance (\r
+ OutputBuffer,\r
+ OutputBufferSize,\r
+ EFI_SECTION_FIRMWARE_VOLUME_IMAGE,\r
+ 0,\r
+ (EFI_COMMON_SECTION_HEADER**) &FvSection\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((EFI_D_ERROR, "Unable to find PEI FV section\n"));\r
+ return Status;\r
+ }\r
+\r
+ ASSERT (SECTION_SIZE (FvSection) ==\r
+ (PcdGet32 (PcdOvmfPeiMemFvSize) + sizeof (*FvSection)));\r
+ ASSERT (FvSection->Type == EFI_SECTION_FIRMWARE_VOLUME_IMAGE);\r
+\r
+ PeiMemFv = (EFI_FIRMWARE_VOLUME_HEADER*)(UINTN) PcdGet32 (PcdOvmfPeiMemFvBase);\r
+ CopyMem (PeiMemFv, (VOID*) (FvSection + 1), PcdGet32 (PcdOvmfPeiMemFvSize));\r
+\r
+ if (PeiMemFv->Signature != EFI_FVH_SIGNATURE) {\r
+ DEBUG ((EFI_D_ERROR, "Extracted FV at %p does not have FV header signature\n", PeiMemFv));\r
+ CpuDeadLoop ();\r
+ return EFI_VOLUME_CORRUPTED;\r
+ }\r
+\r
+ Status = FindFfsSectionInstance (\r
OutputBuffer,\r
OutputBufferSize,\r
EFI_SECTION_FIRMWARE_VOLUME_IMAGE,\r
- (EFI_COMMON_SECTION_HEADER**) &NewFvSection\r
+ 1,\r
+ (EFI_COMMON_SECTION_HEADER**) &FvSection\r
);\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((EFI_D_ERROR, "Unable to find FV image in extracted data\n"));\r
+ DEBUG ((EFI_D_ERROR, "Unable to find DXE FV section\n"));\r
return Status;\r
}\r
\r
- NewFv = (EFI_FIRMWARE_VOLUME_HEADER*)(UINTN) PcdGet32 (PcdOvmfMemFvBase);\r
- CopyMem (NewFv, (VOID*) (NewFvSection + 1), PcdGet32 (PcdOvmfMemFvSize));\r
+ ASSERT (FvSection->Type == EFI_SECTION_FIRMWARE_VOLUME_IMAGE);\r
+ ASSERT (SECTION_SIZE (FvSection) ==\r
+ (PcdGet32 (PcdOvmfDxeMemFvSize) + sizeof (*FvSection)));\r
+\r
+ DxeMemFv = (EFI_FIRMWARE_VOLUME_HEADER*)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase);\r
+ CopyMem (DxeMemFv, (VOID*) (FvSection + 1), PcdGet32 (PcdOvmfDxeMemFvSize));\r
\r
- if (NewFv->Signature != EFI_FVH_SIGNATURE) {\r
- DEBUG ((EFI_D_ERROR, "Extracted FV at %p does not have FV header signature\n", NewFv));\r
+ if (DxeMemFv->Signature != EFI_FVH_SIGNATURE) {\r
+ DEBUG ((EFI_D_ERROR, "Extracted FV at %p does not have FV header signature\n", DxeMemFv));\r
CpuDeadLoop ();\r
return EFI_VOLUME_CORRUPTED;\r
}\r
\r
- *Fv = NewFv;\r
+ *Fv = PeiMemFv;\r
return EFI_SUCCESS;\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
+\r
+/**\r
+ Reads 8-bits of CMOS data.\r
+\r
+ Reads the 8-bits of CMOS data at the location specified by Index.\r
+ The 8-bit read value is returned.\r
+\r
+ @param Index The CMOS location to read.\r
+\r
+ @return The value read.\r
+\r
+**/\r
+STATIC\r
+UINT8\r
+CmosRead8 (\r
+ IN UINTN Index\r
+ )\r
+{\r
+ IoWrite8 (0x70, (UINT8) Index);\r
+ return IoRead8 (0x71);\r
+}\r
+\r
+\r
+STATIC\r
+BOOLEAN\r
+IsS3Resume (\r
+ VOID\r
+ )\r
+{\r
+ return (CmosRead8 (0xF) == 0xFE);\r
+}\r
+\r
+\r
+STATIC\r
+EFI_STATUS\r
+GetS3ResumePeiFv (\r
+ IN OUT EFI_FIRMWARE_VOLUME_HEADER **PeiFv\r
+ )\r
+{\r
+ *PeiFv = (EFI_FIRMWARE_VOLUME_HEADER*)(UINTN) PcdGet32 (PcdOvmfPeiMemFvBase);\r
+ return EFI_SUCCESS;\r
+}\r
+\r
+\r
/**\r
Locates the PEI Core entry point address\r
\r
{\r
*PeiCoreImageBase = 0;\r
\r
- FindMainFv (BootFv);\r
+ if (IsS3Resume ()) {\r
+ DEBUG ((EFI_D_VERBOSE, "SEC: S3 resume\n"));\r
+ GetS3ResumePeiFv (BootFv);\r
+ } else {\r
+ DEBUG ((EFI_D_VERBOSE, "SEC: Normal boot\n"));\r
+ FindMainFv (BootFv);\r
\r
- DecompressGuidedFv (BootFv);\r
+ DecompressMemFvs (BootFv);\r
+ }\r
\r
FindPeiCoreImageBaseInFv (*BootFv, PeiCoreImageBase);\r
}\r
BASE_LIBRARY_JUMP_BUFFER JumpBuffer;\r
\r
DEBUG ((EFI_D_INFO,\r
- "TemporaryRamMigration(0x%x, 0x%x, 0x%x)\n",\r
- (UINTN) TemporaryMemoryBase,\r
- (UINTN) PermanentMemoryBase,\r
- CopySize\r
+ "TemporaryRamMigration(0x%Lx, 0x%Lx, 0x%Lx)\n",\r
+ TemporaryMemoryBase,\r
+ PermanentMemoryBase,\r
+ (UINT64)CopySize\r
));\r
\r
OldHeap = (VOID*)(UINTN)TemporaryMemoryBase;\r
projects / mirror_edk2.git / blobdiff