tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdePkg: Update PeiMemoryAllocationLib to allocate EfiReservedMemoryType memory directly. 

The old implementation was to allocate EfiBootServicesData memory first,
and then update the MemoryType of memory allocation hob to
EfiReservedMemoryType.

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@17395 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Star Zeng 2015-05-11 03:12:51 +00:00 committed by lzeng14
parent ab6fb25a1f
commit 34363594e3
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
View File

@ -2,7 +2,7 @@
Support routines for memory allocation routines Support routines for memory allocation routines
based on PeiService for PEI phase drivers. based on PeiService for PEI phase drivers.
Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -45,42 +45,15 @@ InternalAllocatePages (
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_PHYSICAL_ADDRESS Memory; EFI_PHYSICAL_ADDRESS Memory;
EFI_MEMORY_TYPE RequestType;
EFI_PEI_HOB_POINTERS Hob;
if (Pages == 0) { if (Pages == 0) {
return NULL; return NULL;
} }
RequestType = MemoryType; Status = PeiServicesAllocatePages (MemoryType, Pages, &Memory);
if (MemoryType == EfiReservedMemoryType) {
//
// PEI AllocatePages() doesn't support EfiReservedMemoryType.
// Change RequestType to EfiBootServicesData for memory allocation.
//
RequestType = EfiBootServicesData;
}
Status = PeiServicesAllocatePages (RequestType, Pages, &Memory);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return NULL; return NULL;
} }
if (MemoryType == EfiReservedMemoryType) {
//
// Memory type needs to be updated to EfiReservedMemoryType. Per PI spec Volume 1,
// PEI AllocatePages() will automate the creation of the Memory Allocation HOB types.
// Search Memory Allocation HOB and find the matched memory region,
// then change its memory type to EfiReservedMemoryType.
//
Hob.Raw = GetFirstHob (EFI_HOB_TYPE_MEMORY_ALLOCATION);
while (Hob.Raw != NULL && Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress != Memory) {
Hob.Raw = GET_NEXT_HOB (Hob);
Hob.Raw = GetNextHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, Hob.Raw);
}
ASSERT (Hob.Raw != NULL);
Hob.MemoryAllocation->AllocDescriptor.MemoryType = EfiReservedMemoryType;
}
return (VOID *) (UINTN) Memory; return (VOID *) (UINTN) Memory;
} }