/** @file\r
*\r
-* Copyright (c) 2011, ARM Limited. All rights reserved.\r
+* Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
*\r
* This program and the accompanying materials\r
* are licensed and made available under the terms and conditions of the BSD License\r
\r
#include <PiPei.h>\r
\r
+#include <Library/ArmMmuLib.h>\r
#include <Library/ArmPlatformLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/HobLib.h>\r
#include <Library/MemoryAllocationLib.h>\r
#include <Library/PcdLib.h>\r
\r
-#include <Chipset/ArmV7.h>\r
-\r
VOID\r
BuildMemoryTypeInformationHob (\r
VOID\r
);\r
\r
+STATIC\r
VOID\r
InitMmu (\r
- VOID\r
+ IN ARM_MEMORY_REGION_DESCRIPTOR *MemoryTable\r
)\r
{\r
- ARM_MEMORY_REGION_DESCRIPTOR *MemoryTable;\r
+\r
VOID *TranslationTableBase;\r
UINTN TranslationTableSize;\r
-\r
- // Get Virtual Memory Map from the Platform Library\r
- ArmPlatformGetVirtualMemoryMap(&MemoryTable);\r
+ RETURN_STATUS Status;\r
\r
//Note: Because we called PeiServicesInstallPeiMemory() before to call InitMmu() the MMU Page Table resides in\r
// DRAM (even at the top of DRAM as it is the first permanent memory allocation)\r
- ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize);\r
+ Status = ArmConfigureMmu (MemoryTable, &TranslationTableBase, &TranslationTableSize);\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((EFI_D_ERROR, "Error: Failed to enable MMU\n"));\r
+ }\r
}\r
\r
/*++\r
IN UINT64 UefiMemorySize\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_RESOURCE_ATTRIBUTE_TYPE Attributes;\r
- ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR* EfiMemoryMap;\r
- UINTN Index;\r
- EFI_PHYSICAL_ADDRESS SystemMemoryTop;\r
+ ARM_MEMORY_REGION_DESCRIPTOR *MemoryTable;\r
+ EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttributes;\r
+ EFI_PEI_HOB_POINTERS NextHob;\r
+ BOOLEAN Found;\r
\r
- // Ensure PcdSystemMemorySize has been set\r
- ASSERT (PcdGet32 (PcdSystemMemorySize) != 0);\r
+ // Get Virtual Memory Map from the Platform Library\r
+ ArmPlatformGetVirtualMemoryMap (&MemoryTable);\r
\r
- SystemMemoryTop = (EFI_PHYSICAL_ADDRESS)((UINT32)PcdGet32 (PcdSystemMemoryBase) + (UINT32)PcdGet32 (PcdSystemMemorySize));\r
+ // Ensure PcdSystemMemorySize has been set\r
+ ASSERT (PcdGet64 (PcdSystemMemorySize) != 0);\r
\r
//\r
// Now, the permanent memory has been installed, we can call AllocatePages()\r
//\r
- Attributes = (\r
+ ResourceAttributes = (\r
EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
- EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |\r
EFI_RESOURCE_ATTRIBUTE_TESTED\r
);\r
\r
- // If it is not a standalone build we must reserved the space above the base address of the firmware volume\r
- if (!PcdGet32(PcdStandalone)) {\r
- // Check if firmware volume has not be copied at the top of DRAM then we must reserve the extra space\r
- // between the firmware and the top\r
- if (SystemMemoryTop != PcdGet32 (PcdNormalFdBaseAddress) + PcdGet32 (PcdNormalFdSize)) {\r
- BuildResourceDescriptorHob (\r
- EFI_RESOURCE_SYSTEM_MEMORY,\r
- Attributes & (~EFI_RESOURCE_ATTRIBUTE_TESTED),\r
- PcdGet32 (PcdNormalFdBaseAddress) + PcdGet32 (PcdNormalFdSize),\r
- SystemMemoryTop - (PcdGet32 (PcdNormalFdBaseAddress) + PcdGet32 (PcdNormalFdSize))\r
- );\r
+ //\r
+ // Check if the resource for the main system memory has been declared\r
+ //\r
+ Found = FALSE;\r
+ NextHob.Raw = GetHobList ();\r
+ while ((NextHob.Raw = GetNextHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, NextHob.Raw)) != NULL) {\r
+ if ((NextHob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) &&\r
+ (PcdGet64 (PcdSystemMemoryBase) >= NextHob.ResourceDescriptor->PhysicalStart) &&\r
+ (NextHob.ResourceDescriptor->PhysicalStart + NextHob.ResourceDescriptor->ResourceLength <= PcdGet64 (PcdSystemMemoryBase) + PcdGet64 (PcdSystemMemorySize)))\r
+ {\r
+ Found = TRUE;\r
+ break;\r
}\r
-\r
- // Reserved the memory space occupied by the firmware volume\r
- BuildResourceDescriptorHob (\r
- EFI_RESOURCE_SYSTEM_MEMORY,\r
- Attributes & (~EFI_RESOURCE_ATTRIBUTE_PRESENT),\r
- (UINT32)PcdGet32 (PcdNormalFdBaseAddress),\r
- (UINT32)PcdGet32 (PcdNormalFdSize)\r
- );\r
+ NextHob.Raw = GET_NEXT_HOB (NextHob);\r
}\r
\r
- // Check there is no overlap between UEFI and Fix Address Regions\r
- ASSERT (PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemoryFixRegionSize) <= UefiMemoryBase);\r
-\r
- // Reserved the UEFI Memory Region\r
- BuildResourceDescriptorHob (\r
- EFI_RESOURCE_SYSTEM_MEMORY,\r
- Attributes,\r
- UefiMemoryBase,\r
- UefiMemorySize\r
- );\r
-\r
- // Reserved the Fix Address Region\r
- BuildResourceDescriptorHob (\r
- EFI_RESOURCE_SYSTEM_MEMORY,\r
- Attributes,\r
- PcdGet32 (PcdSystemMemoryBase),\r
- PcdGet32 (PcdSystemMemoryFixRegionSize)\r
- );\r
-\r
- // Reserved the memory between UEFI and Fix Address regions\r
- if (PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemoryFixRegionSize) != UefiMemoryBase) {\r
+ if (!Found) {\r
+ // Reserved the memory space occupied by the firmware volume\r
BuildResourceDescriptorHob (\r
EFI_RESOURCE_SYSTEM_MEMORY,\r
- Attributes & (~EFI_RESOURCE_ATTRIBUTE_TESTED),\r
- PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemoryFixRegionSize),\r
- UefiMemoryBase - (PcdGet32 (PcdSystemMemoryBase) + PcdGet32 (PcdSystemMemoryFixRegionSize))\r
+ ResourceAttributes,\r
+ PcdGet64 (PcdSystemMemoryBase),\r
+ PcdGet64 (PcdSystemMemorySize)\r
);\r
}\r
\r
- // If a platform has system memory extensions, it can declare those in this function\r
- Status = ArmPlatformGetAdditionalSystemMemory (&EfiMemoryMap);\r
- if (!EFI_ERROR(Status)) {\r
- // Install the EFI Memory Map\r
- for (Index = 0; EfiMemoryMap[Index].ResourceAttribute != 0; Index++) {\r
- BuildResourceDescriptorHob (\r
- EFI_RESOURCE_SYSTEM_MEMORY,\r
- EfiMemoryMap[Index].ResourceAttribute,\r
- EfiMemoryMap[Index].PhysicalStart,\r
- EfiMemoryMap[Index].NumberOfBytes\r
- );\r
- }\r
- FreePool (EfiMemoryMap);\r
- }\r
-\r
// Build Memory Allocation Hob\r
- InitMmu ();\r
+ InitMmu (MemoryTable);\r
\r
if (FeaturePcdGet (PcdPrePiProduceMemoryTypeInformationHob)) {\r
// Optional feature that helps prevent EFI memory map fragmentation.\r
projects / mirror_edk2.git / blobdiff