X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxeIplPeim%2FDxeLoad.c;h=abebfe07fef3707fc6f6f49d8b2e1260981b1e2c;hb=b39ece655b54311096ba7bcd0bed9bab92843e7f;hp=d593e30c74b99710135b3e7e25601b4807788ec0;hpb=30c8f8616d9f2c764e4b8c3566bef4f562115005;p=mirror_edk2.git
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index d593e30c74..abebfe07fe 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -1,8 +1,8 @@
-/**@file
+/** @file
Last PEIM.
Responsibility of this module is to load the DXE Core from a Firmware Volume.
-Copyright (c) 2006 - 2007 Intel Corporation
+Copyright (c) 2006 - 2008, 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
@@ -14,61 +14,43 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include "DxeIpl.h"
-#include
-#include
-
-EFI_STATUS
-CustomGuidedSectionExtract (
- IN CONST EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI *This,
- IN CONST VOID *InputSection,
- OUT VOID **OutputBuffer,
- OUT UINTN *OutputSize,
- 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
-);
-
+//
+// This global variable indicates whether this module has been shadowed
+// to memory.
+//
BOOLEAN gInMemory = FALSE;
//
// Module Globals used in the DXE to PEI handoff
// These must be module globals, so the stack can be switched
//
-static EFI_DXE_IPL_PPI mDxeIplPpi = {
+CONST EFI_DXE_IPL_PPI mDxeIplPpi = {
DxeLoadCore
};
-STATIC EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI mCustomGuidedSectionExtractionPpi = {
+CONST EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI mCustomGuidedSectionExtractionPpi = {
CustomGuidedSectionExtract
};
-STATIC EFI_PEI_DECOMPRESS_PPI mDecompressPpi = {
+CONST EFI_PEI_DECOMPRESS_PPI mDecompressPpi = {
Decompress
};
-static EFI_PEI_PPI_DESCRIPTOR mPpiList[] = {
+CONST EFI_PEI_PPI_DESCRIPTOR mPpiList[] = {
{
EFI_PEI_PPI_DESCRIPTOR_PPI,
&gEfiDxeIplPpiGuid,
- &mDxeIplPpi
+ (VOID *) &mDxeIplPpi
},
{
(EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
&gEfiPeiDecompressPpiGuid,
- &mDecompressPpi
+ (VOID *) &mDecompressPpi
}
};
-static EFI_PEI_PPI_DESCRIPTOR mPpiSignal = {
+CONST EFI_PEI_PPI_DESCRIPTOR gEndOfPeiSignalPpi = {
(EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
&gEfiEndOfPeiSignalPpiGuid,
NULL
@@ -80,8 +62,9 @@ static EFI_PEI_PPI_DESCRIPTOR mPpiSignal = {
@param FfsHandle The handle of FFS file.
@param PeiServices General purpose services available to
every PEIM.
- @return EFI_SUCESS
-*/
+ @return EFI_SUCESS
+
+**/
EFI_STATUS
EFIAPI
PeimInitializeDxeIpl (
@@ -95,8 +78,7 @@ PeimInitializeDxeIpl (
UINTN ExtractHandlerNumber;
EFI_PEI_PPI_DESCRIPTOR *GuidPpi;
- Status = PeiServicesGetBootMode (&BootMode);
- ASSERT_EFI_ERROR (Status);
+ BootMode = GetBootModeHob ();
if (BootMode != BOOT_ON_S3_RESUME) {
Status = PeiServicesRegisterForShadow (FfsHandle);
@@ -106,9 +88,7 @@ PeimInitializeDxeIpl (
//
return Status;
} else if (Status == EFI_ALREADY_STARTED) {
-
- gInMemory = TRUE;
-
+
//
// Get custom extract guided section method guid list
//
@@ -118,16 +98,15 @@ PeimInitializeDxeIpl (
// Install custom extraction guid ppi
//
if (ExtractHandlerNumber > 0) {
- GuidPpi = NULL;
- GuidPpi = (EFI_PEI_PPI_DESCRIPTOR *) AllocatePool (ExtractHandlerNumber * sizeof (EFI_PEI_PPI_DESCRIPTOR));
- ASSERT (GuidPpi != NULL);
- while (ExtractHandlerNumber-- > 0) {
- GuidPpi->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;
- GuidPpi->Ppi = &mCustomGuidedSectionExtractionPpi;
- GuidPpi->Guid = &(ExtractHandlerGuidTable [ExtractHandlerNumber]);
- Status = PeiServicesInstallPpi (GuidPpi++);
- ASSERT_EFI_ERROR(Status);
- }
+ GuidPpi = (EFI_PEI_PPI_DESCRIPTOR *) AllocatePool (ExtractHandlerNumber * sizeof (EFI_PEI_PPI_DESCRIPTOR));
+ ASSERT (GuidPpi != NULL);
+ while (ExtractHandlerNumber-- > 0) {
+ GuidPpi->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;
+ GuidPpi->Ppi = (VOID *) &mCustomGuidedSectionExtractionPpi;
+ GuidPpi->Guid = &(ExtractHandlerGuidTable [ExtractHandlerNumber]);
+ Status = PeiServicesInstallPpi (GuidPpi++);
+ ASSERT_EFI_ERROR(Status);
+ }
}
} else {
ASSERT (FALSE);
@@ -135,23 +114,24 @@ PeimInitializeDxeIpl (
}
//
- // Install FvFileLoader and DxeIpl PPIs.
+ // Install DxeIpl and Decompress PPIs.
//
Status = PeiServicesInstallPpi (mPpiList);
- ASSERT_EFI_ERROR(Status);
-
+ ASSERT_EFI_ERROR(Status);
+
return Status;
}
/**
- Main entry point to last PEIM
+ Main entry point to last PEIM.
- @param This Entry point for DXE IPL PPI
+ @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
+ @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
@@ -162,20 +142,20 @@ DxeLoadCore (
)
{
EFI_STATUS Status;
- EFI_GUID DxeCoreFileName;
+ EFI_FV_FILE_INFO DxeCoreFileInfo;
EFI_PHYSICAL_ADDRESS DxeCoreAddress;
UINT64 DxeCoreSize;
EFI_PHYSICAL_ADDRESS DxeCoreEntryPoint;
EFI_BOOT_MODE BootMode;
- EFI_PEI_FV_HANDLE VolumeHandle;
EFI_PEI_FILE_HANDLE FileHandle;
- UINTN Instance;
+ EFI_PEI_READ_ONLY_VARIABLE2_PPI *Variable;
+ UINTN DataSize;
+ EFI_MEMORY_TYPE_INFORMATION MemoryData[EfiMaxMemoryType + 1];
//
// if in S3 Resume, restore configure
//
- Status = PeiServicesGetBootMode (&BootMode);
- ASSERT_EFI_ERROR(Status);
+ BootMode = GetBootModeHob ();
if (BootMode == BOOT_ON_S3_RESUME) {
Status = AcpiS3ResumeOs();
@@ -183,7 +163,7 @@ DxeLoadCore (
} else if (BootMode == BOOT_IN_RECOVERY_MODE) {
Status = PeiRecoverFirmware ();
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Load Recovery Capsule Failed.(Status = %r)\n", Status));
+ DEBUG ((DEBUG_ERROR, "Load Recovery Capsule Failed.(Status = %r)\n", Status));
CpuDeadLoop ();
}
@@ -191,40 +171,64 @@ DxeLoadCore (
// Now should have a HOB with the DXE core w/ the old HOB destroyed
//
}
-
- //
- // If any FV contains an encapsulated FV extract that FV
- //
- DxeIplAddEncapsulatedFirmwareVolumes ();
-
+
+ Status = PeiServicesLocatePpi (
+ &gEfiPeiReadOnlyVariable2PpiGuid,
+ 0,
+ NULL,
+ (VOID **)&Variable
+ );
+ if (!EFI_ERROR (Status)) {
+ DataSize = sizeof (MemoryData);
+ Status = Variable->GetVariable (
+ Variable,
+ EFI_MEMORY_TYPE_INFORMATION_VARIABLE_NAME,
+ &gEfiMemoryTypeInformationGuid,
+ NULL,
+ &DataSize,
+ &MemoryData
+ );
+ if (!EFI_ERROR (Status)) {
+ //
+ // Build the GUID'd HOB for DXE
+ //
+ BuildGuidDataHob (
+ &gEfiMemoryTypeInformationGuid,
+ MemoryData,
+ DataSize
+ );
+ }
+ }
+
//
- // Look in all the FVs present in PEI and find the DXE Core
+ // Look in all the FVs present in PEI and find the DXE Core FileHandle
//
- 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));
+ FileHandle = DxeIplFindDxeCore ();
//
// Load the DXE Core from a Firmware Volume, may use LoadFile ppi to do this for save code size.
//
Status = PeiLoadFile (
- FileHandle,
- &DxeCoreAddress,
- &DxeCoreSize,
- &DxeCoreEntryPoint
- );
+ FileHandle,
+ &DxeCoreAddress,
+ &DxeCoreSize,
+ &DxeCoreEntryPoint
+ );
+ ASSERT_EFI_ERROR (Status);
+ //
+ // Get the DxeCore File Info from the FileHandle for the DxeCore GUID file name.
+ //
+ Status = PeiServicesFfsGetFileInfo (FileHandle, &DxeCoreFileInfo);
ASSERT_EFI_ERROR (Status);
//
// Add HOB for the DXE Core
//
BuildModuleHob (
- &DxeCoreFileName,
+ &DxeCoreFileInfo.FileName,
DxeCoreAddress,
- EFI_SIZE_TO_PAGES ((UINT32) DxeCoreSize) * EFI_PAGE_SIZE,
+ EFI_SIZE_TO_PAGES ((UINTN) DxeCoreSize) * EFI_PAGE_SIZE,
DxeCoreEntryPoint
);
@@ -233,29 +237,16 @@ DxeLoadCore (
//
REPORT_STATUS_CODE (
EFI_PROGRESS_CODE,
- EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_CORE_PC_HANDOFF_TO_NEXT
+ PcdGet32(PcdStatusCodeValuePeiHandoffToDxe)
);
- DEBUG_CODE_BEGIN ();
-
- EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION PtrPeImage;
- PtrPeImage.Pe32 = (EFI_IMAGE_NT_HEADERS32 *) ((UINTN) DxeCoreAddress + ((EFI_IMAGE_DOS_HEADER *) (UINTN) DxeCoreAddress)->e_lfanew);
-
- if (PtrPeImage.Pe32->FileHeader.Machine != IMAGE_FILE_MACHINE_IA64) {
- DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Loading DXE CORE at 0x%10p EntryPoint=0x%10p\n", (VOID *)(UINTN)DxeCoreAddress, (VOID *)(UINTN)DxeCoreEntryPoint));
- } else {
- //
- // For IPF Image, the real entry point should be print.
- //
- DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Loading DXE CORE at 0x%10p EntryPoint=0x%10p\n", (VOID *)(UINTN)DxeCoreAddress, (VOID *)(UINTN)(*(UINT64 *)(UINTN)DxeCoreEntryPoint)));
- }
+ DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Loading DXE CORE at 0x%10p EntryPoint=0x%10p\n", (VOID *)(UINTN)DxeCoreAddress, FUNCTION_ENTRY_POINT (DxeCoreEntryPoint)));
- DEBUG_CODE_END ();
//
// Transfer control to the DXE Core
// The handoff state is simply a pointer to the HOB list
//
- HandOffToDxeCore (DxeCoreEntryPoint, HobList, &mPpiSignal);
+ HandOffToDxeCore (DxeCoreEntryPoint, HobList);
//
// If we get here, then the DXE Core returned. This is an error
// Dxe Core should not return.
@@ -267,172 +258,55 @@ DxeLoadCore (
}
-STATIC
-EFI_STATUS
-GetFvAlignment (
- IN EFI_FIRMWARE_VOLUME_HEADER *FvHeader,
- OUT UINT32 *FvAlignment
- )
-{
- //
- // 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;
-}
-
/**
- 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
+ Searches DxeCore in all firmware Volumes and loads the first
+ instance that contains DxeCore.
+
+ @return FileHandle of DxeCore to load DxeCore.
+
**/
-EFI_STATUS
-DxeIplAddEncapsulatedFirmwareVolumes (
+EFI_PEI_FILE_HANDLE
+DxeIplFindDxeCore (
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;
-
- Status = EFI_NOT_FOUND;
- Index = 0;
-
- 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;
- }
-
- //
- // This new Firmware Volume comes from a firmware file within a firmware volume.
- // Record the original Firmware Volume Name.
- //
- PeiServicesFfsGetVolumeInfo (&VolumeHandle, &VolumeInfo);
-
- PiLibInstallFvInfoPpi (
- NULL,
- FvHeader,
- (UINT32) FvHeader->FvLength,
- &(VolumeInfo.FvName),
- &(((EFI_FFS_FILE_HEADER*)FileHandle)->Name)
- );
-
- //
- // Inform HOB consumer phase, i.e. DXE core, the existance of this FV
- //
- BuildFvHob (
- (EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader,
- FvHeader->FvLength
- );
-
- ASSERT_EFI_ERROR (Status);
-
- //
- // 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));
+ EFI_STATUS Status;
+ UINTN Instance;
+ EFI_PEI_FV_HANDLE VolumeHandle;
+ EFI_PEI_FILE_HANDLE FileHandle;
- 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_STATUS Status;
- EFI_STATUS VolumeStatus;
-
- do {
- VolumeStatus = PeiServicesFfsFindNextVolume (*Instance, VolumeHandle);
- if (!EFI_ERROR (VolumeStatus)) {
- *FileHandle = NULL;
- Status = PeiServicesFfsFindNextFile (SeachType, *VolumeHandle, FileHandle);
- if (!EFI_ERROR (Status)) {
- return Status;
- }
+ Instance = 0;
+ while (TRUE) {
+ //
+ // Traverse all firmware volume instances
+ //
+ Status = PeiServicesFfsFindNextVolume (Instance, &VolumeHandle);
+ //
+ // If some error occurs here, then we cannot find any firmware
+ // volume that may contain DxeCore.
+ //
+ ASSERT_EFI_ERROR (Status);
+
+ //
+ // Find the DxeCore file type from the beginning in this firmware volume.
+ //
+ FileHandle = NULL;
+ Status = PeiServicesFfsFindNextFile (EFI_FV_FILETYPE_DXE_CORE, VolumeHandle, &FileHandle);
+ if (!EFI_ERROR (Status)) {
+ //
+ // Find DxeCore FileHandle in this volume, then we skip other firmware volume and
+ // return the FileHandle.
+ //
+ return FileHandle;
}
- *Instance += 1;
- } while (!EFI_ERROR (VolumeStatus));
-
- return VolumeStatus;
+ //
+ // We cannot find DxeCore in this firmware volume, then search the next volume.
+ //
+ Instance++;
+ }
}
+
/**
Loads and relocates a PE/COFF image into memory.
@@ -443,6 +317,7 @@ DxeIplFindFirmwareVolumeInstance (
@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 (
@@ -456,6 +331,7 @@ PeiLoadFile (
EFI_STATUS Status;
PE_COFF_LOADER_IMAGE_CONTEXT ImageContext;
VOID *Pe32Data;
+
//
// First try to find the PE32 section in this ffs file.
//
@@ -464,7 +340,6 @@ PeiLoadFile (
FileHandle,
&Pe32Data
);
-
if (EFI_ERROR (Status)) {
//
// NO image types we support so exit.
@@ -515,6 +390,9 @@ PeiLoadFile (
return EFI_SUCCESS;
}
+
+
+
/**
The ExtractSection() function processes the input section and
returns a pointer to the section contents. If the section being
@@ -531,13 +409,15 @@ PeiLoadFile (
processed. OutputBuffer OutputBuffer is
allocated from PEI permanent memory and contains
the new section stream.
-
+ @param InputSection A pointer to the input buffer, which contains
+ the input section to be processed.
+ @param OutputBuffer A pointer to a caller-allocated buffer, whose
+ size is specified by the contents of OutputSize.
@param OutputSize A pointer to a caller-allocated
UINTN in which the size of *OutputBuffer
allocation is stored. If the function
returns anything other than EFI_SUCCESS,
the value of OutputSize is undefined.
-
@param AuthenticationStatus A pointer to a caller-allocated
UINT32 that indicates the
authentication status of the
@@ -562,9 +442,10 @@ PeiLoadFile (
@retval EFI_OUT_OF_RESOURCES The system has insufficient
resources to process the request.
- @reteval EFI_INVALID_PARAMETER The GUID in InputSection does
+ @retval EFI_INVALID_PARAMETER The GUID in InputSection does
not match this instance of the
GUIDed Section Extraction PPI.
+
**/
EFI_STATUS
CustomGuidedSectionExtract (
@@ -590,14 +471,14 @@ CustomGuidedSectionExtract (
// Call GetInfo to get the size and attribute of input guided section data.
//
Status = ExtractGuidedSectionGetInfo (
- InputSection,
- &OutputBufferSize,
- &ScratchBufferSize,
- &SectionAttribute
- );
+ InputSection,
+ &OutputBufferSize,
+ &ScratchBufferSize,
+ &SectionAttribute
+ );
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "GetInfo from guided section Failed - %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "GetInfo from guided section Failed - %r\n", Status));
return Status;
}
@@ -611,14 +492,20 @@ CustomGuidedSectionExtract (
}
}
- if ((SectionAttribute & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) && OutputBufferSize > 0) {
+ if (((SectionAttribute & EFI_GUIDED_SECTION_PROCESSING_REQUIRED) != 0) && OutputBufferSize > 0) {
//
// Allocate output buffer
//
- *OutputBuffer = AllocatePages (EFI_SIZE_TO_PAGES (OutputBufferSize));
+ *OutputBuffer = AllocatePages (EFI_SIZE_TO_PAGES (OutputBufferSize) + 1);
if (*OutputBuffer == NULL) {
return EFI_OUT_OF_RESOURCES;
}
+ DEBUG ((DEBUG_INFO, "Customed Guided section Memory Size required is 0x%x and address is 0x%p\n", OutputBufferSize, *OutputBuffer));
+ //
+ // *OutputBuffer still is one section. Adjust *OutputBuffer offset,
+ // skip EFI section header to make section data at page alignment.
+ //
+ *OutputBuffer = (VOID *)((UINT8 *) *OutputBuffer + EFI_PAGE_SIZE - sizeof (EFI_COMMON_SECTION_HEADER));
}
Status = ExtractGuidedSectionDecode (
@@ -627,12 +514,11 @@ CustomGuidedSectionExtract (
ScratchBuffer,
AuthenticationStatus
);
-
if (EFI_ERROR (Status)) {
//
// Decode failed
//
- DEBUG ((EFI_D_ERROR, "Extract guided section Failed - %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "Extract guided section Failed - %r\n", Status));
return Status;
}
@@ -641,7 +527,28 @@ CustomGuidedSectionExtract (
return EFI_SUCCESS;
}
-STATIC
+
+
+/**
+ Decompresses a section to the output buffer.
+
+ This function lookes up the compression type field in the input section and
+ applies the appropriate compression algorithm to compress the section to a
+ callee allocated buffer.
+
+ @param This Points to this instance of the
+ EFI_PEI_DECOMPRESS_PEI PPI.
+ @param CompressionSection Points to the compressed section.
+ @param OutputBuffer Holds the returned pointer to the decompressed
+ sections.
+ @param OutputSize Holds the returned size of the decompress
+ section streams.
+
+ @retval EFI_SUCCESS The section was decompressed successfully.
+ OutputBuffer contains the resulting data and
+ OutputSize contains the resulting size.
+
+**/
EFI_STATUS
EFIAPI
Decompress (
@@ -665,7 +572,7 @@ Decompress (
}
Section = (EFI_COMMON_SECTION_HEADER *) CompressionSection;
- SectionLength = *(UINT32 *) (Section->Size) & 0x00ffffff;
+ SectionLength = *(UINT32 *) (Section->Size) & 0x00ffffff;
//
// This is a compression set, expand it
@@ -686,7 +593,7 @@ Decompress (
//
// GetInfo failed
//
- DEBUG ((EFI_D_ERROR, "Decompress GetInfo Failed - %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "Decompress GetInfo Failed - %r\n", Status));
return EFI_NOT_FOUND;
}
//
@@ -697,13 +604,18 @@ Decompress (
return EFI_OUT_OF_RESOURCES;
}
//
- // Allocate destination buffer
+ // Allocate destination buffer, extra one page for adjustment
//
- DstBuffer = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize));
+ DstBuffer = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize) + 1);
if (DstBuffer == NULL) {
return EFI_OUT_OF_RESOURCES;
}
//
+ // DstBuffer still is one section. Adjust DstBuffer offset, skip EFI section header
+ // to make section data at page alignment.
+ //
+ DstBuffer = DstBuffer + EFI_PAGE_SIZE - sizeof (EFI_COMMON_SECTION_HEADER);
+ //
// Call decompress function
//
Status = UefiDecompress (
@@ -715,23 +627,26 @@ Decompress (
//
// Decompress failed
//
- DEBUG ((EFI_D_ERROR, "Decompress Failed - %r\n", Status));
+ DEBUG ((DEBUG_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));
+ DstBuffer = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize) + 1);
if (DstBuffer == NULL) {
return EFI_OUT_OF_RESOURCES;
}
//
+ // Adjust DstBuffer offset, skip EFI section header
+ // to make section data at page alignment.
+ //
+ DstBuffer = DstBuffer + EFI_PAGE_SIZE - sizeof (EFI_COMMON_SECTION_HEADER);
+ //
// stream is not actually compressed, just encapsulated. So just copy it.
//
CopyMem (DstBuffer, CompressionSection + 1, DstBufferSize);
@@ -751,6 +666,19 @@ Decompress (
return EFI_SUCCESS;
}
+
+
+
+/**
+ Updates the Stack HOB passed to DXE phase.
+
+ This function traverses the whole HOB list and update the stack HOB to
+ reflect the real stack that is used by DXE core.
+
+ @param BaseAddress The lower address of stack used by DxeCore.
+ @param Length The length of stack used by DxeCore.
+
+**/
VOID
UpdateStackHob (
IN EFI_PHYSICAL_ADDRESS BaseAddress,