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

[mirror_edk2.git] / ArmPkg / Include / Chipset / ARM1176JZ-S.h

diff --git a/ArmPkg/Include/Chipset/ARM1176JZ-S.h b/ArmPkg/Include/Chipset/ARM1176JZ-S.h
index 8ae43c735d48ff8631f39f089fe33b49d7467433..ba24bcb6262690de1224cf933784a05fc116e67f 100644 (file)
--- a/ArmPkg/Include/Chipset/ARM1176JZ-S.h
+++ b/ArmPkg/Include/Chipset/ARM1176JZ-S.h
@@ -1,6 +1,7 @@
 /** @file\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -38,8 +39,7 @@
 #define TT_DESCRIPTOR_SECTION_SIZE                              (0x00100000)\r
 \r
 #define TT_DESCRIPTOR_SECTION_NS_MASK                           (1UL << 19)\r
-#define TT_DESCRIPTOR_SECTION_NS_SECURE                         (0UL << 19)\r
-#define TT_DESCRIPTOR_SECTION_NS_NON_SECURE                     (1UL << 19)\r
+#define TT_DESCRIPTOR_SECTION_NS                                (1UL << 19)\r
 \r
 #define TT_DESCRIPTOR_SECTION_NG_MASK                           (1UL << 17)\r
 #define TT_DESCRIPTOR_SECTION_NG_GLOBAL                         (0UL << 17)\r
@@ -86,27 +86,27 @@
 #define TT_DESCRIPTOR_SECTION_BASE_ADDRESS_MASK                 (0xFFF00000)\r
 #define TT_DESCRIPTOR_SECTION_BASE_ADDRESS(a)                   (a & TT_DESCRIPTOR_SECTION_BASE_ADDRESS_MASK)\r
 \r
-#define TT_DESCRIPTOR_SECTION_WRITE_BACK(Secure)       (TT_DESCRIPTOR_TYPE_SECTION                                                          | \\r
-                                                        (Secure ? TT_DESCRIPTOR_SECTION_NS_SECURE : TT_DESCRIPTOR_SECTION_NS_NON_SECURE )   | \\r
-                                                   TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \\r
-                                                   TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \\r
-                                                   TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
-                                                   TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
-                                                   TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK_ALLOC)\r
-#define TT_DESCRIPTOR_SECTION_WRITE_THROUGH(Secure)    (TT_DESCRIPTOR_TYPE_SECTION                                                          | \\r
-                                                        (Secure ? TT_DESCRIPTOR_SECTION_NS_SECURE : TT_DESCRIPTOR_SECTION_NS_NON_SECURE )   | \\r
-                                                   TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \\r
-                                                   TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \\r
-                                                   TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
-                                                   TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
-                                                   TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC)\r
-#define TT_DESCRIPTOR_SECTION_UNCACHED(Secure)         (TT_DESCRIPTOR_TYPE_SECTION                                                          | \\r
-                                                        (Secure ? TT_DESCRIPTOR_SECTION_NS_SECURE : TT_DESCRIPTOR_SECTION_NS_NON_SECURE )   | \\r
-                                                   TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \\r
-                                                   TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \\r
-                                                   TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
-                                                   TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
-                                                   TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE)\r
+#define TT_DESCRIPTOR_SECTION_WRITE_BACK(NonSecure)             (TT_DESCRIPTOR_TYPE_SECTION                                                          | \\r
+                                                                (NonSecure ? TT_DESCRIPTOR_SECTION_NS : 0)   | \\r
+                                                                TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \\r
+                                                                TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \\r
+                                                                TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
+                                                                TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
+                                                                TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK_ALLOC)\r
+#define TT_DESCRIPTOR_SECTION_WRITE_THROUGH(NonSecure)          (TT_DESCRIPTOR_TYPE_SECTION                                                          | \\r
+                                                                (NonSecure ? TT_DESCRIPTOR_SECTION_NS : 0)   | \\r
+                                                                TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \\r
+                                                                TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \\r
+                                                                TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
+                                                                TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
+                                                                TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC)\r
+#define TT_DESCRIPTOR_SECTION_UNCACHED(NonSecure)               (TT_DESCRIPTOR_TYPE_SECTION                                                          | \\r
+                                                                (NonSecure ? TT_DESCRIPTOR_SECTION_NS : 0)   | \\r
+                                                                TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \\r
+                                                                TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \\r
+                                                                TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
+                                                                TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
+                                                                TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE)\r
 \r
 #define CPACR_CP_FULL_ACCESS    0x0FFFFFFF\r
 \r