ArmPlatformPkg/ArmVExpressLibRTSM: Added support for the additional 6GB memory of DRAM on Foundation Model

The FVP Foundation model has additional DRAM regions at 0x08_8000_0000.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15464 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 32 insertions, 3 deletions

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMFoundationMem.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMFoundationMem.c
index 69d62554c5..863767c84d 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMFoundationMem.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMFoundationMem.c
@@ -1,6 +1,6 @@
 /** @file

 *

-*  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

+*  Copyright (c) 2011-2014, ARM Limited. All rights reserved.

 *

 *  This program and the accompanying materials

 *  are licensed and made available under the terms and conditions of the BSD License

@@ -14,13 +14,14 @@
 

 #include <Library/ArmPlatformLib.h>

 #include <Library/DebugLib.h>

+#include <Library/HobLib.h>

 #include <Library/PcdLib.h>

 #include <Library/IoLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <ArmPlatform.h>

 

-// Number of Virtual Memory Map Descriptors without a Logic Tile

-#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS          4

+// Number of Virtual Memory Map Descriptors

+#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS          5

 

 // DDR attributes

 #define DDR_ATTRIBUTES_CACHED           ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK

@@ -42,11 +43,33 @@ ArmPlatformGetVirtualMemoryMap (
   )

 {

   ARM_MEMORY_REGION_ATTRIBUTES  CacheAttributes;

+  EFI_RESOURCE_ATTRIBUTE_TYPE   ResourceAttributes;

   UINTN                         Index = 0;

   ARM_MEMORY_REGION_DESCRIPTOR  *VirtualMemoryTable;

+  EFI_VIRTUAL_ADDRESS           SparseMemoryBase;

+  UINT64                        SparseMemorySize;

 

   ASSERT(VirtualMemoryMap != NULL);

 

+  ResourceAttributes =

+      EFI_RESOURCE_ATTRIBUTE_PRESENT |

+      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |

+      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |

+      EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |

+      EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |

+      EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE |

+      EFI_RESOURCE_ATTRIBUTE_TESTED;

+

+  // Declared the additional DRAM from 2GB to 8GB

+  SparseMemoryBase = 0x0880000000;

+  SparseMemorySize = SIZE_2GB + SIZE_4GB;

+

+  BuildResourceDescriptorHob (

+      EFI_RESOURCE_SYSTEM_MEMORY,

+      ResourceAttributes,

+      SparseMemoryBase,

+      SparseMemorySize);

+

   VirtualMemoryTable = (ARM_MEMORY_REGION_DESCRIPTOR*)AllocatePages(EFI_SIZE_TO_PAGES (sizeof(ARM_MEMORY_REGION_DESCRIPTOR) * MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS));

   if (VirtualMemoryTable == NULL) {

       return;

@@ -76,6 +99,12 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryTable[Index].Length       = 2 * ARM_VE_SMB_PERIPH_SZ;

   VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

 

+  // Map sparse memory region if present

+  VirtualMemoryTable[++Index].PhysicalBase = SparseMemoryBase;

+  VirtualMemoryTable[Index].VirtualBase    = SparseMemoryBase;

+  VirtualMemoryTable[Index].Length         = SparseMemorySize;

+  VirtualMemoryTable[Index].Attributes     = CacheAttributes;

+

   // End of Table

   VirtualMemoryTable[++Index].PhysicalBase = 0;

   VirtualMemoryTable[Index].VirtualBase  = 0;