* [Patch 1/2] MdePkg: Correct EfiGcdMemoryTypePersistent name to follow PI spec
2017-09-20 4:02 [Patch 0/2] Correct PI EfiGcdMemoryTypePersistent definition Liming Gao
@ 2017-09-20 4:02 ` Liming Gao
2017-09-20 4:02 ` [Patch 2/2] MdeModulePkg: Update DxeCore to consume PI EfiGcdMemoryTypePersistent Liming Gao
2017-09-20 5:03 ` [Patch 0/2] Correct PI EfiGcdMemoryTypePersistent definition Zeng, Star
2 siblings, 0 replies; 4+ messages in thread
From: Liming Gao @ 2017-09-20 4:02 UTC (permalink / raw)
To: edk2-devel
PI spec defines EfiGcdMemoryTypePersistent name, MdePkg uses
EfiGcdMemoryTypePersistentMemory name. So, EfiGcdMemoryTypePersistent
is added. And, EfiGcdMemoryTypePersistentMemory is kept for compatility.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
MdePkg/Include/Pi/PiDxeCis.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index 3292809851..079dd3eab1 100644
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -52,7 +52,11 @@ typedef enum {
/// A memory region that is visible to the boot processor.
/// This memory supports byte-addressable non-volatility.
///
- EfiGcdMemoryTypePersistentMemory,
+ EfiGcdMemoryTypePersistent,
+ //
+ // Keep original one for the compatibility.
+ //
+ EfiGcdMemoryTypePersistentMemory = EfiGcdMemoryTypePersistent,
///
/// A memory region that provides higher reliability relative to other memory in the
/// system. If all memory has the same reliability, then this bit is not used.
--
2.11.0.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Patch 2/2] MdeModulePkg: Update DxeCore to consume PI EfiGcdMemoryTypePersistent
2017-09-20 4:02 [Patch 0/2] Correct PI EfiGcdMemoryTypePersistent definition Liming Gao
2017-09-20 4:02 ` [Patch 1/2] MdePkg: Correct EfiGcdMemoryTypePersistent name to follow PI spec Liming Gao
@ 2017-09-20 4:02 ` Liming Gao
2017-09-20 5:03 ` [Patch 0/2] Correct PI EfiGcdMemoryTypePersistent definition Zeng, Star
2 siblings, 0 replies; 4+ messages in thread
From: Liming Gao @ 2017-09-20 4:02 UTC (permalink / raw)
To: edk2-devel
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
MdeModulePkg/Core/Dxe/Gcd/Gcd.c | 4 ++--
MdeModulePkg/Core/Dxe/Mem/Page.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
index a06f8bb77c..4f03b3e408 100644
--- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
+++ b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
@@ -108,7 +108,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *mGcdMemoryTypeNames[] = {
"Reserved ", // EfiGcdMemoryTypeReserved
"SystemMem", // EfiGcdMemoryTypeSystemMemory
"MMIO ", // EfiGcdMemoryTypeMemoryMappedIo
- "PersisMem", // EfiGcdMemoryTypePersistentMemory
+ "PersisMem", // EfiGcdMemoryTypePersistent
"MoreRelia", // EfiGcdMemoryTypeMoreReliable
"Unknown " // EfiGcdMemoryTypeMaximum
};
@@ -2407,7 +2407,7 @@ CoreInitializeGcdServices (
GcdMemoryType = EfiGcdMemoryTypeReserved;
}
if ((ResourceHob->ResourceAttribute & EFI_RESOURCE_ATTRIBUTE_PERSISTENT) == EFI_RESOURCE_ATTRIBUTE_PERSISTENT) {
- GcdMemoryType = EfiGcdMemoryTypePersistentMemory;
+ GcdMemoryType = EfiGcdMemoryTypePersistent;
}
break;
case EFI_RESOURCE_MEMORY_MAPPED_IO:
diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c
index a142c79ee2..3dd6d1b4a0 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -1635,7 +1635,7 @@ CoreGetMemoryMap (
NumberOfEntries = 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 == EfiGcdMemoryTypePersistentMemory) ||
+ if ((GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypePersistent) ||
(GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypeReserved) ||
((GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) &&
((GcdMapEntry->Attributes & EFI_MEMORY_RUNTIME) == EFI_MEMORY_RUNTIME))) {
@@ -1783,7 +1783,7 @@ CoreGetMemoryMap (
MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size);
}
- if (MergeGcdMapEntry.GcdMemoryType == EfiGcdMemoryTypePersistentMemory) {
+ if (MergeGcdMapEntry.GcdMemoryType == EfiGcdMemoryTypePersistent) {
//
// Page Align GCD range is required. When it is converted to EFI_MEMORY_DESCRIPTOR,
// it will be recorded as page PhysicalStart and NumberOfPages.
--
2.11.0.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Patch 0/2] Correct PI EfiGcdMemoryTypePersistent definition
2017-09-20 4:02 [Patch 0/2] Correct PI EfiGcdMemoryTypePersistent definition Liming Gao
2017-09-20 4:02 ` [Patch 1/2] MdePkg: Correct EfiGcdMemoryTypePersistent name to follow PI spec Liming Gao
2017-09-20 4:02 ` [Patch 2/2] MdeModulePkg: Update DxeCore to consume PI EfiGcdMemoryTypePersistent Liming Gao
@ 2017-09-20 5:03 ` Zeng, Star
2 siblings, 0 replies; 4+ messages in thread
From: Zeng, Star @ 2017-09-20 5:03 UTC (permalink / raw)
To: Gao, Liming, edk2-devel@lists.01.org; +Cc: Zeng, Star
Reviewed-by: Star Zeng <star.zeng@intel.com>
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Liming Gao
Sent: Wednesday, September 20, 2017 12:03 PM
To: edk2-devel@lists.01.org
Subject: [edk2] [Patch 0/2] Correct PI EfiGcdMemoryTypePersistent definition
Liming Gao (2):
MdePkg: Correct EfiGcdMemoryTypePersistent name to follow PI spec
MdeModulePkg: Update DxeCore to consume PI EfiGcdMemoryTypePersistent
MdeModulePkg/Core/Dxe/Gcd/Gcd.c | 4 ++-- MdeModulePkg/Core/Dxe/Mem/Page.c | 4 ++--
MdePkg/Include/Pi/PiDxeCis.h | 6 +++++-
3 files changed, 9 insertions(+), 5 deletions(-)
--
2.11.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 4+ messages in thread