From d40695ad82a6a9990d4e73bc9cc3de123eda7a90 Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Wed, 10 Jan 2018 13:45:58 +0800 Subject: [PATCH] MdeModulePkg DxeIpl: remove the hard code alignment adjustment in Decompress() Section data alignment should be made in the build generation. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Cc: Star Zeng Reviewed-by: Star Zeng --- MdeModulePkg/Core/DxeIplPeim/DxeLoad.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c index f4d7528985..178bac47e4 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c +++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c @@ -708,18 +708,13 @@ Decompress ( return EFI_OUT_OF_RESOURCES; } // - // Allocate destination buffer, extra one page for adjustment + // Allocate destination buffer // - DstBuffer = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize) + 1); + DstBuffer = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize)); 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 ( @@ -749,16 +744,11 @@ Decompress ( // Allocate destination buffer // DstBufferSize = UncompressedLength; - DstBuffer = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize) + 1); + DstBuffer = AllocatePages (EFI_SIZE_TO_PAGES (DstBufferSize)); 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, CompressionSource, DstBufferSize); -- 2.39.2