ARM Packages: Fixed th 'NS' (Non Secure) bit in the MMU page Table Descriptor

The 'NS' bit must only be set in Secure world to define the Non-Secure region
of the Non-Secure World.
This bit must not be set in Non-Secure World.

Signed-off-by: Olivier Martin <olivier.martin@arm.com>


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

4 files changed, 15 insertions, 23 deletions

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
index 66b149c8e4..d1a55a8360 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
@@ -74,13 +74,13 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_MB_ON_CHIP_PERIPH_BASE;

   VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_MB_ON_CHIP_PERIPH_BASE;

   VirtualMemoryTable[Index].Length       = ARM_EB_SMB_MB_ON_CHIP_PERIPH_SZ;

-  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE;

+  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

 

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

   VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_NOR_BASE;

   VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_NOR_BASE;

   VirtualMemoryTable[Index].Length       = ARM_EB_SMB_NOR_SZ + ARM_EB_SMB_DOC_SZ;

-  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE;

+  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

 

   // SMB CS2 - SRAM

   VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_SRAM_BASE;

@@ -92,14 +92,14 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_PERIPH_BASE;

   VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_PERIPH_BASE;

   VirtualMemoryTable[Index].Length       = ARM_EB_SMB_PERIPH_SZ;

-  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE;

+  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

 

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

   if (MmioRead32(ARM_EB_SYS_PROCID1_REG) != 0) {

       VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_LOGIC_TILE_BASE;

       VirtualMemoryTable[Index].VirtualBase  = ARM_EB_LOGIC_TILE_BASE;

       VirtualMemoryTable[Index].Length       = ARM_EB_LOGIC_TILE_SZ;

-      VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE;

+      VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

 

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

   } else {

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
index 13ec5de8d0..ef8fa4191a 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c
@@ -26,8 +26,6 @@
 // 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

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

 {

   ARM_MEMORY_REGION_ATTRIBUTES  CacheAttributes;

-  BOOLEAN                       TrustzoneSupport;

   UINTN                         Index = 0;

   ARM_MEMORY_REGION_DESCRIPTOR  *VirtualMemoryTable;

 

@@ -56,14 +53,10 @@ 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 = (TrustzoneSupport ? DDR_ATTRIBUTES_CACHED : DDR_ATTRIBUTES_SECURE_CACHED);

+      CacheAttributes = DDR_ATTRIBUTES_CACHED;

   } else {

-      CacheAttributes = (TrustzoneSupport ? DDR_ATTRIBUTES_UNCACHED : DDR_ATTRIBUTES_SECURE_UNCACHED);

+      CacheAttributes = DDR_ATTRIBUTES_UNCACHED;

   }

 

   if (FeaturePcdGet(PcdNorFlashRemapping) == FALSE) {

@@ -84,13 +77,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   = (TrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

+  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_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   = (TrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

+  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

 

   // SMB CS2 - SRAM

   VirtualMemoryTable[++Index].PhysicalBase = ARM_VE_SMB_SRAM_BASE;

@@ -102,14 +95,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   = (TrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

+  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_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   = (TrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

+      VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

 

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

   } else {

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
index 4537a71456..f3e8cafc0f 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSMMem.c
@@ -85,13 +85,13 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryTable[++Index].PhysicalBase = ARM_VE_ON_CHIP_PERIPH_BASE;

   VirtualMemoryTable[Index].VirtualBase  = ARM_VE_ON_CHIP_PERIPH_BASE;

   VirtualMemoryTable[Index].Length       = ARM_VE_ON_CHIP_PERIPH_SZ;

-  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE;

+  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_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_SECURE_DEVICE;

+  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

 

   // SMB CS2 - SRAM

   VirtualMemoryTable[++Index].PhysicalBase = ARM_VE_SMB_SRAM_BASE;

@@ -103,7 +103,7 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryTable[++Index].PhysicalBase = ARM_VE_SMB_PERIPH_BASE;

   VirtualMemoryTable[Index].VirtualBase  = ARM_VE_SMB_PERIPH_BASE;

   VirtualMemoryTable[Index].Length       = 2 * ARM_VE_SMB_PERIPH_SZ;

-  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE;
+  VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;
 

 //TODO:This should be enabled for final release. Right now, ARM VE RTSM crashes.

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

@@ -111,7 +111,7 @@ ArmPlatformGetVirtualMemoryMap (
 //      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_SECURE_DEVICE;

+//      VirtualMemoryTable[Index].Attributes   = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;

 //

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

 //  } else {

diff --git a/ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c b/ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c
index 3477693916..138216e9b7 100644
--- a/ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c
+++ b/ArmPlatformPkg/Library/EblCmdLib/EblCmdMmu.c
@@ -1,6 +1,6 @@
 /** @file

 *

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

+*  Copyright (c) 2011-2012, 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         

@@ -27,7 +27,6 @@
 

 // Section

 #define TT_DESCRIPTOR_SECTION_STRONGLY_ORDER	   (TT_DESCRIPTOR_SECTION_TYPE_SECTION 													  | \

-													TT_DESCRIPTOR_SECTION_NS_NON_SECURE 											      | \

 													TT_DESCRIPTOR_SECTION_NG_GLOBAL 													  | \

 													TT_DESCRIPTOR_SECTION_S_NOT_SHARED 													  | \

 													TT_DESCRIPTOR_SECTION_DOMAIN(0) 													  | \