sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg: Add support for weakly aligned FVs.

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14671 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Star Zeng
2013-09-16 01:50:44 +00:00
committed by lzeng14
parent 82ea59a012
commit 3837e91c58
4 changed files with 87 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
View File

@@ -1036,39 +1036,48 @@ CoreProcessFvImageFile (
//
FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) Buffer;
//
// Get FvHeader alignment
// If EFI_FVB2_WEAK_ALIGNMENT is set in the volume header then the first byte of the volume
// can be aligned on any power-of-two boundary. A weakly aligned volume can not be moved from
// its initial linked location and maintain its alignment.
//
FvAlignment = 1 << ((FvHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16);
//
// FvAlignment must be greater than or equal to 8 bytes of the minimum FFS alignment value.
//
if (FvAlignment < 8) {
FvAlignment = 8;
if ((FvHeader->Attributes & EFI_FVB2_WEAK_ALIGNMENT) != EFI_FVB2_WEAK_ALIGNMENT) {
//
// Get FvHeader alignment
//
FvAlignment = 1 << ((FvHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16);
//
// FvAlignment must be greater than or equal to 8 bytes of the minimum FFS alignment value.
//
if (FvAlignment < 8) {
FvAlignment = 8;
}
//
// Allocate the aligned buffer for the FvImage.
//
AlignedBuffer = AllocateAlignedPages (EFI_SIZE_TO_PAGES (BufferSize), (UINTN) FvAlignment);
if (AlignedBuffer == NULL) {
FreePool (Buffer);
return EFI_OUT_OF_RESOURCES;
} else {
//
// Move FvImage into the aligned buffer and release the original buffer.
//
CopyMem (AlignedBuffer, Buffer, BufferSize);
FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) AlignedBuffer;
CoreFreePool (Buffer);
Buffer = NULL;
}
}
//
// Allocate the aligned buffer for the FvImage.
// Produce a FVB protocol for the file
//
AlignedBuffer = AllocateAlignedPages (EFI_SIZE_TO_PAGES (BufferSize), (UINTN) FvAlignment);
if (AlignedBuffer == NULL) {
Status = EFI_OUT_OF_RESOURCES;
} else {
//
// Move FvImage into the aligned buffer and release the original buffer.
//
CopyMem (AlignedBuffer, Buffer, BufferSize);
CoreFreePool (Buffer);
Buffer = NULL;
//
// Produce a FVB protocol for the file
//
Status = ProduceFVBProtocolOnBuffer (
(EFI_PHYSICAL_ADDRESS) (UINTN) AlignedBuffer,
(UINT64)BufferSize,
FvHandle,
AuthenticationStatus,
NULL
);
}
Status = ProduceFVBProtocolOnBuffer (
(EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader,
(UINT64)BufferSize,
FvHandle,
AuthenticationStatus,
NULL
);
}
if (EFI_ERROR (Status)) {

31
MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
View File

@@ -474,22 +474,31 @@ ProduceFVBProtocolOnBuffer (
if (FwVolHeader->Signature != EFI_FVH_SIGNATURE) {
return EFI_VOLUME_CORRUPTED;
}
//
// Get FvHeader alignment
// If EFI_FVB2_WEAK_ALIGNMENT is set in the volume header then the first byte of the volume
// can be aligned on any power-of-two boundary. A weakly aligned volume can not be moved from
// its initial linked location and maintain its alignment.
//
FvAlignment = 1 << ((FwVolHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16);
//
// FvAlignment must be greater than or equal to 8 bytes of the minimum FFS alignment value.
//
if (FvAlignment < 8) {
FvAlignment = 8;
}
if ((UINTN)BaseAddress % FvAlignment != 0) {
if ((FwVolHeader->Attributes & EFI_FVB2_WEAK_ALIGNMENT) != EFI_FVB2_WEAK_ALIGNMENT) {
//
// FvImage buffer is not at its required alignment.
// Get FvHeader alignment
//
return EFI_VOLUME_CORRUPTED;
FvAlignment = 1 << ((FwVolHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16);
//
// FvAlignment must be greater than or equal to 8 bytes of the minimum FFS alignment value.
//
if (FvAlignment < 8) {
FvAlignment = 8;
}
if ((UINTN)BaseAddress % FvAlignment != 0) {
//
// FvImage buffer is not at its required alignment.
//
return EFI_VOLUME_CORRUPTED;
}
}
//
// Allocate EFI_FW_VOL_BLOCK_DEVICE
//