ArmPlatformPkg/ArmVExpressPkg: The virtual memory must have the Secure attribute when the platform does not make the transition in Normal World.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12480 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 14 insertions, 6 deletions

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf
index 239a25bd48..dcaf7f0c10 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf
@@ -45,6 +45,7 @@
   gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping
 
 [FixedPcd]
+  gArmTokenSpaceGuid.PcdTrustzoneSupport
   gArmTokenSpaceGuid.PcdSystemMemoryBase
   gArmTokenSpaceGuid.PcdSystemMemorySize
 
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
index ef8fa4191a..13ec5de8d0 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
@@ -26,6 +26,8 @@
 // DDR attributes

 #define DDR_ATTRIBUTES_CACHED           ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK

 #define DDR_ATTRIBUTES_UNCACHED         ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED

+#define DDR_ATTRIBUTES_SECURE_CACHED    ARM_MEMORY_REGION_ATTRIBUTE_SECURE_WRITE_BACK

+#define DDR_ATTRIBUTES_SECURE_UNCACHED  ARM_MEMORY_REGION_ATTRIBUTE_SECURE_UNCACHED_UNBUFFERED

 

 /**

   Return the Virtual Memory Map of your platform

@@ -43,6 +45,7 @@ ArmPlatformGetVirtualMemoryMap (
   )

 {

   ARM_MEMORY_REGION_ATTRIBUTES  CacheAttributes;

+  BOOLEAN                       TrustzoneSupport;

   UINTN                         Index = 0;

   ARM_MEMORY_REGION_DESCRIPTOR  *VirtualMemoryTable;

 

@@ -53,10 +56,14 @@ ArmPlatformGetVirtualMemoryMap (
       return;

   }

 

+  // Check if SMC TZASC is enabled. If Trustzone not enabled then all the entries remain in Secure World.

+  // As this value can be changed in the Board Configuration file, the UEFI firmware needs to work for both case

+  TrustzoneSupport = PcdGetBool (PcdTrustzoneSupport);

+

   if (FeaturePcdGet(PcdCacheEnable) == TRUE) {

-      CacheAttributes = DDR_ATTRIBUTES_CACHED;

+      CacheAttributes = (TrustzoneSupport ? DDR_ATTRIBUTES_CACHED : DDR_ATTRIBUTES_SECURE_CACHED);

   } else {

-      CacheAttributes = DDR_ATTRIBUTES_UNCACHED;

+      CacheAttributes = (TrustzoneSupport ? DDR_ATTRIBUTES_UNCACHED : DDR_ATTRIBUTES_SECURE_UNCACHED);

   }

 

   if (FeaturePcdGet(PcdNorFlashRemapping) == FALSE) {

@@ -77,13 +84,13 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryTable[++Index].PhysicalBase = ARM_VE_SMB_MB_ON_CHIP_PERIPH_BASE;

   VirtualMemoryTable[Index].VirtualBase  = ARM_VE_SMB_MB_ON_CHIP_PERIPH_BASE;

   VirtualMemoryTable[Index].Length       = ARM_VE_SMB_MB_ON_CHIP_PERIPH_SZ;

-  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

+  VirtualMemoryTable[Index].Attributes   = (TrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

 

   // SMB CS0-CS1 - NOR Flash 1 & 2

   VirtualMemoryTable[++Index].PhysicalBase = ARM_VE_SMB_NOR0_BASE;

   VirtualMemoryTable[Index].VirtualBase  = ARM_VE_SMB_NOR0_BASE;

   VirtualMemoryTable[Index].Length       = ARM_VE_SMB_NOR0_SZ + ARM_VE_SMB_NOR1_SZ;

-  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

+  VirtualMemoryTable[Index].Attributes   = (TrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

 

   // SMB CS2 - SRAM

   VirtualMemoryTable[++Index].PhysicalBase = ARM_VE_SMB_SRAM_BASE;

@@ -95,14 +102,14 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryTable[++Index].PhysicalBase = ARM_VE_SMB_PERIPH_BASE;

   VirtualMemoryTable[Index].VirtualBase  = ARM_VE_SMB_PERIPH_BASE;

   VirtualMemoryTable[Index].Length       = ARM_VE_SMB_PERIPH_SZ;

-  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

+  VirtualMemoryTable[Index].Attributes   = (TrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

 

   // If a Logic Tile is connected to The ARM Versatile Express Motherboard

   if (MmioRead32(ARM_VE_SYS_PROCID1_REG) != 0) {

       VirtualMemoryTable[++Index].PhysicalBase = ARM_VE_EXT_AXI_BASE;

       VirtualMemoryTable[Index].VirtualBase  = ARM_VE_EXT_AXI_BASE;

       VirtualMemoryTable[Index].Length       = ARM_VE_EXT_AXI_SZ;

-      VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

+      VirtualMemoryTable[Index].Attributes   = (TrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

 

       ASSERT((Index + 1) == (MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS + 1));

   } else {