ArmPkg/ArmMmuLib ARM: Isolate the access flag from AP mask

Split the ARM permission fields in the short descriptors into an access
flag and AP[2:1] as per the recommendation in the ARM ARM. This makes
the access flag available separately, which allows us to implement
EFI_MEMORY_RP memory analogous to how it will be implemented for
AArch64.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>

diff --git a/ArmPkg/Drivers/CpuDxe/Arm/Mmu.c b/ArmPkg/Drivers/CpuDxe/Arm/Mmu.c
index 8eb1f71395f56db8ffa589604ede7a4d9c20a9a5..07faab8216eccc007e8f19a86c9b68872b5c194b 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/Arm/Mmu.c
+++ b/ArmPkg/Drivers/CpuDxe/Arm/Mmu.c
@@ -50,30 +50,27 @@ SectionToGcdAttributes (
 \r
   // determine protection attributes\r
   switch (SectionAttributes & TT_DESCRIPTOR_SECTION_AP_MASK) {\r
-    case TT_DESCRIPTOR_SECTION_AP_NO_NO: // no read, no write\r
-      // *GcdAttributes |= EFI_MEMORY_RO | EFI_MEMORY_RP;\r
-      break;\r
-\r
-    case TT_DESCRIPTOR_SECTION_AP_RW_NO:\r
+    case TT_DESCRIPTOR_SECTION_AP_NO_RW:\r
     case TT_DESCRIPTOR_SECTION_AP_RW_RW:\r
       // normal read/write access, do not add additional attributes\r
       break;\r
 \r
     // read only cases map to write-protect\r
-    case TT_DESCRIPTOR_SECTION_AP_RO_NO:\r
+    case TT_DESCRIPTOR_SECTION_AP_NO_RO:\r
     case TT_DESCRIPTOR_SECTION_AP_RO_RO:\r
       *GcdAttributes |= EFI_MEMORY_RO;\r
       break;\r
-\r
-    default:\r
-      return EFI_UNSUPPORTED;\r
   }\r
 \r
   // now process eXectue Never attribute\r
-  if ((SectionAttributes & TT_DESCRIPTOR_SECTION_XN_MASK) != 0 ) {\r
+  if ((SectionAttributes & TT_DESCRIPTOR_SECTION_XN_MASK) != 0) {\r
     *GcdAttributes |= EFI_MEMORY_XP;\r
   }\r
 \r
+  if ((SectionAttributes & TT_DESCRIPTOR_SECTION_AF) == 0) {\r
+    *GcdAttributes |= EFI_MEMORY_RP;\r
+  }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -114,30 +111,27 @@ PageToGcdAttributes (
 \r
   // determine protection attributes\r
   switch (PageAttributes & TT_DESCRIPTOR_PAGE_AP_MASK) {\r
-    case TT_DESCRIPTOR_PAGE_AP_NO_NO: // no read, no write\r
-      // *GcdAttributes |= EFI_MEMORY_RO | EFI_MEMORY_RP;\r
-      break;\r
-\r
-    case TT_DESCRIPTOR_PAGE_AP_RW_NO:\r
+    case TT_DESCRIPTOR_PAGE_AP_NO_RW:\r
     case TT_DESCRIPTOR_PAGE_AP_RW_RW:\r
       // normal read/write access, do not add additional attributes\r
       break;\r
 \r
     // read only cases map to write-protect\r
-    case TT_DESCRIPTOR_PAGE_AP_RO_NO:\r
+    case TT_DESCRIPTOR_PAGE_AP_NO_RO:\r
     case TT_DESCRIPTOR_PAGE_AP_RO_RO:\r
       *GcdAttributes |= EFI_MEMORY_RO;\r
       break;\r
-\r
-    default:\r
-      return EFI_UNSUPPORTED;\r
   }\r
 \r
   // now process eXectue Never attribute\r
-  if ((PageAttributes & TT_DESCRIPTOR_PAGE_XN_MASK) != 0 ) {\r
+  if ((PageAttributes & TT_DESCRIPTOR_PAGE_XN_MASK) != 0) {\r
     *GcdAttributes |= EFI_MEMORY_XP;\r
   }\r
 \r
+  if ((PageAttributes & TT_DESCRIPTOR_PAGE_AF) == 0) {\r
+    *GcdAttributes |= EFI_MEMORY_RP;\r
+  }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -166,6 +160,7 @@ SyncCacheConfigPage (
   // Convert SectionAttributes into PageAttributes\r
   NextPageAttributes =\r
     TT_DESCRIPTOR_CONVERT_TO_PAGE_CACHE_POLICY (*NextSectionAttributes) |\r
+    TT_DESCRIPTOR_CONVERT_TO_PAGE_AF (*NextSectionAttributes) |\r
     TT_DESCRIPTOR_CONVERT_TO_PAGE_AP (*NextSectionAttributes);\r
 \r
   // obtain page table base\r
@@ -174,7 +169,7 @@ SyncCacheConfigPage (
   for (i = 0; i < TRANSLATION_TABLE_PAGE_COUNT; i++) {\r
     if ((SecondLevelTable[i] & TT_DESCRIPTOR_PAGE_TYPE_MASK) == TT_DESCRIPTOR_PAGE_TYPE_PAGE) {\r
       // extract attributes (cacheability and permissions)\r
-      PageAttributes = SecondLevelTable[i] & (TT_DESCRIPTOR_PAGE_CACHE_POLICY_MASK | TT_DESCRIPTOR_PAGE_AP_MASK);\r
+      PageAttributes = SecondLevelTable[i] & (TT_DESCRIPTOR_PAGE_CACHE_POLICY_MASK | TT_DESCRIPTOR_PAGE_AP_MASK | TT_DESCRIPTOR_PAGE_AF);\r
 \r
       if (NextPageAttributes == 0) {\r
         // start on a new region\r
@@ -213,6 +208,7 @@ SyncCacheConfigPage (
   // Convert back PageAttributes into SectionAttributes\r
   *NextSectionAttributes =\r
     TT_DESCRIPTOR_CONVERT_TO_SECTION_CACHE_POLICY (NextPageAttributes) |\r
+    TT_DESCRIPTOR_CONVERT_TO_SECTION_AF (NextPageAttributes) |\r
     TT_DESCRIPTOR_CONVERT_TO_SECTION_AP (NextPageAttributes);\r
 \r
   return EFI_SUCCESS;\r
@@ -256,14 +252,14 @@ SyncCacheConfig (
   FirstLevelTable = (ARM_FIRST_LEVEL_DESCRIPTOR *)(ArmGetTTBR0BaseAddress ());\r
 \r
   // Get the first region\r
-  NextSectionAttributes = FirstLevelTable[0] & (TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK | TT_DESCRIPTOR_SECTION_AP_MASK);\r
+  NextSectionAttributes = FirstLevelTable[0] & (TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK | TT_DESCRIPTOR_SECTION_AP_MASK | TT_DESCRIPTOR_SECTION_AF);\r
 \r
   // iterate through each 1MB descriptor\r
   NextRegionBase = NextRegionLength = 0;\r
   for (i = 0; i < TRANSLATION_TABLE_SECTION_COUNT; i++) {\r
     if ((FirstLevelTable[i] & TT_DESCRIPTOR_SECTION_TYPE_MASK) == TT_DESCRIPTOR_SECTION_TYPE_SECTION) {\r
       // extract attributes (cacheability and permissions)\r
-      SectionAttributes = FirstLevelTable[i] & (TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK | TT_DESCRIPTOR_SECTION_AP_MASK);\r
+      SectionAttributes = FirstLevelTable[i] & (TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK | TT_DESCRIPTOR_SECTION_AP_MASK | TT_DESCRIPTOR_SECTION_AF);\r
 \r
       if (NextSectionAttributes == 0) {\r
         // start on a new region\r
@@ -383,6 +379,10 @@ EfiAttributeToArmAttribute (
     ArmAttributes |= TT_DESCRIPTOR_SECTION_XN_MASK;\r
   }\r
 \r
+  if ((EfiAttributes & EFI_MEMORY_RP) == 0) {\r
+    ArmAttributes |= TT_DESCRIPTOR_SECTION_AF;\r
+  }\r
+\r
   return ArmAttributes;\r
 }\r
 \r
@@ -482,6 +482,7 @@ GetMemoryRegion (
     *RegionAttributes = TT_DESCRIPTOR_CONVERT_TO_SECTION_CACHE_POLICY (PageAttributes) |\r
                         TT_DESCRIPTOR_CONVERT_TO_SECTION_S (PageAttributes) |\r
                         TT_DESCRIPTOR_CONVERT_TO_SECTION_XN (PageAttributes) |\r
+                        TT_DESCRIPTOR_CONVERT_TO_SECTION_AF (PageAttributes) |\r
                         TT_DESCRIPTOR_CONVERT_TO_SECTION_AP (PageAttributes);\r
   }\r
 \r

diff --git a/ArmPkg/Include/Chipset/ArmV7Mmu.h b/ArmPkg/Include/Chipset/ArmV7Mmu.h
index e0219747df8671517f4e6d00bb32d247ffe75609..da4f3160f8ff79e0d684928240eefea3e402618f 100644 (file)
--- a/ArmPkg/Include/Chipset/ArmV7Mmu.h
+++ b/ArmPkg/Include/Chipset/ArmV7Mmu.h
@@ -80,21 +80,21 @@
 #define TT_DESCRIPTOR_PAGE_S_NOT_SHARED  (0UL << 10)\r
 #define TT_DESCRIPTOR_PAGE_S_SHARED      (1UL << 10)\r
 \r
-#define TT_DESCRIPTOR_SECTION_AP_MASK   ((1UL << 15) | (3UL << 10))\r
-#define TT_DESCRIPTOR_SECTION_AP_NO_NO  ((0UL << 15) | (0UL << 10))\r
-#define TT_DESCRIPTOR_SECTION_AP_RW_NO  ((0UL << 15) | (1UL << 10))\r
-#define TT_DESCRIPTOR_SECTION_AP_RW_RO  ((0UL << 15) | (2UL << 10))\r
-#define TT_DESCRIPTOR_SECTION_AP_RW_RW  ((0UL << 15) | (3UL << 10))\r
-#define TT_DESCRIPTOR_SECTION_AP_RO_NO  ((1UL << 15) | (1UL << 10))\r
-#define TT_DESCRIPTOR_SECTION_AP_RO_RO  ((1UL << 15) | (3UL << 10))\r
-\r
-#define TT_DESCRIPTOR_PAGE_AP_MASK   ((1UL << 9) | (3UL << 4))\r
-#define TT_DESCRIPTOR_PAGE_AP_NO_NO  ((0UL << 9) | (0UL << 4))\r
-#define TT_DESCRIPTOR_PAGE_AP_RW_NO  ((0UL << 9) | (1UL << 4))\r
-#define TT_DESCRIPTOR_PAGE_AP_RW_RO  ((0UL << 9) | (2UL << 4))\r
-#define TT_DESCRIPTOR_PAGE_AP_RW_RW  ((0UL << 9) | (3UL << 4))\r
-#define TT_DESCRIPTOR_PAGE_AP_RO_NO  ((1UL << 9) | (1UL << 4))\r
-#define TT_DESCRIPTOR_PAGE_AP_RO_RO  ((1UL << 9) | (3UL << 4))\r
+#define TT_DESCRIPTOR_SECTION_AP_MASK   ((1UL << 15) | (1UL << 11))\r
+#define TT_DESCRIPTOR_SECTION_AP_NO_RW  ((0UL << 15) | (0UL << 11))\r
+#define TT_DESCRIPTOR_SECTION_AP_RW_RW  ((0UL << 15) | (1UL << 11))\r
+#define TT_DESCRIPTOR_SECTION_AP_NO_RO  ((1UL << 15) | (0UL << 11))\r
+#define TT_DESCRIPTOR_SECTION_AP_RO_RO  ((1UL << 15) | (1UL << 11))\r
+\r
+#define TT_DESCRIPTOR_SECTION_AF  (1UL << 10)\r
+\r
+#define TT_DESCRIPTOR_PAGE_AP_MASK   ((1UL << 9) | (1UL << 5))\r
+#define TT_DESCRIPTOR_PAGE_AP_NO_RW  ((0UL << 9) | (0UL << 5))\r
+#define TT_DESCRIPTOR_PAGE_AP_RW_RW  ((0UL << 9) | (1UL << 5))\r
+#define TT_DESCRIPTOR_PAGE_AP_NO_RO  ((1UL << 9) | (0UL << 5))\r
+#define TT_DESCRIPTOR_PAGE_AP_RO_RO  ((1UL << 9) | (1UL << 5))\r
+\r
+#define TT_DESCRIPTOR_PAGE_AF  (1UL << 4)\r
 \r
 #define TT_DESCRIPTOR_SECTION_XN_MASK  (0x1UL << 4)\r
 #define TT_DESCRIPTOR_PAGE_XN_MASK     (0x1UL << 0)\r
@@ -124,20 +124,24 @@
 #define TT_DESCRIPTOR_CONVERT_TO_PAGE_AP(Desc)            ((((Desc) & TT_DESCRIPTOR_SECTION_AP_MASK) >> 6) & TT_DESCRIPTOR_PAGE_AP_MASK)\r
 #define TT_DESCRIPTOR_CONVERT_TO_PAGE_NG(Desc)            ((((Desc) & TT_DESCRIPTOR_SECTION_NG_MASK) >> 6) & TT_DESCRIPTOR_PAGE_NG_MASK)\r
 #define TT_DESCRIPTOR_CONVERT_TO_PAGE_S(Desc)             ((((Desc) & TT_DESCRIPTOR_SECTION_S_MASK) >> 6) & TT_DESCRIPTOR_PAGE_S_MASK)\r
+#define TT_DESCRIPTOR_CONVERT_TO_PAGE_AF(Desc)            ((((Desc) & TT_DESCRIPTOR_SECTION_AF) >> 6) & TT_DESCRIPTOR_PAGE_AF)\r
 #define TT_DESCRIPTOR_CONVERT_TO_PAGE_XN(Desc)            ((((Desc) & TT_DESCRIPTOR_SECTION_XN_MASK) >> 4) & TT_DESCRIPTOR_PAGE_XN_MASK)\r
 #define TT_DESCRIPTOR_CONVERT_TO_PAGE_CACHE_POLICY(Desc)  ((((Desc) & (0x3 << 12)) >> 6) | (Desc & (0x3 << 2)))\r
 \r
 #define TT_DESCRIPTOR_CONVERT_TO_SECTION_AP(Desc)            ((((Desc) & TT_DESCRIPTOR_PAGE_AP_MASK) << 6) & TT_DESCRIPTOR_SECTION_AP_MASK)\r
 #define TT_DESCRIPTOR_CONVERT_TO_SECTION_S(Desc)             ((((Desc) & TT_DESCRIPTOR_PAGE_S_MASK) << 6) & TT_DESCRIPTOR_SECTION_S_MASK)\r
+#define TT_DESCRIPTOR_CONVERT_TO_SECTION_AF(Desc)            ((((Desc) & TT_DESCRIPTOR_PAGE_AF) << 6) & TT_DESCRIPTOR_SECTION_AF)\r
 #define TT_DESCRIPTOR_CONVERT_TO_SECTION_XN(Desc)            ((((Desc) & TT_DESCRIPTOR_PAGE_XN_MASK) << 4) & TT_DESCRIPTOR_SECTION_XN_MASK)\r
 #define TT_DESCRIPTOR_CONVERT_TO_SECTION_CACHE_POLICY(Desc)  ((((Desc) & (0x3 << 6)) << 6) | (Desc & (0x3 << 2)))\r
 \r
 #define TT_DESCRIPTOR_SECTION_ATTRIBUTE_MASK  (TT_DESCRIPTOR_SECTION_NS_MASK | TT_DESCRIPTOR_SECTION_NG_MASK |               \\r
                                                              TT_DESCRIPTOR_SECTION_S_MASK | TT_DESCRIPTOR_SECTION_AP_MASK | \\r
+                                                             TT_DESCRIPTOR_SECTION_AF | \\r
                                                              TT_DESCRIPTOR_SECTION_XN_MASK | TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK)\r
 \r
 #define TT_DESCRIPTOR_PAGE_ATTRIBUTE_MASK  (TT_DESCRIPTOR_PAGE_NG_MASK | TT_DESCRIPTOR_PAGE_S_MASK |                  \\r
                                                              TT_DESCRIPTOR_PAGE_AP_MASK | TT_DESCRIPTOR_PAGE_XN_MASK | \\r
+                                                             TT_DESCRIPTOR_PAGE_AF | \\r
                                                              TT_DESCRIPTOR_PAGE_CACHE_POLICY_MASK)\r
 \r
 #define TT_DESCRIPTOR_SECTION_DOMAIN_MASK  (0x0FUL << 5)\r
@@ -159,6 +163,7 @@
                                                             TT_DESCRIPTOR_SECTION_S_SHARED                          | \\r
                                                             TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
                                                             TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
+                                                            TT_DESCRIPTOR_SECTION_AF                                | \\r
                                                             TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK_ALLOC)\r
 #define TT_DESCRIPTOR_SECTION_WRITE_THROUGH(NonSecure)  (TT_DESCRIPTOR_SECTION_TYPE_SECTION                                                           |     \\r
                                                             ((NonSecure) ?  TT_DESCRIPTOR_SECTION_NS : 0)    | \\r
@@ -166,6 +171,7 @@
                                                             TT_DESCRIPTOR_SECTION_S_SHARED                          | \\r
                                                             TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
                                                             TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
+                                                            TT_DESCRIPTOR_SECTION_AF                                | \\r
                                                             TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC)\r
 #define TT_DESCRIPTOR_SECTION_DEVICE(NonSecure)         (TT_DESCRIPTOR_SECTION_TYPE_SECTION                                                           |     \\r
                                                             ((NonSecure) ?  TT_DESCRIPTOR_SECTION_NS : 0)    | \\r
@@ -174,6 +180,7 @@
                                                             TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
                                                             TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
                                                             TT_DESCRIPTOR_SECTION_XN_MASK                           | \\r
+                                                            TT_DESCRIPTOR_SECTION_AF                                | \\r
                                                             TT_DESCRIPTOR_SECTION_CACHE_POLICY_SHAREABLE_DEVICE)\r
 #define TT_DESCRIPTOR_SECTION_UNCACHED(NonSecure)       (TT_DESCRIPTOR_SECTION_TYPE_SECTION                                                           |    \\r
                                                            ((NonSecure) ?  TT_DESCRIPTOR_SECTION_NS : 0)    | \\r
@@ -181,28 +188,33 @@
                                                            TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \\r
                                                            TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \\r
                                                            TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \\r
+                                                            TT_DESCRIPTOR_SECTION_AF                                | \\r
                                                            TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE)\r
 \r
 #define TT_DESCRIPTOR_PAGE_WRITE_BACK     (TT_DESCRIPTOR_PAGE_TYPE_PAGE                                                           |          \\r
                                                         TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \\r
                                                         TT_DESCRIPTOR_PAGE_S_SHARED                                                       | \\r
                                                         TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \\r
+                                                        TT_DESCRIPTOR_PAGE_AF                                                             | \\r
                                                         TT_DESCRIPTOR_PAGE_CACHE_POLICY_WRITE_BACK_ALLOC)\r
 #define TT_DESCRIPTOR_PAGE_WRITE_THROUGH  (TT_DESCRIPTOR_PAGE_TYPE_PAGE                                                           |          \\r
                                                         TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \\r
                                                         TT_DESCRIPTOR_PAGE_S_SHARED                                                       | \\r
                                                         TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \\r
+                                                        TT_DESCRIPTOR_PAGE_AF                                                             | \\r
                                                         TT_DESCRIPTOR_PAGE_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC)\r
 #define TT_DESCRIPTOR_PAGE_DEVICE         (TT_DESCRIPTOR_PAGE_TYPE_PAGE                                                           |          \\r
                                                         TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \\r
                                                         TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                   | \\r
                                                         TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \\r
+                                                        TT_DESCRIPTOR_PAGE_AF                                                             | \\r
                                                         TT_DESCRIPTOR_PAGE_XN_MASK                                                        | \\r
                                                         TT_DESCRIPTOR_PAGE_CACHE_POLICY_SHAREABLE_DEVICE)\r
 #define TT_DESCRIPTOR_PAGE_UNCACHED       (TT_DESCRIPTOR_PAGE_TYPE_PAGE                                                           |          \\r
                                                         TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \\r
                                                         TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                   | \\r
                                                         TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \\r
+                                                        TT_DESCRIPTOR_PAGE_AF                                                             | \\r
                                                         TT_DESCRIPTOR_PAGE_CACHE_POLICY_NON_CACHEABLE)\r
 \r
 // First Level Descriptors\r

diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S
index 4925f6628e1e907ed77151c075f57379d7d0fe9d..1f396adffc115dd9df9dae9f8e01f39bb6cf7bd1 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S
@@ -16,6 +16,7 @@
 .set CTRL_C_BIT,  (1 << 2)\r
 .set CTRL_B_BIT,  (1 << 7)\r
 .set CTRL_I_BIT,  (1 << 12)\r
+.set CTRL_AFE_BIT,(1 << 29)\r
 \r
 \r
 ASM_FUNC(ArmInvalidateDataCacheEntryByMVA)\r
@@ -64,6 +65,7 @@ ASM_FUNC(ArmInvalidateInstructionCache)
 ASM_FUNC(ArmEnableMmu)\r
   mrc     p15,0,R0,c1,c0,0\r
   orr     R0,R0,#1\r
+  orr     R0,R0,#CTRL_AFE_BIT\r
   mcr     p15,0,R0,c1,c0,0\r
   dsb\r
   isb\r

diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c
index 6e2f08a7ce15042cc61c7da28c58bef095e1f73b..52dbfd7140297d46081b5704c64df7c303839fbe 100644 (file)
--- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c
+++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c
@@ -23,6 +23,7 @@ ConvertSectionAttributesToPageAttributes (
   PageAttributes  = 0;\r
   PageAttributes |= TT_DESCRIPTOR_CONVERT_TO_PAGE_CACHE_POLICY (SectionAttributes);\r
   PageAttributes |= TT_DESCRIPTOR_CONVERT_TO_PAGE_AP (SectionAttributes);\r
+  PageAttributes |= TT_DESCRIPTOR_CONVERT_TO_PAGE_AF (SectionAttributes);\r
   PageAttributes |= TT_DESCRIPTOR_CONVERT_TO_PAGE_XN (SectionAttributes);\r
   PageAttributes |= TT_DESCRIPTOR_CONVERT_TO_PAGE_NG (SectionAttributes);\r
   PageAttributes |= TT_DESCRIPTOR_CONVERT_TO_PAGE_S (SectionAttributes);\r

diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c
index 12d0f4c30f8ead8ad9cd0360c815fd1e9144a97b..484c67476619e3dbc3e1547941f9a5b882dd7708 100644 (file)
--- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c
+++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c
@@ -104,7 +104,7 @@ UpdatePageEntries (
 \r
   // EntryMask: bitmask of values to change (1 = change this value, 0 = leave alone)\r
   // EntryValue: values at bit positions specified by EntryMask\r
-  EntryMask = TT_DESCRIPTOR_PAGE_TYPE_MASK | TT_DESCRIPTOR_PAGE_AP_MASK | TT_DESCRIPTOR_PAGE_XN_MASK;\r
+  EntryMask = TT_DESCRIPTOR_PAGE_TYPE_MASK | TT_DESCRIPTOR_PAGE_AP_MASK | TT_DESCRIPTOR_PAGE_XN_MASK | TT_DESCRIPTOR_PAGE_AF;\r
   EntryValue = TT_DESCRIPTOR_PAGE_TYPE_PAGE;\r
 \r
   // Although the PI spec is unclear on this, the GCD guarantees that only\r
@@ -138,6 +138,10 @@ UpdatePageEntries (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
+  if ((Attributes & EFI_MEMORY_RP) == 0) {\r
+    EntryValue |= TT_DESCRIPTOR_PAGE_AF;\r
+  }\r
+\r
   if ((Attributes & EFI_MEMORY_RO) != 0) {\r
     EntryValue |= TT_DESCRIPTOR_PAGE_AP_RO_RO;\r
   } else {\r
@@ -237,7 +241,7 @@ UpdateSectionEntries (
 \r
   // Make sure we handle a section range that is unmapped\r
   EntryMask = TT_DESCRIPTOR_SECTION_TYPE_MASK | TT_DESCRIPTOR_SECTION_XN_MASK |\r
-              TT_DESCRIPTOR_SECTION_AP_MASK;\r
+              TT_DESCRIPTOR_SECTION_AP_MASK | TT_DESCRIPTOR_SECTION_AF;\r
   EntryValue = TT_DESCRIPTOR_SECTION_TYPE_SECTION;\r
 \r
   // Although the PI spec is unclear on this, the GCD guarantees that only\r
@@ -281,6 +285,10 @@ UpdateSectionEntries (
     EntryValue |= TT_DESCRIPTOR_SECTION_XN_MASK;\r
   }\r
 \r
+  if ((Attributes & EFI_MEMORY_RP) == 0) {\r
+    EntryValue |= TT_DESCRIPTOR_SECTION_AF;\r
+  }\r
+\r
   // obtain page table base\r
   FirstLevelTable = (ARM_FIRST_LEVEL_DESCRIPTOR *)ArmGetTTBR0BaseAddress ();\r
 \r