dasharo/edk2-upstream
0
0
Fork 0
mirror of https://github.com/Dasharo/edk2-upstream.git synced 2026-03-06 15:03:57 -08:00
Code Issues Packages Projects Releases Wiki Activity

EmbeddedPkg/PrePiMemoryAllocationLib: Update memory hob page alignment

Browse Source 
When allocating Runtime memory the MemoryAllocation HOB's length needs
to meet the alignment requirements of Runtime memory. On AARCH64
architectures this alignment is not the default of 4KB.
Instead it is set by the RUNTIME_PAGE_ALLOCATION_GRANULARITY
definition, which is 64KB.

This change enforces the RUNTIME alignment as part of generating the
MemoryAllocationHob for runtime memory types.

Signed-off-by: Antaeus Kleinert-Strand <antklein@microsoft.com>
This commit is contained in:
Antaeus Kleinert-Strand
2026-01-21 09:48:39 -08:00
committed by mergify[bot]
parent ade5fdb8e3
commit 756d5fb0ab
1 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
+39 -10
View File
@@ -24,11 +24,40 @@ InternalAllocatePages (
{
EFI_PEI_HOB_POINTERS Hob;
EFI_PHYSICAL_ADDRESS NewTop;
UINTN PagesSize;
Hob.Raw = GetHobList ();
NewTop = Hob.HandoffInformationTable->EfiFreeMemoryTop & ~(EFI_PHYSICAL_ADDRESS)EFI_PAGE_MASK;
NewTop -= Pages * EFI_PAGE_SIZE;
if (Pages == 0) {
return NULL;
}
//
// Calculate the new top of memory based on the memory type
//
switch (MemoryType) {
case EfiReservedMemoryType:
case EfiRuntimeServicesCode:
case EfiRuntimeServicesData:
case EfiACPIMemoryNVS:
PagesSize = ALIGN_VALUE (Pages, EFI_SIZE_TO_PAGES (RUNTIME_PAGE_ALLOCATION_GRANULARITY)) * EFI_PAGE_SIZE;
NewTop = Hob.HandoffInformationTable->EfiFreeMemoryTop & ~(EFI_PHYSICAL_ADDRESS)(RUNTIME_PAGE_ALLOCATION_GRANULARITY - 1);
break;
default:
PagesSize = Pages * EFI_PAGE_SIZE;
NewTop = Hob.HandoffInformationTable->EfiFreeMemoryTop & ~(EFI_PHYSICAL_ADDRESS)EFI_PAGE_MASK;
break;
}
//
// Verify that the subtraction does not underflow NewTop
//
if (PagesSize > NewTop) {
return NULL;
}
NewTop -= PagesSize;
//
// Verify that there is sufficient memory to satisfy the allocation
@@ -47,7 +76,7 @@ InternalAllocatePages (
//
BuildMemoryAllocationHob (
Hob.HandoffInformationTable->EfiFreeMemoryTop,
Pages * EFI_PAGE_SIZE,
PagesSize,
MemoryType
);
@@ -80,9 +109,9 @@ AllocatePages (
Allocates one or more 4KB pages of type EfiRuntimeServicesData.
Allocates the number of 4KB pages of type EfiRuntimeServicesData and returns a pointer to the
allocated buffer. The buffer returned is aligned on a 4KB boundary. If Pages is 0, then NULL
is returned. If there is not enough memory remaining to satisfy the request, then NULL is
returned.
allocated buffer. The buffer returned is aligned on a RUNTIME_PAGE_ALLOCATION_GRANULARITY boundary.
If Pages is 0, then NULL is returned. If there is not enough memory remaining to satisfy the request,
then NULL is returned.
@param Pages The number of 4 KB pages to allocate.
@@ -101,10 +130,10 @@ AllocateRuntimePages (
/**
Allocates one or more 4KB pages of type EfiReservedMemoryType.
Allocates the number of 4KB pages of type EfiReservedMemoryTypes and returns a pointer to the
allocated buffer. The buffer returned is aligned on a 4KB boundary. If Pages is 0, then NULL
is returned. If there is not enough memory remaining to satisfy the request, then NULL is
returned.
Allocates the number of 4KB pages of type EfiReservedMemoryType and returns a pointer to the
allocated buffer. The buffer returned is aligned on a RUNTIME_PAGE_ALLOCATION_GRANULARITY boundary.
If Pages is 0, then NULL is returned. If there is not enough memory remaining to satisfy the request,
then NULL is returned.
@param Pages The number of 4 KB pages to allocate.