ArmPlatformPkg/ArmVExpressLibRTSM: Added support for the additional 2GB memory of...

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / Library / ArmVExpressLibRTSM / RTSMMem.c

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
index 438947d3e5f3bb73a8c9e171d5760a9c53246163..5d1461a3a8ea50a0922c566b1aa9c2a40713a24c 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
@@ -14,13 +14,14 @@
 \r
 #include <Library/ArmPlatformLib.h>\r
 #include <Library/DebugLib.h>\r
+#include <Library/HobLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/IoLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <ArmPlatform.h>\r
 \r
 // Number of Virtual Memory Map Descriptors\r
-#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS          5\r
+#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS          6\r
 \r
 // DDR attributes\r
 #define DDR_ATTRIBUTES_CACHED           ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK\r
@@ -42,10 +43,42 @@ ArmPlatformGetVirtualMemoryMap (
   )\r
 {\r
   ARM_MEMORY_REGION_ATTRIBUTES  CacheAttributes;\r
+  EFI_RESOURCE_ATTRIBUTE_TYPE   ResourceAttributes;\r
   UINTN                         Index = 0;\r
   ARM_MEMORY_REGION_DESCRIPTOR  *VirtualMemoryTable;\r
-\r
-  ASSERT(VirtualMemoryMap != NULL);\r
+  UINT32                        SysId;\r
+  BOOLEAN                       HasSparseMemory;\r
+  EFI_VIRTUAL_ADDRESS           SparseMemoryBase;\r
+  UINT64                        SparseMemorySize;\r
+\r
+  ASSERT (VirtualMemoryMap != NULL);\r
+\r
+  // The FVP model has Sparse memory\r
+  SysId = MmioRead32 (ARM_VE_SYS_ID_REG);\r
+  if (SysId != ARM_RTSM_SYS_ID) {\r
+    HasSparseMemory = TRUE;\r
+\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
+    // Declared the additional DRAM from 2GB to 4GB\r
+    SparseMemoryBase = 0x0880000000;\r
+    SparseMemorySize = SIZE_2GB;\r
+\r
+    BuildResourceDescriptorHob (\r
+        EFI_RESOURCE_SYSTEM_MEMORY,\r
+        ResourceAttributes,\r
+        SparseMemoryBase,\r
+        SparseMemorySize);\r
+  } else {\r
+    HasSparseMemory = FALSE;\r
+  }\r
 \r
   VirtualMemoryTable = (ARM_MEMORY_REGION_DESCRIPTOR*)AllocatePages(EFI_SIZE_TO_PAGES (sizeof(ARM_MEMORY_REGION_DESCRIPTOR) * MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS));\r
   if (VirtualMemoryTable == NULL) {\r
@@ -105,6 +138,14 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryTable[Index].Length       = 2 * ARM_VE_SMB_PERIPH_SZ;\r
   VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;\r
 \r
+  // Map sparse memory region if present\r
+  if (HasSparseMemory) {\r
+    VirtualMemoryTable[++Index].PhysicalBase = SparseMemoryBase;\r
+    VirtualMemoryTable[Index].VirtualBase    = SparseMemoryBase;\r
+    VirtualMemoryTable[Index].Length         = SparseMemorySize;\r
+    VirtualMemoryTable[Index].Attributes     = CacheAttributes;\r
+  }\r
+\r
   // End of Table\r
   VirtualMemoryTable[++Index].PhysicalBase = 0;\r
   VirtualMemoryTable[Index].VirtualBase  = 0;\r