MdeModulePkg: Add support for UEFI2.5 and PI1.4 PersistentMemory feature
Update DxeCore to collect PersistentMemory resource and report them in EFI memory map. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao <liming.gao@intel.com> Reviewed-by: Star Zeng <star.zeng@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17242 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -67,6 +67,7 @@ EFI_MEMORY_TYPE_STATISTICS mMemoryTypeStatistics[EfiMaxMemoryType + 1] = {
|
||||
{ 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiMemoryMappedIO
|
||||
{ 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiMemoryMappedIOPortSpace
|
||||
{ 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, TRUE }, // EfiPalCode
|
||||
{ 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiPersistentMemory
|
||||
{ 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE } // EfiMaxMemoryType
|
||||
};
|
||||
|
||||
@@ -88,6 +89,7 @@ EFI_MEMORY_TYPE_INFORMATION gMemoryTypeInformation[EfiMaxMemoryType + 1] = {
|
||||
{ EfiMemoryMappedIO, 0 },
|
||||
{ EfiMemoryMappedIOPortSpace, 0 },
|
||||
{ EfiPalCode, 0 },
|
||||
{ EfiPersistentMemory, 0 },
|
||||
{ EfiMaxMemoryType, 0 }
|
||||
};
|
||||
//
|
||||
@@ -1198,7 +1200,7 @@ CoreInternalAllocatePages (
|
||||
}
|
||||
|
||||
if ((MemoryType >= EfiMaxMemoryType && MemoryType <= 0x7fffffff) ||
|
||||
MemoryType == EfiConventionalMemory) {
|
||||
(MemoryType == EfiConventionalMemory) || (MemoryType == EfiPersistentMemory)) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
@@ -1528,7 +1530,7 @@ CoreGetMemoryMap (
|
||||
EFI_STATUS Status;
|
||||
UINTN Size;
|
||||
UINTN BufferSize;
|
||||
UINTN NumberOfRuntimeEntries;
|
||||
UINTN NumberOfRuntimePersistentEntries;
|
||||
LIST_ENTRY *Link;
|
||||
MEMORY_MAP *Entry;
|
||||
EFI_GCD_MAP_ENTRY *GcdMapEntry;
|
||||
@@ -1546,16 +1548,21 @@ CoreGetMemoryMap (
|
||||
|
||||
//
|
||||
// Count the number of Reserved and MMIO entries that are marked for runtime use
|
||||
// And, count the number of Persistent entries.
|
||||
//
|
||||
NumberOfRuntimeEntries = 0;
|
||||
NumberOfRuntimePersistentEntries = 0;
|
||||
for (Link = mGcdMemorySpaceMap.ForwardLink; Link != &mGcdMemorySpaceMap; Link = Link->ForwardLink) {
|
||||
GcdMapEntry = CR (Link, EFI_GCD_MAP_ENTRY, Link, EFI_GCD_MAP_SIGNATURE);
|
||||
if ((GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypeReserved) ||
|
||||
(GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo)) {
|
||||
if ((GcdMapEntry->Attributes & EFI_MEMORY_RUNTIME) == EFI_MEMORY_RUNTIME) {
|
||||
NumberOfRuntimeEntries++;
|
||||
NumberOfRuntimePersistentEntries ++;
|
||||
}
|
||||
}
|
||||
|
||||
if (GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypePersistentMemory) {
|
||||
NumberOfRuntimePersistentEntries ++;
|
||||
}
|
||||
}
|
||||
|
||||
Size = sizeof (EFI_MEMORY_DESCRIPTOR);
|
||||
@@ -1580,7 +1587,7 @@ CoreGetMemoryMap (
|
||||
//
|
||||
// Compute the buffer size needed to fit the entire map
|
||||
//
|
||||
BufferSize = Size * NumberOfRuntimeEntries;
|
||||
BufferSize = Size * NumberOfRuntimePersistentEntries;
|
||||
for (Link = gMemoryMap.ForwardLink; Link != &gMemoryMap; Link = Link->ForwardLink) {
|
||||
BufferSize += Size;
|
||||
}
|
||||
@@ -1673,6 +1680,23 @@ CoreGetMemoryMap (
|
||||
MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size);
|
||||
}
|
||||
}
|
||||
|
||||
if (GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypePersistentMemory) {
|
||||
//
|
||||
// Create EFI_MEMORY_DESCRIPTOR for every Persistent GCD entries
|
||||
//
|
||||
MemoryMap->PhysicalStart = GcdMapEntry->BaseAddress;
|
||||
MemoryMap->VirtualStart = 0;
|
||||
MemoryMap->NumberOfPages = RShiftU64 ((GcdMapEntry->EndAddress - GcdMapEntry->BaseAddress + 1), EFI_PAGE_SHIFT);
|
||||
MemoryMap->Attribute = GcdMapEntry->Attributes | EFI_MEMORY_NV;
|
||||
MemoryMap->Type = EfiPersistentMemory;
|
||||
|
||||
//
|
||||
// Check to see if the new Memory Map Descriptor can be merged with an
|
||||
// existing descriptor if they are adjacent and have the same attributes
|
||||
//
|
||||
MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size);
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
UEFI Memory pool management functions.
|
||||
|
||||
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
|
||||
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
|
||||
@@ -197,6 +197,7 @@ LookupPoolHead (
|
||||
pool
|
||||
|
||||
@retval EFI_INVALID_PARAMETER PoolType not valid or Buffer is NULL.
|
||||
PoolType was EfiPersistentMemory.
|
||||
@retval EFI_OUT_OF_RESOURCES Size exceeds max pool size or allocation failed.
|
||||
@retval EFI_SUCCESS Pool successfully allocated.
|
||||
|
||||
@@ -215,7 +216,7 @@ CoreInternalAllocatePool (
|
||||
// If it's not a valid type, fail it
|
||||
//
|
||||
if ((PoolType >= EfiMaxMemoryType && PoolType <= 0x7fffffff) ||
|
||||
PoolType == EfiConventionalMemory) {
|
||||
(PoolType == EfiConventionalMemory) || (PoolType == EfiPersistentMemory)) {
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user