ArmPlatformPkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the ArmPlatformPkg package Cc: Andrew Fish <afish@apple.com> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Andrew Fish <afish@apple.com>
This commit is contained in:
committed by
mergify[bot]
parent
429309e0c6
commit
40b0b23ed3
@@ -26,12 +26,11 @@ InitMmu (
|
||||
IN ARM_MEMORY_REGION_DESCRIPTOR *MemoryTable
|
||||
)
|
||||
{
|
||||
VOID *TranslationTableBase;
|
||||
UINTN TranslationTableSize;
|
||||
RETURN_STATUS Status;
|
||||
|
||||
VOID *TranslationTableBase;
|
||||
UINTN TranslationTableSize;
|
||||
RETURN_STATUS Status;
|
||||
|
||||
//Note: Because we called PeiServicesInstallPeiMemory() before to call InitMmu() the MMU Page Table resides in
|
||||
// Note: Because we called PeiServicesInstallPeiMemory() before to call InitMmu() the MMU Page Table resides in
|
||||
// DRAM (even at the top of DRAM as it is the first permanent memory allocation)
|
||||
Status = ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize);
|
||||
if (EFI_ERROR (Status)) {
|
||||
@@ -58,18 +57,18 @@ Returns:
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
MemoryPeim (
|
||||
IN EFI_PHYSICAL_ADDRESS UefiMemoryBase,
|
||||
IN UINT64 UefiMemorySize
|
||||
IN EFI_PHYSICAL_ADDRESS UefiMemoryBase,
|
||||
IN UINT64 UefiMemorySize
|
||||
)
|
||||
{
|
||||
ARM_MEMORY_REGION_DESCRIPTOR *MemoryTable;
|
||||
EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttributes;
|
||||
UINT64 ResourceLength;
|
||||
EFI_PEI_HOB_POINTERS NextHob;
|
||||
EFI_PHYSICAL_ADDRESS FdTop;
|
||||
EFI_PHYSICAL_ADDRESS SystemMemoryTop;
|
||||
EFI_PHYSICAL_ADDRESS ResourceTop;
|
||||
BOOLEAN Found;
|
||||
ARM_MEMORY_REGION_DESCRIPTOR *MemoryTable;
|
||||
EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttributes;
|
||||
UINT64 ResourceLength;
|
||||
EFI_PEI_HOB_POINTERS NextHob;
|
||||
EFI_PHYSICAL_ADDRESS FdTop;
|
||||
EFI_PHYSICAL_ADDRESS SystemMemoryTop;
|
||||
EFI_PHYSICAL_ADDRESS ResourceTop;
|
||||
BOOLEAN Found;
|
||||
|
||||
// Get Virtual Memory Map from the Platform Library
|
||||
ArmPlatformGetVirtualMemoryMap (&MemoryTable);
|
||||
@@ -81,18 +80,18 @@ MemoryPeim (
|
||||
// Now, the permanent memory has been installed, we can call AllocatePages()
|
||||
//
|
||||
ResourceAttributes = (
|
||||
EFI_RESOURCE_ATTRIBUTE_PRESENT |
|
||||
EFI_RESOURCE_ATTRIBUTE_INITIALIZED |
|
||||
EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |
|
||||
EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |
|
||||
EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |
|
||||
EFI_RESOURCE_ATTRIBUTE_TESTED
|
||||
);
|
||||
EFI_RESOURCE_ATTRIBUTE_PRESENT |
|
||||
EFI_RESOURCE_ATTRIBUTE_INITIALIZED |
|
||||
EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |
|
||||
EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |
|
||||
EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |
|
||||
EFI_RESOURCE_ATTRIBUTE_TESTED
|
||||
);
|
||||
|
||||
//
|
||||
// Check if the resource for the main system memory has been declared
|
||||
//
|
||||
Found = FALSE;
|
||||
Found = FALSE;
|
||||
NextHob.Raw = GetHobList ();
|
||||
while ((NextHob.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, NextHob.Raw)) != NULL) {
|
||||
if ((NextHob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) &&
|
||||
@@ -102,17 +101,18 @@ MemoryPeim (
|
||||
Found = TRUE;
|
||||
break;
|
||||
}
|
||||
|
||||
NextHob.Raw = GET_NEXT_HOB (NextHob);
|
||||
}
|
||||
|
||||
if (!Found) {
|
||||
// Reserved the memory space occupied by the firmware volume
|
||||
BuildResourceDescriptorHob (
|
||||
EFI_RESOURCE_SYSTEM_MEMORY,
|
||||
ResourceAttributes,
|
||||
PcdGet64 (PcdSystemMemoryBase),
|
||||
PcdGet64 (PcdSystemMemorySize)
|
||||
);
|
||||
EFI_RESOURCE_SYSTEM_MEMORY,
|
||||
ResourceAttributes,
|
||||
PcdGet64 (PcdSystemMemoryBase),
|
||||
PcdGet64 (PcdSystemMemorySize)
|
||||
);
|
||||
}
|
||||
|
||||
//
|
||||
@@ -120,7 +120,7 @@ MemoryPeim (
|
||||
//
|
||||
|
||||
SystemMemoryTop = (EFI_PHYSICAL_ADDRESS)PcdGet64 (PcdSystemMemoryBase) + (EFI_PHYSICAL_ADDRESS)PcdGet64 (PcdSystemMemorySize);
|
||||
FdTop = (EFI_PHYSICAL_ADDRESS)PcdGet64 (PcdFdBaseAddress) + (EFI_PHYSICAL_ADDRESS)PcdGet32 (PcdFdSize);
|
||||
FdTop = (EFI_PHYSICAL_ADDRESS)PcdGet64 (PcdFdBaseAddress) + (EFI_PHYSICAL_ADDRESS)PcdGet32 (PcdFdSize);
|
||||
|
||||
// EDK2 does not have the concept of boot firmware copied into DRAM. To avoid the DXE
|
||||
// core to overwrite this area we must create a memory allocation HOB for the region,
|
||||
@@ -136,27 +136,31 @@ MemoryPeim (
|
||||
(FdTop <= NextHob.ResourceDescriptor->PhysicalStart + NextHob.ResourceDescriptor->ResourceLength))
|
||||
{
|
||||
ResourceAttributes = NextHob.ResourceDescriptor->ResourceAttribute;
|
||||
ResourceLength = NextHob.ResourceDescriptor->ResourceLength;
|
||||
ResourceTop = NextHob.ResourceDescriptor->PhysicalStart + ResourceLength;
|
||||
ResourceLength = NextHob.ResourceDescriptor->ResourceLength;
|
||||
ResourceTop = NextHob.ResourceDescriptor->PhysicalStart + ResourceLength;
|
||||
|
||||
if (PcdGet64 (PcdFdBaseAddress) == NextHob.ResourceDescriptor->PhysicalStart) {
|
||||
if (SystemMemoryTop != FdTop) {
|
||||
// Create the System Memory HOB for the firmware
|
||||
BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY,
|
||||
ResourceAttributes,
|
||||
PcdGet64 (PcdFdBaseAddress),
|
||||
PcdGet32 (PcdFdSize));
|
||||
BuildResourceDescriptorHob (
|
||||
EFI_RESOURCE_SYSTEM_MEMORY,
|
||||
ResourceAttributes,
|
||||
PcdGet64 (PcdFdBaseAddress),
|
||||
PcdGet32 (PcdFdSize)
|
||||
);
|
||||
|
||||
// Top of the FD is system memory available for UEFI
|
||||
NextHob.ResourceDescriptor->PhysicalStart += PcdGet32(PcdFdSize);
|
||||
NextHob.ResourceDescriptor->ResourceLength -= PcdGet32(PcdFdSize);
|
||||
NextHob.ResourceDescriptor->PhysicalStart += PcdGet32 (PcdFdSize);
|
||||
NextHob.ResourceDescriptor->ResourceLength -= PcdGet32 (PcdFdSize);
|
||||
}
|
||||
} else {
|
||||
// Create the System Memory HOB for the firmware
|
||||
BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY,
|
||||
ResourceAttributes,
|
||||
PcdGet64 (PcdFdBaseAddress),
|
||||
PcdGet32 (PcdFdSize));
|
||||
BuildResourceDescriptorHob (
|
||||
EFI_RESOURCE_SYSTEM_MEMORY,
|
||||
ResourceAttributes,
|
||||
PcdGet64 (PcdFdBaseAddress),
|
||||
PcdGet32 (PcdFdSize)
|
||||
);
|
||||
|
||||
// Update the HOB
|
||||
NextHob.ResourceDescriptor->ResourceLength = PcdGet64 (PcdFdBaseAddress) - NextHob.ResourceDescriptor->PhysicalStart;
|
||||
@@ -164,25 +168,30 @@ MemoryPeim (
|
||||
// If there is some memory available on the top of the FD then create a HOB
|
||||
if (FdTop < NextHob.ResourceDescriptor->PhysicalStart + ResourceLength) {
|
||||
// Create the System Memory HOB for the remaining region (top of the FD)
|
||||
BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY,
|
||||
ResourceAttributes,
|
||||
FdTop,
|
||||
ResourceTop - FdTop);
|
||||
BuildResourceDescriptorHob (
|
||||
EFI_RESOURCE_SYSTEM_MEMORY,
|
||||
ResourceAttributes,
|
||||
FdTop,
|
||||
ResourceTop - FdTop
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Mark the memory covering the Firmware Device as boot services data
|
||||
BuildMemoryAllocationHob (PcdGet64 (PcdFdBaseAddress),
|
||||
PcdGet32 (PcdFdSize),
|
||||
EfiBootServicesData);
|
||||
BuildMemoryAllocationHob (
|
||||
PcdGet64 (PcdFdBaseAddress),
|
||||
PcdGet32 (PcdFdSize),
|
||||
EfiBootServicesData
|
||||
);
|
||||
|
||||
Found = TRUE;
|
||||
break;
|
||||
}
|
||||
|
||||
NextHob.Raw = GET_NEXT_HOB (NextHob);
|
||||
}
|
||||
|
||||
ASSERT(Found);
|
||||
ASSERT (Found);
|
||||
}
|
||||
|
||||
// Build Memory Allocation Hob
|
||||
|
Reference in New Issue
Block a user