Revision: 17255
http://sourceforge.net/p/edk2/code/17255
Author: hwu1225
Date: 2015-04-29 05:15:33 +0000 (Wed, 29 Apr 2015)
Log Message:
-----------
MdeModulePkg: Add support for UEFI2.5 and PI1.4 PersistentMemory feature
Update DxeCore to collect PersistentMemory resource and report them
in EFI memory map.
(Sync patch r17242 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <[email protected]>
Reviewed-by: Star Zeng <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/17242
Modified Paths:
--------------
branches/UDK2014.SP1/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.c
branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Mem/Page.c
branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Mem/Pool.c
branches/UDK2014.SP1/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
Modified:
branches/UDK2014.SP1/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.c
===================================================================
---
branches/UDK2014.SP1/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.c
2015-04-29 05:14:32 UTC (rev 17254)
+++
branches/UDK2014.SP1/MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.c
2015-04-29 05:15:33 UTC (rev 17255)
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2014 - 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
@@ -54,6 +54,7 @@
L"EfiMemoryMappedIO",
L"EfiMemoryMappedIOPortSpace",
L"EfiPalCode",
+ L"EfiPersistentMemory",
L"EfiOSReserved",
};
Modified: branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
===================================================================
--- branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Gcd/Gcd.c 2015-04-29
05:14:32 UTC (rev 17254)
+++ branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Gcd/Gcd.c 2015-04-29
05:15:33 UTC (rev 17255)
@@ -3,7 +3,7 @@
The GCD services are used to manage the memory and I/O regions that
are accessible to the CPU that is executing the DXE core.
-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
@@ -27,7 +27,8 @@
EFI_RESOURCE_ATTRIBUTE_EXECUTION_PROTECTED | \
EFI_RESOURCE_ATTRIBUTE_16_BIT_IO
| \
EFI_RESOURCE_ATTRIBUTE_32_BIT_IO
| \
- EFI_RESOURCE_ATTRIBUTE_64_BIT_IO
)
+ EFI_RESOURCE_ATTRIBUTE_64_BIT_IO
| \
+ EFI_RESOURCE_ATTRIBUTE_PERSISTENT
)
#define TESTED_MEMORY_ATTRIBUTES (EFI_RESOURCE_ATTRIBUTE_PRESENT | \
EFI_RESOURCE_ATTRIBUTE_INITIALIZED | \
@@ -92,6 +93,7 @@
{ EFI_RESOURCE_ATTRIBUTE_PRESENT, EFI_MEMORY_PRESENT,
FALSE },
{ EFI_RESOURCE_ATTRIBUTE_INITIALIZED, EFI_MEMORY_INITIALIZED,
FALSE },
{ EFI_RESOURCE_ATTRIBUTE_TESTED, EFI_MEMORY_TESTED,
FALSE },
+ { EFI_RESOURCE_ATTRIBUTE_PERSISTABLE, EFI_MEMORY_NV,
TRUE },
{ 0, 0,
FALSE }
};
@@ -103,6 +105,7 @@
"Reserved ", // EfiGcdMemoryTypeReserved
"SystemMem", // EfiGcdMemoryTypeSystemMemory
"MMIO ", // EfiGcdMemoryTypeMemoryMappedIo
+ "PersistentMem",// EfiGcdMemoryTypePersistentMemory
"Unknown " // EfiGcdMemoryTypeMaximum
};
@@ -231,6 +234,8 @@
((Attributes & EFI_RESOURCE_ATTRIBUTE_WRITE_PROTECTABLE) != 0));
ASSERT (((Attributes & EFI_RESOURCE_ATTRIBUTE_EXECUTION_PROTECTED) == 0) ||
((Attributes & EFI_RESOURCE_ATTRIBUTE_EXECUTION_PROTECTABLE) != 0));
+ ASSERT (((Attributes & EFI_RESOURCE_ATTRIBUTE_PERSISTENT) == 0) ||
+ ((Attributes & EFI_RESOURCE_ATTRIBUTE_PERSISTABLE) != 0));
}
/**
@@ -2357,6 +2362,9 @@
if ((ResourceHob->ResourceAttribute & MEMORY_ATTRIBUTE_MASK) ==
PRESENT_MEMORY_ATTRIBUTES) {
GcdMemoryType = EfiGcdMemoryTypeReserved;
}
+ if ((ResourceHob->ResourceAttribute &
EFI_RESOURCE_ATTRIBUTE_PERSISTENT) == EFI_RESOURCE_ATTRIBUTE_PERSISTENT) {
+ GcdMemoryType = EfiGcdMemoryTypePersistentMemory;
+ }
break;
case EFI_RESOURCE_MEMORY_MAPPED_IO:
case EFI_RESOURCE_FIRMWARE_DEVICE:
Modified: branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Mem/Page.c
===================================================================
--- branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Mem/Page.c 2015-04-29
05:14:32 UTC (rev 17254)
+++ branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Mem/Page.c 2015-04-29
05:15:33 UTC (rev 17255)
@@ -67,6 +67,7 @@
{ 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 @@
{ EfiMemoryMappedIO, 0 },
{ EfiMemoryMappedIOPortSpace, 0 },
{ EfiPalCode, 0 },
+ { EfiPersistentMemory, 0 },
{ EfiMaxMemoryType, 0 }
};
//
@@ -1198,7 +1200,7 @@
}
if ((MemoryType >= EfiMaxMemoryType && MemoryType <= 0x7fffffff) ||
- MemoryType == EfiConventionalMemory) {
+ (MemoryType == EfiConventionalMemory) || (MemoryType ==
EfiPersistentMemory)) {
return EFI_INVALID_PARAMETER;
}
@@ -1528,7 +1530,7 @@
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 @@
//
// 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 @@
//
// 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 @@
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);
+ }
}
//
Modified: branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Mem/Pool.c
===================================================================
--- branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Mem/Pool.c 2015-04-29
05:14:32 UTC (rev 17254)
+++ branches/UDK2014.SP1/MdeModulePkg/Core/Dxe/Mem/Pool.c 2015-04-29
05:15:33 UTC (rev 17255)
@@ -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
@@ -169,6 +169,7 @@
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.
@@ -187,7 +188,7 @@
// If it's not a valid type, fail it
//
if ((PoolType >= EfiMaxMemoryType && PoolType <= 0x7fffffff) ||
- PoolType == EfiConventionalMemory) {
+ (PoolType == EfiConventionalMemory) || (PoolType ==
EfiPersistentMemory)) {
return EFI_INVALID_PARAMETER;
}
Modified: branches/UDK2014.SP1/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
===================================================================
--- branches/UDK2014.SP1/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
2015-04-29 05:14:32 UTC (rev 17254)
+++ branches/UDK2014.SP1/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
2015-04-29 05:15:33 UTC (rev 17255)
@@ -1793,6 +1793,7 @@
L"EfiMemoryMappedIO",
L"EfiMemoryMappedIOPortSpace",
L"EfiPalCode",
+ L"EfiPersistentMemory",
L"EfiOSReserved",
};
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
