\r
**/\r
\r
-#include <DxeMain.h>\r
+#include "DxeMain.h"\r
+#include "Imem.h"\r
\r
#define EFI_DEFAULT_PAGE_ALLOCATION_ALIGNMENT (EFI_PAGE_SIZE)\r
\r
//\r
-// Entry for tracking the memory regions for each memory type to help cooalese like memory types\r
+// Entry for tracking the memory regions for each memory type to coalesce similar memory types\r
//\r
typedef struct {\r
EFI_PHYSICAL_ADDRESS BaseAddress;\r
//\r
UINTN mMemoryMapKey = 0;\r
\r
-//\r
-// mMapStack - space to use as temp storage to build new map descriptors\r
-// mMapDepth - depth of new descriptor stack\r
-//\r
-\r
#define MAX_MAP_DEPTH 6\r
+\r
+///\r
+/// mMapDepth - depth of new descriptor stack\r
+///\r
UINTN mMapDepth = 0;\r
+///\r
+/// mMapStack - space to use as temp storage to build new map descriptors\r
+///\r
MEMORY_MAP mMapStack[MAX_MAP_DEPTH];\r
UINTN mFreeMapStack = 0;\r
-//\r
-// This list maintain the free memory map list\r
-//\r
+///\r
+/// This list maintain the free memory map list\r
+///\r
LIST_ENTRY mFreeMemoryMapEntryList = INITIALIZE_LIST_HEAD_VARIABLE (mFreeMemoryMapEntryList);\r
BOOLEAN mMemoryTypeInformationInitialized = FALSE;\r
\r
EFI_MEMORY_TYPE_STAISTICS mMemoryTypeStatistics[EfiMaxMemoryType + 1] = {\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, FALSE }, // EfiReservedMemoryType\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiLoaderCode\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiLoaderData\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiBootServicesCode\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiBootServicesData\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, TRUE }, // EfiRuntimeServicesCode\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, TRUE }, // EfiRuntimeServicesData\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiConventionalMemory\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiUnusableMemory\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, FALSE }, // EfiACPIReclaimMemory\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, FALSE }, // EfiACPIMemoryNVS\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiMemoryMappedIO\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiMemoryMappedIOPortSpace\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, TRUE }, // EfiPalCode\r
- { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE } // EfiMaxMemoryType\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, FALSE }, // EfiReservedMemoryType\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiLoaderCode\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiLoaderData\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiBootServicesCode\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiBootServicesData\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, TRUE }, // EfiRuntimeServicesCode\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, TRUE }, // EfiRuntimeServicesData\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiConventionalMemory\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiUnusableMemory\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, FALSE }, // EfiACPIReclaimMemory\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, FALSE }, // EfiACPIMemoryNVS\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiMemoryMappedIO\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }, // EfiMemoryMappedIOPortSpace\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE, TRUE }, // EfiPalCode\r
+ { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE } // EfiMaxMemoryType\r
};\r
\r
-EFI_PHYSICAL_ADDRESS mDefaultMaximumAddress = EFI_MAX_ADDRESS;\r
+EFI_PHYSICAL_ADDRESS mDefaultMaximumAddress = MAX_ADDRESS;\r
\r
EFI_MEMORY_TYPE_INFORMATION gMemoryTypeInformation[EfiMaxMemoryType + 1] = {\r
{ EfiReservedMemoryType, 0 },\r
{ EfiMaxMemoryType, 0 }\r
};\r
\r
-//\r
-// Internal prototypes\r
-//\r
-/**\r
- Find untested but initialized memory regions in GCD map and convert them to be DXE allocatable.\r
-\r
-**/\r
-VOID\r
-PromoteMemoryResource (\r
- VOID\r
- );\r
-\r
-/**\r
- Internal function. Adds a ranges to the memory map.\r
- The range must not already exist in the map.\r
-\r
- @param Type The type of memory range to add \r
- @param Start The starting address in the memory range Must be \r
- paged aligned \r
- @param End The last address in the range Must be the last \r
- byte of a page \r
- @param Attribute The attributes of the memory range to add \r
-\r
-**/\r
-VOID\r
-CoreAddRange (\r
- IN EFI_MEMORY_TYPE Type,\r
- IN EFI_PHYSICAL_ADDRESS Start,\r
- IN EFI_PHYSICAL_ADDRESS End,\r
- IN UINT64 Attribute\r
- );\r
-\r
-/**\r
- Internal function. Moves any memory descriptors that are on the\r
- temporary descriptor stack to heap.\r
-\r
-**/\r
-VOID\r
-CoreFreeMemoryMapStack (\r
- VOID\r
- );\r
-\r
-/**\r
- Internal function. Converts a memory range to the specified type.\r
- The range must exist in the memory map.\r
-\r
- @param Start The first address of the range Must be page \r
- aligned \r
- @param NumberOfPages The number of pages to convert \r
- @param NewType The new type for the memory range \r
-\r
- @retval EFI_INVALID_PARAMETER Invalid parameter \r
- @retval EFI_NOT_FOUND Could not find a descriptor cover the specified \r
- range or convertion not allowed. \r
- @retval EFI_SUCCESS Successfully converts the memory range to the \r
- specified type.\r
-\r
-**/\r
-EFI_STATUS\r
-CoreConvertPages (\r
- IN UINT64 Start,\r
- IN UINT64 NumberOfPages,\r
- IN EFI_MEMORY_TYPE NewType\r
- );\r
-\r
-/**\r
- Internal function. Removes a descriptor entry.\r
-\r
- @param Entry The entry to remove\r
-\r
-**/\r
-VOID\r
-RemoveMemoryMapEntry (\r
- MEMORY_MAP *Entry\r
- );\r
- \r
-/**\r
- Internal function. Deque a descriptor entry from the mFreeMemoryMapEntryList.\r
- If the list is emtry, then allocate a new page to refuel the list.\r
- Please Note this algorithm to allocate the memory map descriptor has a property\r
- that the memory allocated for memory entries always grows, and will never really be freed\r
- For example, if the current boot uses 2000 memory map entries at the maximum point, but\r
- ends up with only 50 at the time the OS is booted, then the memory associated with the 1950\r
- memory map entries is still allocated from EfiBootServicesMemory.\r
-\r
-\r
- @return The Memory map descriptor dequed from the mFreeMemoryMapEntryList\r
-\r
-**/\r
-MEMORY_MAP *\r
-AllocateMemoryMapEntry (\r
- VOID\r
- );\r
- \r
\r
/**\r
Enter critical section by gaining lock on gMemoryLock.\r
}\r
\r
\r
-/**\r
- Find untested but initialized memory regions in GCD map and convert them to be DXE allocatable.\r
-\r
-**/\r
-VOID\r
-PromoteMemoryResource (\r
- VOID\r
- )\r
-{\r
- LIST_ENTRY *Link;\r
- EFI_GCD_MAP_ENTRY *Entry;\r
-\r
- DEBUG ((DEBUG_ERROR | DEBUG_PAGE, "Promote the memory resource\n"));\r
- \r
- CoreAcquireGcdMemoryLock ();\r
- \r
- Link = mGcdMemorySpaceMap.ForwardLink;\r
- while (Link != &mGcdMemorySpaceMap) {\r
-\r
- Entry = CR (Link, EFI_GCD_MAP_ENTRY, Link, EFI_GCD_MAP_SIGNATURE);\r
-\r
- if (Entry->GcdMemoryType == EfiGcdMemoryTypeReserved &&\r
- Entry->EndAddress < EFI_MAX_ADDRESS &&\r
- (Entry->Capabilities & (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED)) ==\r
- (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED)) {\r
- //\r
- // Update the GCD map\r
- //\r
- Entry->GcdMemoryType = EfiGcdMemoryTypeSystemMemory;\r
- Entry->Capabilities |= EFI_MEMORY_TESTED;\r
- Entry->ImageHandle = gDxeCoreImageHandle;\r
- Entry->DeviceHandle = NULL;\r
-\r
- //\r
- // Add to allocable system memory resource\r
- // \r
-\r
- CoreAddRange (\r
- EfiConventionalMemory, \r
- Entry->BaseAddress, \r
- Entry->EndAddress, \r
- Entry->Capabilities & ~(EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED | EFI_MEMORY_RUNTIME)\r
- );\r
- CoreFreeMemoryMapStack ();\r
- \r
- }\r
-\r
- Link = Link->ForwardLink;\r
- }\r
- \r
- CoreReleaseGcdMemoryLock ();\r
- \r
- return;\r
-}\r
\r
\r
/**\r
- Called to initialize the memory map and add descriptors to\r
- the current descriptor list.\r
- The first descriptor that is added must be general usable\r
- memory as the addition allocates heap.\r
-\r
- @param Type The type of memory to add \r
- @param Start The starting address in the memory range Must be \r
- page aligned \r
- @param NumberOfPages The number of pages in the range \r
- @param Attribute Attributes of the memory to add \r
+ Internal function. Removes a descriptor entry.\r
\r
- @return None. The range is added to the memory map\r
+ @param Entry The entry to remove\r
\r
**/\r
VOID\r
-CoreAddMemoryDescriptor (\r
- IN EFI_MEMORY_TYPE Type,\r
- IN EFI_PHYSICAL_ADDRESS Start,\r
- IN UINT64 NumberOfPages,\r
- IN UINT64 Attribute\r
+RemoveMemoryMapEntry (\r
+ IN OUT MEMORY_MAP *Entry\r
)\r
{\r
- EFI_PHYSICAL_ADDRESS End;\r
- EFI_STATUS Status;\r
- UINTN Index;\r
- UINTN FreeIndex;\r
-\r
- if ((Start & EFI_PAGE_MASK) != 0) {\r
- return;\r
- }\r
-\r
- if (Type >= EfiMaxMemoryType && Type <= 0x7fffffff) {\r
- return;\r
- }\r
- \r
- CoreAcquireMemoryLock ();\r
- End = Start + LShiftU64 (NumberOfPages, EFI_PAGE_SHIFT) - 1;\r
- CoreAddRange (Type, Start, End, Attribute);\r
- CoreFreeMemoryMapStack ();\r
- CoreReleaseMemoryLock ();\r
-\r
- //\r
- // Check to see if the statistics for the different memory types have already been established\r
- //\r
- if (mMemoryTypeInformationInitialized) {\r
- return;\r
- }\r
-\r
- //\r
- // Loop through each memory type in the order specified by the gMemoryTypeInformation[] array\r
- //\r
- for (Index = 0; gMemoryTypeInformation[Index].Type != EfiMaxMemoryType; Index++) {\r
- //\r
- // Make sure the memory type in the gMemoryTypeInformation[] array is valid\r
- //\r
- Type = (EFI_MEMORY_TYPE) (gMemoryTypeInformation[Index].Type);\r
- if (Type < 0 || Type > EfiMaxMemoryType) {\r
- continue;\r
- }\r
-\r
- if (gMemoryTypeInformation[Index].NumberOfPages != 0) {\r
- //\r
- // Allocate pages for the current memory type from the top of available memory\r
- //\r
- Status = CoreAllocatePages (\r
- AllocateAnyPages,\r
- Type,\r
- gMemoryTypeInformation[Index].NumberOfPages,\r
- &mMemoryTypeStatistics[Type].BaseAddress\r
- );\r
- if (EFI_ERROR (Status)) {\r
- //\r
- // If an error occurs allocating the pages for the current memory type, then \r
- // free all the pages allocates for the previous memory types and return. This\r
- // operation with be retied when/if more memory is added to the system\r
- //\r
- for (FreeIndex = 0; FreeIndex < Index; FreeIndex++) {\r
- //\r
- // Make sure the memory type in the gMemoryTypeInformation[] array is valid\r
- //\r
- Type = (EFI_MEMORY_TYPE) (gMemoryTypeInformation[FreeIndex].Type);\r
- if (Type < 0 || Type > EfiMaxMemoryType) {\r
- continue;\r
- }\r
-\r
- if (gMemoryTypeInformation[FreeIndex].NumberOfPages != 0) {\r
- CoreFreePages (\r
- mMemoryTypeStatistics[Type].BaseAddress, \r
- gMemoryTypeInformation[FreeIndex].NumberOfPages\r
- );\r
- mMemoryTypeStatistics[Type].BaseAddress = 0;\r
- mMemoryTypeStatistics[Type].MaximumAddress = EFI_MAX_ADDRESS;\r
- }\r
- }\r
- return;\r
- }\r
-\r
- //\r
- // Compute the address at the top of the current statistics\r
- //\r
- mMemoryTypeStatistics[Type].MaximumAddress = \r
- mMemoryTypeStatistics[Type].BaseAddress + \r
- LShiftU64 (gMemoryTypeInformation[Index].NumberOfPages, EFI_PAGE_SHIFT) - 1;\r
-\r
- //\r
- // If the current base address is the lowest address so far, then update the default \r
- // maximum address\r
- //\r
- if (mMemoryTypeStatistics[Type].BaseAddress < mDefaultMaximumAddress) {\r
- mDefaultMaximumAddress = mMemoryTypeStatistics[Type].BaseAddress - 1;\r
- }\r
- }\r
- }\r
+ RemoveEntryList (&Entry->Link);\r
+ Entry->Link.ForwardLink = NULL;\r
\r
- //\r
- // There was enough system memory for all the the memory types were allocated. So,\r
- // those memory areas can be freed for future allocations, and all future memory\r
- // allocations can occur within their respective bins\r
- //\r
- for (Index = 0; gMemoryTypeInformation[Index].Type != EfiMaxMemoryType; Index++) {\r
+ if (Entry->FromPages) {\r
//\r
- // Make sure the memory type in the gMemoryTypeInformation[] array is valid\r
+ // Insert the free memory map descriptor to the end of mFreeMemoryMapEntryList\r
//\r
- Type = (EFI_MEMORY_TYPE) (gMemoryTypeInformation[Index].Type);\r
- if (Type < 0 || Type > EfiMaxMemoryType) {\r
- continue;\r
- }\r
-\r
- if (gMemoryTypeInformation[Index].NumberOfPages != 0) {\r
- CoreFreePages (\r
- mMemoryTypeStatistics[Type].BaseAddress, \r
- gMemoryTypeInformation[Index].NumberOfPages\r
- );\r
- mMemoryTypeStatistics[Type].NumberOfPages = gMemoryTypeInformation[Index].NumberOfPages;\r
- gMemoryTypeInformation[Index].NumberOfPages = 0;\r
- }\r
- }\r
-\r
- //\r
- // If the number of pages reserved for a memory type is 0, then all allocations for that type\r
- // should be in the default range.\r
- //\r
- for (Type = (EFI_MEMORY_TYPE) 0; Type < EfiMaxMemoryType; Type++) {\r
- for (Index = 0; gMemoryTypeInformation[Index].Type != EfiMaxMemoryType; Index++) {\r
- if (Type == (EFI_MEMORY_TYPE)gMemoryTypeInformation[Index].Type) {\r
- mMemoryTypeStatistics[Type].InformationIndex = Index;\r
- }\r
- }\r
- mMemoryTypeStatistics[Type].CurrentNumberOfPages = 0;\r
- if (mMemoryTypeStatistics[Type].MaximumAddress == EFI_MAX_ADDRESS) {\r
- mMemoryTypeStatistics[Type].MaximumAddress = mDefaultMaximumAddress;\r
- }\r
+ InsertTailList (&mFreeMemoryMapEntryList, &Entry->Link);\r
}\r
-\r
- mMemoryTypeInformationInitialized = TRUE;\r
}\r
\r
-\r
-\r
/**\r
Internal function. Adds a ranges to the memory map.\r
The range must not already exist in the map.\r
\r
- @param Type The type of memory range to add \r
- @param Start The starting address in the memory range Must be \r
- paged aligned \r
- @param End The last address in the range Must be the last \r
- byte of a page \r
- @param Attribute The attributes of the memory range to add \r
-\r
- @return None. The range is added to the memory map\r
+ @param Type The type of memory range to add\r
+ @param Start The starting address in the memory range Must be\r
+ paged aligned\r
+ @param End The last address in the range Must be the last\r
+ byte of a page\r
+ @param Attribute The attributes of the memory range to add\r
\r
**/\r
VOID\r
ASSERT (End > Start) ;\r
\r
ASSERT_LOCKED (&gMemoryLock);\r
- \r
+\r
DEBUG ((DEBUG_PAGE, "AddRange: %lx-%lx to %d\n", Start, End, Type));\r
\r
//\r
//\r
// UEFI 2.0 added an event group for notificaiton on memory map changes.\r
// So we need to signal this Event Group every time the memory map changes.\r
- // If we are in EFI 1.10 compatability mode no event groups will be \r
+ // If we are in EFI 1.10 compatability mode no event groups will be\r
// found and nothing will happen we we call this function. These events\r
- // will get signaled but since a lock is held around the call to this \r
+ // will get signaled but since a lock is held around the call to this\r
// function the notificaiton events will only be called after this funciton\r
// returns and the lock is released.\r
//\r
//\r
// Look for adjoining memory descriptor\r
//\r
- \r
+\r
// Two memory descriptors can only be merged if they have the same Type\r
// and the same Attribute\r
//\r
}\r
\r
if (Entry->End + 1 == Start) {\r
- \r
+\r
Start = Entry->Start;\r
RemoveMemoryMapEntry (Entry);\r
\r
} else if (Entry->Start == End + 1) {\r
- \r
+\r
End = Entry->End;\r
RemoveMemoryMapEntry (Entry);\r
}\r
}\r
\r
//\r
- // Add descriptor \r
+ // Add descriptor\r
//\r
\r
mMapStack[mMapDepth].Signature = MEMORY_MAP_SIGNATURE;\r
mMapDepth += 1;\r
ASSERT (mMapDepth < MAX_MAP_DEPTH);\r
\r
- return ;\r
+ return ;\r
+}\r
+\r
+/**\r
+ Internal function. Deque a descriptor entry from the mFreeMemoryMapEntryList.\r
+ If the list is emtry, then allocate a new page to refuel the list.\r
+ Please Note this algorithm to allocate the memory map descriptor has a property\r
+ that the memory allocated for memory entries always grows, and will never really be freed\r
+ For example, if the current boot uses 2000 memory map entries at the maximum point, but\r
+ ends up with only 50 at the time the OS is booted, then the memory associated with the 1950\r
+ memory map entries is still allocated from EfiBootServicesMemory.\r
+\r
+\r
+ @return The Memory map descriptor dequed from the mFreeMemoryMapEntryList\r
+\r
+**/\r
+MEMORY_MAP *\r
+AllocateMemoryMapEntry (\r
+ VOID\r
+ )\r
+{\r
+ MEMORY_MAP* FreeDescriptorEntries;\r
+ MEMORY_MAP* Entry;\r
+ UINTN Index;\r
+\r
+ if (IsListEmpty (&mFreeMemoryMapEntryList)) {\r
+ //\r
+ // The list is empty, to allocate one page to refuel the list\r
+ //\r
+ FreeDescriptorEntries = CoreAllocatePoolPages (EfiBootServicesData, EFI_SIZE_TO_PAGES(DEFAULT_PAGE_ALLOCATION), DEFAULT_PAGE_ALLOCATION);\r
+ if(FreeDescriptorEntries != NULL) {\r
+ //\r
+ // Enque the free memmory map entries into the list\r
+ //\r
+ for (Index = 0; Index< DEFAULT_PAGE_ALLOCATION / sizeof(MEMORY_MAP); Index++) {\r
+ FreeDescriptorEntries[Index].Signature = MEMORY_MAP_SIGNATURE;\r
+ InsertTailList (&mFreeMemoryMapEntryList, &FreeDescriptorEntries[Index].Link);\r
+ }\r
+ } else {\r
+ return NULL;\r
+ }\r
+ }\r
+ //\r
+ // dequeue the first descriptor from the list\r
+ //\r
+ Entry = CR (mFreeMemoryMapEntryList.ForwardLink, MEMORY_MAP, Link, MEMORY_MAP_SIGNATURE);\r
+ RemoveEntryList (&Entry->Link);\r
+\r
+ return Entry;\r
}\r
\r
\r
\r
while (mMapDepth != 0) {\r
//\r
- // Deque an memory map entry from mFreeMemoryMapEntryList \r
+ // Deque an memory map entry from mFreeMemoryMapEntryList\r
//\r
Entry = AllocateMemoryMapEntry ();\r
- \r
+\r
ASSERT (Entry);\r
\r
//\r
InsertTailList (Link2, &Entry->Link);\r
\r
} else {\r
- // \r
+ //\r
// This item of mMapStack[mMapDepth] has already been dequeued from gMemoryMap list,\r
// so here no need to move it to memory.\r
//\r
mFreeMapStack -= 1;\r
}\r
\r
-\r
/**\r
- Internal function. Removes a descriptor entry.\r
-\r
- @param Entry The entry to remove\r
+ Find untested but initialized memory regions in GCD map and convert them to be DXE allocatable.\r
\r
**/\r
VOID\r
-RemoveMemoryMapEntry (\r
- IN OUT MEMORY_MAP *Entry\r
+PromoteMemoryResource (\r
+ VOID\r
)\r
{\r
- RemoveEntryList (&Entry->Link);\r
- Entry->Link.ForwardLink = NULL;\r
+ LIST_ENTRY *Link;\r
+ EFI_GCD_MAP_ENTRY *Entry;\r
\r
- if (Entry->FromPages) {\r
- //\r
- // Insert the free memory map descriptor to the end of mFreeMemoryMapEntryList\r
- //\r
- InsertTailList (&mFreeMemoryMapEntryList, &Entry->Link);\r
+ DEBUG ((DEBUG_PAGE, "Promote the memory resource\n"));\r
+\r
+ CoreAcquireGcdMemoryLock ();\r
+\r
+ Link = mGcdMemorySpaceMap.ForwardLink;\r
+ while (Link != &mGcdMemorySpaceMap) {\r
+\r
+ Entry = CR (Link, EFI_GCD_MAP_ENTRY, Link, EFI_GCD_MAP_SIGNATURE);\r
+\r
+ if (Entry->GcdMemoryType == EfiGcdMemoryTypeReserved &&\r
+ Entry->EndAddress < MAX_ADDRESS &&\r
+ (Entry->Capabilities & (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED)) ==\r
+ (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED)) {\r
+ //\r
+ // Update the GCD map\r
+ //\r
+ Entry->GcdMemoryType = EfiGcdMemoryTypeSystemMemory;\r
+ Entry->Capabilities |= EFI_MEMORY_TESTED;\r
+ Entry->ImageHandle = gDxeCoreImageHandle;\r
+ Entry->DeviceHandle = NULL;\r
+\r
+ //\r
+ // Add to allocable system memory resource\r
+ //\r
+\r
+ CoreAddRange (\r
+ EfiConventionalMemory,\r
+ Entry->BaseAddress,\r
+ Entry->EndAddress,\r
+ Entry->Capabilities & ~(EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED | EFI_MEMORY_RUNTIME)\r
+ );\r
+ CoreFreeMemoryMapStack ();\r
+\r
+ }\r
+\r
+ Link = Link->ForwardLink;\r
}\r
+\r
+ CoreReleaseGcdMemoryLock ();\r
+\r
+ return;\r
}\r
\r
\r
/**\r
- Internal function. Deque a descriptor entry from the mFreeMemoryMapEntryList.\r
- If the list is emtry, then allocate a new page to refuel the list.\r
- Please Note this algorithm to allocate the memory map descriptor has a property\r
- that the memory allocated for memory entries always grows, and will never really be freed\r
- For example, if the current boot uses 2000 memory map entries at the maximum point, but\r
- ends up with only 50 at the time the OS is booted, then the memory associated with the 1950\r
- memory map entries is still allocated from EfiBootServicesMemory.\r
+ Called to initialize the memory map and add descriptors to\r
+ the current descriptor list.\r
+ The first descriptor that is added must be general usable\r
+ memory as the addition allocates heap.\r
\r
+ @param Type The type of memory to add\r
+ @param Start The starting address in the memory range Must be\r
+ page aligned\r
+ @param NumberOfPages The number of pages in the range\r
+ @param Attribute Attributes of the memory to add\r
\r
- @return The Memory map descriptor dequed from the mFreeMemoryMapEntryList\r
+ @return None. The range is added to the memory map\r
\r
**/\r
-MEMORY_MAP *\r
-AllocateMemoryMapEntry (\r
- VOID\r
+VOID\r
+CoreAddMemoryDescriptor (\r
+ IN EFI_MEMORY_TYPE Type,\r
+ IN EFI_PHYSICAL_ADDRESS Start,\r
+ IN UINT64 NumberOfPages,\r
+ IN UINT64 Attribute\r
)\r
{\r
- MEMORY_MAP* FreeDescriptorEntries;\r
- MEMORY_MAP* Entry;\r
- UINTN Index;\r
- \r
- if (IsListEmpty (&mFreeMemoryMapEntryList)) {\r
- // \r
- // The list is empty, to allocate one page to refuel the list\r
+ EFI_PHYSICAL_ADDRESS End;\r
+ EFI_STATUS Status;\r
+ UINTN Index;\r
+ UINTN FreeIndex;\r
+\r
+ if ((Start & EFI_PAGE_MASK) != 0) {\r
+ return;\r
+ }\r
+\r
+ if (Type >= EfiMaxMemoryType && Type <= 0x7fffffff) {\r
+ return;\r
+ }\r
+\r
+ CoreAcquireMemoryLock ();\r
+ End = Start + LShiftU64 (NumberOfPages, EFI_PAGE_SHIFT) - 1;\r
+ CoreAddRange (Type, Start, End, Attribute);\r
+ CoreFreeMemoryMapStack ();\r
+ CoreReleaseMemoryLock ();\r
+\r
+ //\r
+ // Check to see if the statistics for the different memory types have already been established\r
+ //\r
+ if (mMemoryTypeInformationInitialized) {\r
+ return;\r
+ }\r
+\r
+ //\r
+ // Loop through each memory type in the order specified by the gMemoryTypeInformation[] array\r
+ //\r
+ for (Index = 0; gMemoryTypeInformation[Index].Type != EfiMaxMemoryType; Index++) {\r
//\r
- FreeDescriptorEntries = CoreAllocatePoolPages (EfiBootServicesData, EFI_SIZE_TO_PAGES(DEFAULT_PAGE_ALLOCATION), DEFAULT_PAGE_ALLOCATION);\r
- if(FreeDescriptorEntries != NULL) {\r
+ // Make sure the memory type in the gMemoryTypeInformation[] array is valid\r
+ //\r
+ Type = (EFI_MEMORY_TYPE) (gMemoryTypeInformation[Index].Type);\r
+ if (Type < 0 || Type > EfiMaxMemoryType) {\r
+ continue;\r
+ }\r
+\r
+ if (gMemoryTypeInformation[Index].NumberOfPages != 0) {\r
//\r
- // Enque the free memmory map entries into the list\r
+ // Allocate pages for the current memory type from the top of available memory\r
//\r
- for (Index = 0; Index< DEFAULT_PAGE_ALLOCATION / sizeof(MEMORY_MAP); Index++) {\r
- FreeDescriptorEntries[Index].Signature = MEMORY_MAP_SIGNATURE;\r
- InsertTailList (&mFreeMemoryMapEntryList, &FreeDescriptorEntries[Index].Link);\r
- } \r
- } else {\r
- return NULL;\r
+ Status = CoreAllocatePages (\r
+ AllocateAnyPages,\r
+ Type,\r
+ gMemoryTypeInformation[Index].NumberOfPages,\r
+ &mMemoryTypeStatistics[Type].BaseAddress\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ //\r
+ // If an error occurs allocating the pages for the current memory type, then\r
+ // free all the pages allocates for the previous memory types and return. This\r
+ // operation with be retied when/if more memory is added to the system\r
+ //\r
+ for (FreeIndex = 0; FreeIndex < Index; FreeIndex++) {\r
+ //\r
+ // Make sure the memory type in the gMemoryTypeInformation[] array is valid\r
+ //\r
+ Type = (EFI_MEMORY_TYPE) (gMemoryTypeInformation[FreeIndex].Type);\r
+ if (Type < 0 || Type > EfiMaxMemoryType) {\r
+ continue;\r
+ }\r
+\r
+ if (gMemoryTypeInformation[FreeIndex].NumberOfPages != 0) {\r
+ CoreFreePages (\r
+ mMemoryTypeStatistics[Type].BaseAddress,\r
+ gMemoryTypeInformation[FreeIndex].NumberOfPages\r
+ );\r
+ mMemoryTypeStatistics[Type].BaseAddress = 0;\r
+ mMemoryTypeStatistics[Type].MaximumAddress = MAX_ADDRESS;\r
+ }\r
+ }\r
+ return;\r
+ }\r
+\r
+ //\r
+ // Compute the address at the top of the current statistics\r
+ //\r
+ mMemoryTypeStatistics[Type].MaximumAddress =\r
+ mMemoryTypeStatistics[Type].BaseAddress +\r
+ LShiftU64 (gMemoryTypeInformation[Index].NumberOfPages, EFI_PAGE_SHIFT) - 1;\r
+\r
+ //\r
+ // If the current base address is the lowest address so far, then update the default\r
+ // maximum address\r
+ //\r
+ if (mMemoryTypeStatistics[Type].BaseAddress < mDefaultMaximumAddress) {\r
+ mDefaultMaximumAddress = mMemoryTypeStatistics[Type].BaseAddress - 1;\r
+ }\r
}\r
}\r
+\r
//\r
- // dequeue the first descriptor from the list\r
+ // There was enough system memory for all the the memory types were allocated. So,\r
+ // those memory areas can be freed for future allocations, and all future memory\r
+ // allocations can occur within their respective bins\r
//\r
- Entry = CR (mFreeMemoryMapEntryList.ForwardLink, MEMORY_MAP, Link, MEMORY_MAP_SIGNATURE);\r
- RemoveEntryList (&Entry->Link);\r
- \r
- return Entry;\r
-} \r
+ for (Index = 0; gMemoryTypeInformation[Index].Type != EfiMaxMemoryType; Index++) {\r
+ //\r
+ // Make sure the memory type in the gMemoryTypeInformation[] array is valid\r
+ //\r
+ Type = (EFI_MEMORY_TYPE) (gMemoryTypeInformation[Index].Type);\r
+ if (Type < 0 || Type > EfiMaxMemoryType) {\r
+ continue;\r
+ }\r
+\r
+ if (gMemoryTypeInformation[Index].NumberOfPages != 0) {\r
+ CoreFreePages (\r
+ mMemoryTypeStatistics[Type].BaseAddress,\r
+ gMemoryTypeInformation[Index].NumberOfPages\r
+ );\r
+ mMemoryTypeStatistics[Type].NumberOfPages = gMemoryTypeInformation[Index].NumberOfPages;\r
+ gMemoryTypeInformation[Index].NumberOfPages = 0;\r
+ }\r
+ }\r
+\r
+ //\r
+ // If the number of pages reserved for a memory type is 0, then all allocations for that type\r
+ // should be in the default range.\r
+ //\r
+ for (Type = (EFI_MEMORY_TYPE) 0; Type < EfiMaxMemoryType; Type++) {\r
+ for (Index = 0; gMemoryTypeInformation[Index].Type != EfiMaxMemoryType; Index++) {\r
+ if (Type == (EFI_MEMORY_TYPE)gMemoryTypeInformation[Index].Type) {\r
+ mMemoryTypeStatistics[Type].InformationIndex = Index;\r
+ }\r
+ }\r
+ mMemoryTypeStatistics[Type].CurrentNumberOfPages = 0;\r
+ if (mMemoryTypeStatistics[Type].MaximumAddress == MAX_ADDRESS) {\r
+ mMemoryTypeStatistics[Type].MaximumAddress = mDefaultMaximumAddress;\r
+ }\r
+ }\r
+\r
+ mMemoryTypeInformationInitialized = TRUE;\r
+}\r
\r
\r
/**\r
Internal function. Converts a memory range to the specified type.\r
The range must exist in the memory map.\r
\r
- @param Start The first address of the range Must be page \r
- aligned \r
- @param NumberOfPages The number of pages to convert \r
- @param NewType The new type for the memory range \r
+ @param Start The first address of the range Must be page\r
+ aligned\r
+ @param NumberOfPages The number of pages to convert\r
+ @param NewType The new type for the memory range\r
\r
- @retval EFI_INVALID_PARAMETER Invalid parameter \r
- @retval EFI_NOT_FOUND Could not find a descriptor cover the specified \r
- range or convertion not allowed. \r
- @retval EFI_SUCCESS Successfully converts the memory range to the \r
+ @retval EFI_INVALID_PARAMETER Invalid parameter\r
+ @retval EFI_NOT_FOUND Could not find a descriptor cover the specified\r
+ range or convertion not allowed.\r
+ @retval EFI_SUCCESS Successfully converts the memory range to the\r
specified type.\r
\r
**/\r
// Debug code - verify conversion is allowed\r
//\r
if (!(NewType == EfiConventionalMemory ? 1 : 0) ^ (Entry->Type == EfiConventionalMemory ? 1 : 0)) {\r
- DEBUG ((DEBUG_ERROR , "ConvertPages: Incompatible memory types\n"));\r
+ DEBUG ((DEBUG_ERROR | DEBUG_PAGE, "ConvertPages: Incompatible memory types\n"));\r
return EFI_NOT_FOUND;\r
- } \r
+ }\r
\r
//\r
// Update counters for the number of pages allocated to each memory type\r
//\r
if (Entry->Type >= 0 && Entry->Type < EfiMaxMemoryType) {\r
- if (Start >= mMemoryTypeStatistics[Entry->Type].BaseAddress && \r
+ if (Start >= mMemoryTypeStatistics[Entry->Type].BaseAddress &&\r
Start <= mMemoryTypeStatistics[Entry->Type].MaximumAddress) {\r
if (NumberOfPages > mMemoryTypeStatistics[Entry->Type].CurrentNumberOfPages) {\r
mMemoryTypeStatistics[Entry->Type].CurrentNumberOfPages = 0;\r
if (NewType >= 0 && NewType < EfiMaxMemoryType) {\r
if (Start >= mMemoryTypeStatistics[NewType].BaseAddress && Start <= mMemoryTypeStatistics[NewType].MaximumAddress) {\r
mMemoryTypeStatistics[NewType].CurrentNumberOfPages += NumberOfPages;\r
- if (mMemoryTypeStatistics[NewType].CurrentNumberOfPages > \r
+ if (mMemoryTypeStatistics[NewType].CurrentNumberOfPages >\r
gMemoryTypeInformation[mMemoryTypeStatistics[NewType].InformationIndex].NumberOfPages) {\r
gMemoryTypeInformation[mMemoryTypeStatistics[NewType].InformationIndex].NumberOfPages = (UINT32)mMemoryTypeStatistics[NewType].CurrentNumberOfPages;\r
}\r
// Pull range out of descriptor\r
//\r
if (Entry->Start == Start) {\r
- \r
+\r
//\r
// Clip start\r
//\r
Entry->Start = RangeEnd + 1;\r
\r
} else if (Entry->End == RangeEnd) {\r
- \r
+\r
//\r
// Clip end\r
//\r
//\r
// Pull it out of the center, clip current\r
//\r
- \r
+\r
//\r
// Add a new one\r
//\r
}\r
\r
//\r
- // The new range inherits the same Attribute as the Entry \r
+ // The new range inherits the same Attribute as the Entry\r
//it is being cut out of\r
//\r
Attribute = Entry->Attribute;\r
RemoveMemoryMapEntry (Entry);\r
Entry = NULL;\r
}\r
- \r
+\r
//\r
// Add our new range in\r
//\r
Internal function. Finds a consecutive free page range below\r
the requested address.\r
\r
- @param MaxAddress The address that the range must be below \r
- @param NumberOfPages Number of pages needed \r
- @param NewType The type of memory the range is going to be \r
- turned into \r
- @param Alignment Bits to align with \r
+ @param MaxAddress The address that the range must be below\r
+ @param NumberOfPages Number of pages needed\r
+ @param NewType The type of memory the range is going to be\r
+ turned into\r
+ @param Alignment Bits to align with\r
\r
@return The base address of the range, or 0 if the range was not found\r
\r
}\r
\r
if ((MaxAddress & EFI_PAGE_MASK) != EFI_PAGE_MASK) {\r
- \r
+\r
//\r
// If MaxAddress is not aligned to the end of a page\r
//\r
- \r
+\r
//\r
// Change MaxAddress to be 1 page lower\r
//\r
MaxAddress -= (EFI_PAGE_MASK + 1);\r
- \r
+\r
//\r
// Set MaxAddress to a page boundary\r
//\r
MaxAddress &= ~EFI_PAGE_MASK;\r
- \r
+\r
//\r
// Set MaxAddress to end of the page\r
//\r
\r
for (Link = gMemoryMap.ForwardLink; Link != &gMemoryMap; Link = Link->ForwardLink) {\r
Entry = CR (Link, MEMORY_MAP, Link, MEMORY_MAP_SIGNATURE);\r
- \r
+\r
//\r
// If it's not a free entry, don't bother with it\r
//\r
DescEnd = ((DescEnd + 1) & (~(Alignment - 1))) - 1;\r
\r
//\r
- // Compute the number of bytes we can used from this \r
+ // Compute the number of bytes we can used from this\r
// descriptor, and see it's enough to satisfy the request\r
//\r
DescNumberOfBytes = DescEnd - DescStart + 1;\r
Target = DescEnd;\r
}\r
}\r
- } \r
+ }\r
\r
//\r
// If this is a grow down, adjust target to be the allocation base\r
Internal function. Finds a consecutive free page range below\r
the requested address\r
\r
- @param MaxAddress The address that the range must be below \r
- @param NoPages Number of pages needed \r
- @param NewType The type of memory the range is going to be \r
- turned into \r
- @param Alignment Bits to align with \r
+ @param MaxAddress The address that the range must be below\r
+ @param NoPages Number of pages needed\r
+ @param NewType The type of memory the range is going to be\r
+ turned into\r
+ @param Alignment Bits to align with\r
\r
@return The base address of the range, or 0 if the range was not found.\r
\r
/**\r
Allocates pages from the memory map.\r
\r
- @param Type The type of allocation to perform \r
- @param MemoryType The type of memory to turn the allocated pages \r
- into \r
- @param NumberOfPages The number of pages to allocate \r
- @param Memory A pointer to receive the base allocated memory \r
- address \r
+ @param Type The type of allocation to perform\r
+ @param MemoryType The type of memory to turn the allocated pages\r
+ into\r
+ @param NumberOfPages The number of pages to allocate\r
+ @param Memory A pointer to receive the base allocated memory\r
+ address\r
\r
@return Status. On success, Memory is filled in with the base address allocated\r
- @retval EFI_INVALID_PARAMETER Parameters violate checking rules defined in \r
- spec. \r
- @retval EFI_NOT_FOUND Could not allocate pages match the requirement. \r
- @retval EFI_OUT_OF_RESOURCES No enough pages to allocate. \r
+ @retval EFI_INVALID_PARAMETER Parameters violate checking rules defined in\r
+ spec.\r
+ @retval EFI_NOT_FOUND Could not allocate pages match the requirement.\r
+ @retval EFI_OUT_OF_RESOURCES No enough pages to allocate.\r
@retval EFI_SUCCESS Pages successfully allocated.\r
\r
**/\r
NumberOfPages &= ~(EFI_SIZE_TO_PAGES (Alignment) - 1);\r
\r
//\r
- // If this is for below a particular address, then \r
+ // If this is for below a particular address, then\r
//\r
Start = *Memory;\r
- \r
+\r
//\r
// The max address is the max natively addressable address for the processor\r
//\r
- MaxAddress = EFI_MAX_ADDRESS;\r
- \r
+ MaxAddress = MAX_ADDRESS;\r
+\r
if (Type == AllocateMaxAddress) {\r
MaxAddress = Start;\r
}\r
\r
CoreAcquireMemoryLock ();\r
- \r
+\r
//\r
// If not a specific address, then find an address to allocate\r
//\r
/**\r
Frees previous allocated pages.\r
\r
- @param Memory Base address of memory being freed \r
- @param NumberOfPages The number of pages to free \r
+ @param Memory Base address of memory being freed\r
+ @param NumberOfPages The number of pages to free\r
\r
- @retval EFI_NOT_FOUND Could not find the entry that covers the range \r
- @retval EFI_INVALID_PARAMETER Address not aligned \r
+ @retval EFI_NOT_FOUND Could not find the entry that covers the range\r
+ @retval EFI_INVALID_PARAMETER Address not aligned\r
@return EFI_SUCCESS -Pages successfully freed.\r
\r
**/\r
-EFI_STATUS \r
+EFI_STATUS\r
EFIAPI\r
CoreFreePages (\r
IN EFI_PHYSICAL_ADDRESS Memory,\r
//\r
// Destroy the contents\r
//\r
- if (Memory < EFI_MAX_ADDRESS) {\r
+ if (Memory < MAX_ADDRESS) {\r
DEBUG_CLEAR_MEMORY ((VOID *)(UINTN)Memory, NumberOfPages << EFI_PAGE_SHIFT);\r
}\r
- \r
+\r
return Status;\r
}\r
\r
This function returns a copy of the current memory map. The map is an array of\r
memory descriptors, each of which describes a contiguous block of memory.\r
\r
- @param MemoryMapSize A pointer to the size, in bytes, of the \r
- MemoryMap buffer. On input, this is the size of \r
- the buffer allocated by the caller. On output, \r
- it is the size of the buffer returned by the \r
- firmware if the buffer was large enough, or the \r
- size of the buffer needed to contain the map if \r
- the buffer was too small. \r
- @param MemoryMap A pointer to the buffer in which firmware places \r
- the current memory map. \r
- @param MapKey A pointer to the location in which firmware \r
- returns the key for the current memory map. \r
- @param DescriptorSize A pointer to the location in which firmware \r
- returns the size, in bytes, of an individual \r
- EFI_MEMORY_DESCRIPTOR. \r
- @param DescriptorVersion A pointer to the location in which firmware \r
- returns the version number associated with the \r
- EFI_MEMORY_DESCRIPTOR. \r
-\r
- @retval EFI_SUCCESS The memory map was returned in the MemoryMap \r
- buffer. \r
- @retval EFI_BUFFER_TOO_SMALL The MemoryMap buffer was too small. The current \r
- buffer size needed to hold the memory map is \r
- returned in MemoryMapSize. \r
+ @param MemoryMapSize A pointer to the size, in bytes, of the\r
+ MemoryMap buffer. On input, this is the size of\r
+ the buffer allocated by the caller. On output,\r
+ it is the size of the buffer returned by the\r
+ firmware if the buffer was large enough, or the\r
+ size of the buffer needed to contain the map if\r
+ the buffer was too small.\r
+ @param MemoryMap A pointer to the buffer in which firmware places\r
+ the current memory map.\r
+ @param MapKey A pointer to the location in which firmware\r
+ returns the key for the current memory map.\r
+ @param DescriptorSize A pointer to the location in which firmware\r
+ returns the size, in bytes, of an individual\r
+ EFI_MEMORY_DESCRIPTOR.\r
+ @param DescriptorVersion A pointer to the location in which firmware\r
+ returns the version number associated with the\r
+ EFI_MEMORY_DESCRIPTOR.\r
+\r
+ @retval EFI_SUCCESS The memory map was returned in the MemoryMap\r
+ buffer.\r
+ @retval EFI_BUFFER_TOO_SMALL The MemoryMap buffer was too small. The current\r
+ buffer size needed to hold the memory map is\r
+ returned in MemoryMapSize.\r
@retval EFI_INVALID_PARAMETER One of the parameters has an invalid value.\r
\r
**/\r
)\r
{\r
EFI_STATUS Status;\r
- UINTN Size; \r
- UINTN BufferSize; \r
+ UINTN Size;\r
+ UINTN BufferSize;\r
UINTN NumberOfRuntimeEntries;\r
LIST_ENTRY *Link;\r
- MEMORY_MAP *Entry; \r
- EFI_GCD_MAP_ENTRY *GcdMapEntry; \r
+ MEMORY_MAP *Entry;\r
+ EFI_GCD_MAP_ENTRY *GcdMapEntry;\r
EFI_MEMORY_TYPE Type;\r
\r
//\r
if (MemoryMapSize == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
- \r
+\r
CoreAcquireGcdMemoryLock ();\r
- \r
+\r
//\r
// Count the number of Reserved and MMIO entries that are marked for runtime use\r
//\r
if (DescriptorSize != NULL) {\r
*DescriptorSize = Size;\r
}\r
- \r
+\r
if (DescriptorVersion != NULL) {\r
*DescriptorVersion = EFI_MEMORY_DESCRIPTOR_VERSION;\r
}\r
MemoryMap->NumberOfPages = RShiftU64 (Entry->End - Entry->Start + 1, EFI_PAGE_SHIFT);\r
//\r
// If the memory type is EfiConventionalMemory, then determine if the range is part of a\r
- // memory type bin and needs to be converted to the same memory type as the rest of the \r
- // memory type bin in order to minimize EFI Memory Map changes across reboots. This \r
+ // memory type bin and needs to be converted to the same memory type as the rest of the\r
+ // memory type bin in order to minimize EFI Memory Map changes across reboots. This\r
// improves the chances for a successful S4 resume in the presence of minor page allocation\r
// differences across reboots.\r
//\r
if (mMemoryTypeStatistics[MemoryMap->Type].Runtime) {\r
MemoryMap->Attribute |= EFI_MEMORY_RUNTIME;\r
}\r
- \r
- MemoryMap = NextMemoryDescriptor (MemoryMap, Size);\r
+\r
+ MemoryMap = NEXT_MEMORY_DESCRIPTOR (MemoryMap, Size);\r
}\r
\r
for (Link = mGcdMemorySpaceMap.ForwardLink; Link != &mGcdMemorySpaceMap; Link = Link->ForwardLink) {\r
if ((GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypeReserved) ||\r
(GcdMapEntry->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo)) {\r
if ((GcdMapEntry->Attributes & EFI_MEMORY_RUNTIME) == EFI_MEMORY_RUNTIME) {\r
- \r
+ // \r
+ // Create EFI_MEMORY_DESCRIPTOR for every Reserved and MMIO GCD entries\r
+ // that are marked for runtime use\r
+ //\r
MemoryMap->PhysicalStart = GcdMapEntry->BaseAddress;\r
MemoryMap->VirtualStart = 0;\r
MemoryMap->NumberOfPages = RShiftU64 ((GcdMapEntry->EndAddress - GcdMapEntry->BaseAddress + 1), EFI_PAGE_SHIFT);\r
}\r
}\r
\r
- MemoryMap = NextMemoryDescriptor (MemoryMap, Size);\r
+ MemoryMap = NEXT_MEMORY_DESCRIPTOR (MemoryMap, Size);\r
}\r
}\r
}\r
- \r
+\r
Status = EFI_SUCCESS;\r
\r
Done:\r
\r
CoreReleaseMemoryLock ();\r
- \r
+\r
CoreReleaseGcdMemoryLock ();\r
- \r
- // \r
- // Update the map key finally \r
- // \r
+\r
+ //\r
+ // Update the map key finally\r
+ //\r
if (MapKey != NULL) {\r
*MapKey = mMemoryMapKey;\r
}\r
- \r
+\r
*MemoryMapSize = BufferSize;\r
- \r
+\r
return Status;\r
}\r
\r
Internal function. Used by the pool functions to allocate pages\r
to back pool allocation requests.\r
\r
- @param PoolType The type of memory for the new pool pages \r
- @param NumberOfPages No of pages to allocate \r
- @param Alignment Bits to align. \r
+ @param PoolType The type of memory for the new pool pages\r
+ @param NumberOfPages No of pages to allocate\r
+ @param Alignment Bits to align.\r
\r
@return The allocated memory, or NULL\r
\r
//\r
// Find the pages to convert\r
//\r
- Start = FindFreePages (EFI_MAX_ADDRESS, NumberOfPages, PoolType, Alignment);\r
+ Start = FindFreePages (MAX_ADDRESS, NumberOfPages, PoolType, Alignment);\r
\r
//\r
// Convert it to boot services data\r
/**\r
Internal function. Frees pool pages allocated via AllocatePoolPages ()\r
\r
- @param Memory The base address to free \r
+ @param Memory The base address to free\r
@param NumberOfPages The number of pages to free\r
\r
**/\r
Make sure the memory map is following all the construction rules,\r
it is the last time to check memory map error before exit boot services.\r
\r
- @param MapKey Memory map key \r
+ @param MapKey Memory map key\r
\r
- @retval EFI_INVALID_PARAMETER Memory map not consistent with construction \r
- rules. \r
+ @retval EFI_INVALID_PARAMETER Memory map not consistent with construction\r
+ rules.\r
@retval EFI_SUCCESS Valid memory map.\r
\r
**/\r
\r
for (Link = gMemoryMap.ForwardLink; Link != &gMemoryMap; Link = Link->ForwardLink) {\r
Entry = CR(Link, MEMORY_MAP, Link, MEMORY_MAP_SIGNATURE);\r
- if (Entry->Attribute & EFI_MEMORY_RUNTIME) { \r
+ if ((Entry->Attribute & EFI_MEMORY_RUNTIME) != 0) {\r
if (Entry->Type == EfiACPIReclaimMemory || Entry->Type == EfiACPIMemoryNVS) {\r
- DEBUG((DEBUG_ERROR, "ExitBootServices: ACPI memory entry has RUNTIME attribute set.\n"));\r
- CoreReleaseMemoryLock ();\r
- return EFI_INVALID_PARAMETER;\r
+ DEBUG((DEBUG_ERROR | DEBUG_PAGE, "ExitBootServices: ACPI memory entry has RUNTIME attribute set.\n"));\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
}\r
- if (Entry->Start & (EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT - 1)) {\r
- DEBUG((DEBUG_ERROR, "ExitBootServices: A RUNTIME memory entry is not on a proper alignment.\n"));\r
- CoreReleaseMemoryLock ();\r
- return EFI_INVALID_PARAMETER;\r
+ if ((Entry->Start & (EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT - 1)) != 0) {\r
+ DEBUG((DEBUG_ERROR | DEBUG_PAGE, "ExitBootServices: A RUNTIME memory entry is not on a proper alignment.\n"));\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
}\r
- if ((Entry->End + 1) & (EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT - 1)) {\r
- DEBUG((DEBUG_ERROR, "ExitBootServices: A RUNTIME memory entry is not on a proper alignment.\n"));\r
- CoreReleaseMemoryLock ();\r
- return EFI_INVALID_PARAMETER;\r
+ if (((Entry->End + 1) & (EFI_ACPI_RUNTIME_PAGE_ALLOCATION_ALIGNMENT - 1)) != 0) {\r
+ DEBUG((DEBUG_ERROR | DEBUG_PAGE, "ExitBootServices: A RUNTIME memory entry is not on a proper alignment.\n"));\r
+ Status = EFI_INVALID_PARAMETER;\r
+ goto Done;\r
}\r
}\r
}\r
Status = EFI_INVALID_PARAMETER;\r
}\r
\r
+Done:\r
CoreReleaseMemoryLock ();\r
\r
return Status;\r
projects / mirror_edk2.git / blobdiff