ArmPkg: Changed ARM CPU SetMemoryAttributes to always use strongly ordered for the...

[mirror_edk2.git] / ArmPkg / Drivers / CpuDxe / Mmu.c

diff --git a/ArmPkg/Drivers/CpuDxe/Mmu.c b/ArmPkg/Drivers/CpuDxe/Mmu.c
index 6218b5d27f1f0319950dfd57047b6956fe89a972..f54350b5a26e8b449a599f38271a88e5dfde7343 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/Mmu.c
+++ b/ArmPkg/Drivers/CpuDxe/Mmu.c
@@ -498,13 +498,8 @@ UpdatePageEntries (
     case EFI_MEMORY_UC:\r
       // modify cacheability attributes\r
       EntryMask |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_MASK;\r
-      if (FeaturePcdGet(PcdEfiUncachedMemoryToStronglyOrdered)) {\r
-        // map to strongly ordered\r
-        EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0\r
-      } else {\r
-        // map to normal non-cachable\r
-        EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0\r
-      }\r
+      // map to strongly ordered\r
+      EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0\r
       break;\r
 \r
     case EFI_MEMORY_WC:\r
@@ -646,13 +641,8 @@ UpdateSectionEntries (
     case EFI_MEMORY_UC:\r
       // modify cacheability attributes\r
       EntryMask |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK;\r
-      if (FeaturePcdGet(PcdEfiUncachedMemoryToStronglyOrdered)) {\r
-        // map to strongly ordered\r
-        EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0\r
-      } else {\r
-        // map to normal non-cachable\r
-        EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0\r
-      }\r
+      // map to strongly ordered\r
+      EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0\r
       break;\r
 \r
     case EFI_MEMORY_WC:\r