tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg: Update Dxe to handle unaccepted memory type

Browse Source 
RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3937

Unaccepted memory is a kind of new memory type,
CoreInitializeGcdServices() and CoreGetMemoryMap() are updated to handle
the unaccepted memory type.

Ref: microsoft/mu_basecore@97e9c31

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Min Xu <min.m.xu@intel.com>
This commit is contained in:
Min M Xu 2022-11-01 13:13:44 +08:00 committed by mergify[bot]
parent 502c01c502
commit 43e306806e
2 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MdeModulePkg/Core/Dxe/Gcd/Gcd.c
View File

@ -8,6 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
#include <Pi/PrePiDxeCis.h>
#include <Pi/PrePiHob.h>
#include "DxeMain.h" #include "DxeMain.h"
#include "Gcd.h" #include "Gcd.h"
#include "Mem/HeapGuard.h" #include "Mem/HeapGuard.h"
@ -103,6 +105,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *mGcdMemoryTypeNames[] = {
"MMIO ", // EfiGcdMemoryTypeMemoryMappedIo "MMIO ", // EfiGcdMemoryTypeMemoryMappedIo
"PersisMem", // EfiGcdMemoryTypePersistent "PersisMem", // EfiGcdMemoryTypePersistent
"MoreRelia", // EfiGcdMemoryTypeMoreReliable "MoreRelia", // EfiGcdMemoryTypeMoreReliable
"Unaccepte", // EFI_GCD_MEMORY_TYPE_UNACCEPTED
"Unknown " // EfiGcdMemoryTypeMaximum "Unknown " // EfiGcdMemoryTypeMaximum
}; };
@ -2600,6 +2603,9 @@ CoreInitializeGcdServices (
case EFI_RESOURCE_MEMORY_RESERVED: case EFI_RESOURCE_MEMORY_RESERVED:
GcdMemoryType = EfiGcdMemoryTypeReserved; GcdMemoryType = EfiGcdMemoryTypeReserved;
break; break;
case BZ3937_EFI_RESOURCE_MEMORY_UNACCEPTED:
GcdMemoryType = EFI_GCD_MEMORY_TYPE_UNACCEPTED;
break;
case EFI_RESOURCE_IO: case EFI_RESOURCE_IO:
GcdIoType = EfiGcdIoTypeIo; GcdIoType = EfiGcdIoTypeIo;
break; break;

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

@ -9,6 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include "DxeMain.h" #include "DxeMain.h"
#include "Imem.h" #include "Imem.h"
#include "HeapGuard.h" #include "HeapGuard.h"
#include <Pi/PrePiDxeCis.h>
// //
// Entry for tracking the memory regions for each memory type to coalesce similar memory types // Entry for tracking the memory regions for each memory type to coalesce similar memory types
@ -61,6 +62,7 @@ EFI_MEMORY_TYPE_STATISTICS mMemoryTypeStatistics[EfiMaxMemoryType + 1] = {
{ 0, MAX_ALLOC_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiMemoryMappedIOPortSpace { 0, MAX_ALLOC_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiMemoryMappedIOPortSpace
{ 0, MAX_ALLOC_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, TRUE }, // EfiPalCode { 0, MAX_ALLOC_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, TRUE }, // EfiPalCode
{ 0, MAX_ALLOC_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiPersistentMemory { 0, MAX_ALLOC_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiPersistentMemory
{ 0, MAX_ALLOC_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, FALSE }, // EfiUnacceptedMemoryType
{ 0, MAX_ALLOC_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE } // EfiMaxMemoryType { 0, MAX_ALLOC_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE } // EfiMaxMemoryType
}; };
@ -68,22 +70,23 @@ EFI_PHYSICAL_ADDRESS mDefaultMaximumAddress = MAX_ALLOC_ADDRESS;
EFI_PHYSICAL_ADDRESS mDefaultBaseAddress = MAX_ALLOC_ADDRESS; EFI_PHYSICAL_ADDRESS mDefaultBaseAddress = MAX_ALLOC_ADDRESS;
EFI_MEMORY_TYPE_INFORMATION gMemoryTypeInformation[EfiMaxMemoryType + 1] = { EFI_MEMORY_TYPE_INFORMATION gMemoryTypeInformation[EfiMaxMemoryType + 1] = {
{ EfiReservedMemoryType, 0 }, { EfiReservedMemoryType, 0 },
{ EfiLoaderCode, 0 }, { EfiLoaderCode, 0 },
{ EfiLoaderData, 0 }, { EfiLoaderData, 0 },
{ EfiBootServicesCode, 0 }, { EfiBootServicesCode, 0 },
{ EfiBootServicesData, 0 }, { EfiBootServicesData, 0 },
{ EfiRuntimeServicesCode, 0 }, { EfiRuntimeServicesCode, 0 },
{ EfiRuntimeServicesData, 0 }, { EfiRuntimeServicesData, 0 },
{ EfiConventionalMemory, 0 }, { EfiConventionalMemory, 0 },
{ EfiUnusableMemory, 0 }, { EfiUnusableMemory, 0 },
{ EfiACPIReclaimMemory, 0 }, { EfiACPIReclaimMemory, 0 },
{ EfiACPIMemoryNVS, 0 }, { EfiACPIMemoryNVS, 0 },
{ EfiMemoryMappedIO, 0 }, { EfiMemoryMappedIO, 0 },
{ EfiMemoryMappedIOPortSpace, 0 }, { EfiMemoryMappedIOPortSpace, 0 },
{ EfiPalCode, 0 }, { EfiPalCode, 0 },
{ EfiPersistentMemory, 0 }, { EfiPersistentMemory, 0 },
{ EfiMaxMemoryType, 0 } { EFI_GCD_MEMORY_TYPE_UNACCEPTED, 0 },
{ EfiMaxMemoryType, 0 }
}; };
// //
// Only used when load module at fixed address feature is enabled. True means the memory is alreay successfully allocated // Only used when load module at fixed address feature is enabled. True means the memory is alreay successfully allocated
@ -1286,7 +1289,7 @@ CoreInternalAllocatePages (
} }
if (((MemoryType >= EfiMaxMemoryType) && (MemoryType < MEMORY_TYPE_OEM_RESERVED_MIN)) || if (((MemoryType >= EfiMaxMemoryType) && (MemoryType < MEMORY_TYPE_OEM_RESERVED_MIN)) ||
(MemoryType == EfiConventionalMemory) || (MemoryType == EfiPersistentMemory)) (MemoryType == EfiConventionalMemory) || (MemoryType == EfiPersistentMemory) || (MemoryType == EfiUnacceptedMemoryType))
{ {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
@ -1961,6 +1964,32 @@ CoreGetMemoryMap (
MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size); MemoryMap = MergeMemoryMapDescriptor (MemoryMapStart, MemoryMap, Size);
} }
if (MergeGcdMapEntry.GcdMemoryType == EFI_GCD_MEMORY_TYPE_UNACCEPTED) {
//
// Page Align GCD range is required. When it is converted to EFI_MEMORY_DESCRIPTOR,
// it will be recorded as page PhysicalStart and NumberOfPages.
//
ASSERT ((MergeGcdMapEntry.BaseAddress & EFI_PAGE_MASK) == 0);
ASSERT (((MergeGcdMapEntry.EndAddress - MergeGcdMapEntry.BaseAddress + 1) & EFI_PAGE_MASK) == 0);
//
// Create EFI_MEMORY_DESCRIPTOR for every Unaccepted GCD entries
//
MemoryMap->PhysicalStart = MergeGcdMapEntry.BaseAddress;
MemoryMap->VirtualStart = 0;
MemoryMap->NumberOfPages = RShiftU64 ((MergeGcdMapEntry.EndAddress - MergeGcdMapEntry.BaseAddress + 1), EFI_PAGE_SHIFT);
MemoryMap->Attribute = MergeGcdMapEntry.Attributes |
(MergeGcdMapEntry.Capabilities & (EFI_MEMORY_RP | EFI_MEMORY_WP | EFI_MEMORY_XP | EFI_MEMORY_RO |
EFI_MEMORY_UC | EFI_MEMORY_UCE | EFI_MEMORY_WC | EFI_MEMORY_WT | EFI_MEMORY_WB));
MemoryMap->Type = EfiUnacceptedMemoryType;
//
// 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);
}
if (Link == &mGcdMemorySpaceMap) { if (Link == &mGcdMemorySpaceMap) {
// //
// break loop when arrive at head. // break loop when arrive at head.