Merge pull request edk2-porting#16 from AKAsaliza/new

Update DeviceMemoryMap.h
MaxRegner · Apr 4, 2022 · fc42180 · fc42180
2 parents 408d6f3 + 764ef56
commit fc42180
Showing 1 changed file with 133 additions and 75 deletions.
diff --git a/MSM8998Pkg/Include/Configuration/DeviceMemoryMap.h b/MSM8998Pkg/Include/Configuration/DeviceMemoryMap.h
@@ -3,7 +3,7 @@
 
 #include <Library/ArmLib.h>
 
-#define MAX_ARM_MEMORY_REGION_DESCRIPTOR_COUNT 64
+#define MAX_ARM_MEMORY_REGION_DESCRIPTOR_COUNT 95
 
 /* Below flag is used for system memory */
 #define SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES                               \
@@ -29,87 +29,143 @@ typedef struct {
 static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
     /* Address,	  Length,     ResourceType, Resource Attribute, ARM MMU
        Attribute,                  HobOption, EFI Memory Type */
-    /*  DDR  */
 
-    /*  Kernel  */
-    {0x80000000, 0x05800000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiBootServicesCode},
-    /*  Reserved  */
-    {0x85800000, 0x00800000, EFI_RESOURCE_MEMORY_RESERVED,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiReservedMemoryType},
-    /*  SMEM  */
+    /* DDR */
+
+    /* Kernel */
+    {0x80000000, 0x01AC0000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiBootServicesCode},
+    /* HLOS1 */
+	{0x81AC0000, 0x03C40000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem,
+     EfiBootServicesData},
+	/* MPSS_EFS */
+	{0x85D00000, 0x00200000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_DEVICE, AddMem, EfiReservedMemoryType},
+	/* GPU PRR */
+	{0x85F00000, 0x00010000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_DEVICE, AddMem, EfiReservedMemoryType},
+	/* HLOS2 */
+	{0x85F10000, 0x000B0000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiBootServicesData},
+    /* AOP CMD DB */
+    {0x85FE0000, 0x00020000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiReservedMemoryType},
+    /* SMEM */
     {0x86000000, 0x00200000, EFI_RESOURCE_MEMORY_RESERVED,
-     EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED,
-     AddMem, EfiReservedMemoryType},
-    /*  PIL Reserved  */
+     EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE,
+     ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED, AddMem,
+     EfiReservedMemoryType},
+	/* TZApps */
+	{0x86D00000, 0x03E00000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_DEVICE, NoHob, EfiReservedMemoryType},
+
+	 /* PIL Reserved */
     {0x8AB00000, 0x0AD15000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
-     AddMem, EfiReservedMemoryType},
-    /*  DXE Heap  */    
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_DEVICE, AddMem, EfiReservedMemoryType},
+
+	 /* DXE Heap */    
     {0x97C00000, 0x05800000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiConventionalMemory},
-    /*  Display Reserved  */
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},
+    /* DBI Dump */
+    {0x9D330000, 0x000D0000, EFI_RESOURCE_MEMORY_MAPPED_IO,
+     EFI_RESOURCE_ATTRIBUTE_INITIALIZED, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
+     NoHob, EfiConventionalMemory},
+    /* FrameBuffer */
     {0x9D400000, 0x02400000, EFI_RESOURCE_MEMORY_RESERVED,
-     EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_THROUGH,
-     AddMem, EfiMaxMemoryType},
-    /*  FV Region  */
+     EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_THROUGH, AddMem, EfiMaxMemoryType},
+    /* FV Region */
     {0x9F800000, 0x00200000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiBootServicesData},
-    /*  ABOOT FV  */
-    {0x9FA00000, 0x00200000, EFI_RESOURCE_MEMORY_RESERVED,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiReservedMemoryType},
-    /*  UEFI FD  */    
-    {0x9FC00000, 0x00300000, EFI_RESOURCE_MEMORY_RESERVED,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiBootServicesData},
-    /*  SEC Heap  */    
-    {0x9FF00000, 0x0008C000, EFI_RESOURCE_MEMORY_RESERVED,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiBootServicesData},    
-    /*  CPU Vectors  */    
-    {0x9FF8C000, 0x00001000, EFI_RESOURCE_MEMORY_RESERVED,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiBootServicesData},
-    /*  MMU PageTables  */ 
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiBootServicesData},
+    /* ABOOT FV */
+    {0x9FA00000, 0x00200000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiReservedMemoryType},
+    /* UEFI FD */
+    {0x9FC00000, 0x00300000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiBootServicesData},
+    /* SEC Heap */
+    {0x9FF00000, 0x0008C000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiBootServicesData},
+    /* CPU Vectors */
+    {0x9FF8C000, 0x00001000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiBootServicesData},
+    /* MMU PageTables */
     {0x9FF8D000, 0x00003000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiBootServicesData},
-    /*  UEFI Stack  */ 
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiBootServicesData},
+    /* UEFI Stack */
     {0x9FF90000, 0x00040000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiBootServicesData},
-    /*  DBI Dump  */ 
-    {0x9FFD0000, 0x00027000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiBootServicesData},
-    /*  Log Buffer  */ 
-    {0x9FFF7000, 0x00008000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiBootServicesData},
-    /*  Info Blk  */ 
-    {0x9FFFF000, 0x00001000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiBootServicesData},
-
-    /*  HLOS  */
-     {0xA0000000, 0x60000000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiConventionalMemory},
-
-     {0x100000000, 0xBD8C0000, EFI_RESOURCE_SYSTEM_MEMORY,
-     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES, ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK,
-     AddMem, EfiConventionalMemory},
-
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiBootServicesData},
+    /* RSRV1 */
+	{0x9FFD0000, 0x0000A000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED, AddMem,
+     EfiRuntimeServicesData},
+	/* TPMControl */
+	{0x9FFDA000, 0x00003000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED, AddMem,
+     EfiRuntimeServicesData},
+	/* Reset Data */
+	{0x9FFDD000, 0x00004000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED, AddMem,
+     EfiRuntimeServicesData},
+	/* RSRV3 */
+	{0x9FFE1000, 0x00001000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED, AddMem,
+     EfiRuntimeServicesData},
+	/* Capsule Header */
+	{0x9FFE2000, 0x00001000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED, AddMem,
+     EfiRuntimeServicesData},
+	/* RSRV2 */
+	{0x9FFE3000, 0x00014000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED, AddMem,
+     EfiRuntimeServicesData},
+	/* Log Buffer */
+	{0x9FFF7000, 0x00008000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED, AddMem,
+     EfiRuntimeServicesData},
+	/* Info Blk */
+	{0x9FFFF000, 0x00001000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED, AddMem,
+     EfiRuntimeServicesData},
+
+   	 /* 4.6GB Memory */
+	{0xA0000000, 0x60000000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},
+	{0x100000000, 0xBD8C0000, EFI_RESOURCE_SYSTEM_MEMORY,
+     SYSTEM_MEMORY_RESOURCE_ATTR_CAPABILITIES,
+     ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK, AddMem, EfiConventionalMemory},
+
     /* Other memory regions */
     {0x14680000, 0x00040000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_INITIALIZED, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
-     NoHob, EfiConventionalMemory},
-    {0x146BF000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
+     AddDev, EfiConventionalMemory},
+	{0x146BF000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_INITIALIZED, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiConventionalMemory},
     {0x16000000, 0x01000000, EFI_RESOURCE_MEMORY_MAPPED_IO,
@@ -153,6 +209,9 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
     {0x010AE000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiMemoryMappedIO},
+	{0x01680000, 0x00009000, EFI_RESOURCE_MEMORY_MAPPED_IO,
+     EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
+	 AddDev, EfiMemoryMappedIO},
     {0x01C00000, 0x00007000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiMemoryMappedIO},
@@ -174,8 +233,6 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
     {0x0502A000, 0x00002000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiMemoryMappedIO},
-
-
     {0x05030000, 0x00002000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiMemoryMappedIO},
@@ -200,8 +257,6 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
     {0x0C000000, 0x00200000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiMemoryMappedIO},
-
-
     {0x0C800000, 0x00800000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiMemoryMappedIO},
@@ -216,6 +271,9 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
      AddDev, EfiMemoryMappedIO},
     {0x17B00000, 0x00100000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
+     AddDev, EfiMemoryMappedIO},
+	{0x17C00000, 0x00100000, EFI_RESOURCE_MEMORY_MAPPED_IO,
+     EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiMemoryMappedIO},
     {0x1B000000, 0x01000000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,