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

MdeModulePkg DxeCore: Add OEM reserved memory type support.

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@17460 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Star Zeng
2015-05-18 01:28:24 +00:00
committed by lzeng14
parent ff9331e6bd
commit 8ee25f4877
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MdeModulePkg/Core/Dxe/Mem/Imem.h
View File

@@ -1,7 +1,7 @@
/** @file /** @file
Data structure and functions to allocate and free memory space. Data structure and functions to allocate and free memory space.
Copyright (c) 2006 - 2008, 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
@@ -40,6 +40,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#endif #endif
//
// +---------------------------------------------------+
// | 0..(EfiMaxMemoryType - 1) - Normal memory type |
// +---------------------------------------------------+
// | EfiMaxMemoryType..0x6FFFFFFF - Ilegal |
// +---------------------------------------------------+
// | 0x70000000..0x7FFFFFFF - OEM reserved |
// +---------------------------------------------------+
// | 0x80000000..0xFFFFFFFF - OS reserved |
// +---------------------------------------------------+
//
#define MEMORY_TYPE_OS_RESERVED_MIN 0x80000000
#define MEMORY_TYPE_OS_RESERVED_MAX 0xFFFFFFFF
#define MEMORY_TYPE_OEM_RESERVED_MIN 0x70000000
#define MEMORY_TYPE_OEM_RESERVED_MAX 0x7FFFFFFF
// //
// MEMORY_MAP_ENTRY // MEMORY_MAP_ENTRY

4
MdeModulePkg/Core/Dxe/Mem/Page.c
View File

@@ -544,7 +544,7 @@ CoreAddMemoryDescriptor (
return; return;
} }
if (Type >= EfiMaxMemoryType && Type <= 0x7fffffff) { if (Type >= EfiMaxMemoryType && Type < MEMORY_TYPE_OEM_RESERVED_MIN) {
return; return;
} }
CoreAcquireMemoryLock (); CoreAcquireMemoryLock ();
@@ -1203,7 +1203,7 @@ CoreInternalAllocatePages (
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
if ((MemoryType >= EfiMaxMemoryType && MemoryType <= 0x7fffffff) || if ((MemoryType >= EfiMaxMemoryType && MemoryType < MEMORY_TYPE_OEM_RESERVED_MIN) ||
(MemoryType == EfiConventionalMemory) || (MemoryType == EfiPersistentMemory)) { (MemoryType == EfiConventionalMemory) || (MemoryType == EfiPersistentMemory)) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }

7
MdeModulePkg/Core/Dxe/Mem/Pool.c
View File

@@ -155,9 +155,10 @@ LookupPoolHead (
// //
// MemoryType values in the range 0x80000000..0xFFFFFFFF are reserved for use by UEFI // MemoryType values in the range 0x80000000..0xFFFFFFFF are reserved for use by UEFI
// OS loaders that are provided by operating system vendors // OS loaders that are provided by operating system vendors.
// MemoryType values in the range 0x70000000..0x7FFFFFFF are reserved for OEM use.
// //
if ((INT32)MemoryType < 0) { if ((UINT32) MemoryType >= MEMORY_TYPE_OEM_RESERVED_MIN) {
for (Link = mPoolHeadList.ForwardLink; Link != &mPoolHeadList; Link = Link->ForwardLink) { for (Link = mPoolHeadList.ForwardLink; Link != &mPoolHeadList; Link = Link->ForwardLink) {
Pool = CR(Link, POOL, Link, POOL_SIGNATURE); Pool = CR(Link, POOL, Link, POOL_SIGNATURE);
@@ -215,7 +216,7 @@ CoreInternalAllocatePool (
// //
// If it's not a valid type, fail it // If it's not a valid type, fail it
// //
if ((PoolType >= EfiMaxMemoryType && PoolType <= 0x7fffffff) || if ((PoolType >= EfiMaxMemoryType && PoolType < MEMORY_TYPE_OEM_RESERVED_MIN) ||
(PoolType == EfiConventionalMemory) || (PoolType == EfiPersistentMemory)) { (PoolType == EfiConventionalMemory) || (PoolType == EfiPersistentMemory)) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }