From 9207c5d75871fed9f98ee6548e9d420e4d11f340 Mon Sep 17 00:00:00 2001
From: oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 14 Feb 2012 15:54:05 +0000
Subject: ArmPkg: Changed ARM CPU SetMemoryAttributes to always use strongly
 ordered for the EFI_MEMORY_UC attribute

Changed ARM CPU SetMemoryAttributes to always use strongly ordered for the EFI_MEMORY_UC attribute.

Signed-off-by:
Reviewed-by: eugenecohen
Reviewed-by: yanivtal




git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13011 6f19259b-4bc3-4df7-8a09-765794883524
---
 ArmPkg/Drivers/CpuDxe/CpuDxe.inf |  1 -
 ArmPkg/Drivers/CpuDxe/Mmu.c      | 18 ++++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'ArmPkg/Drivers')

diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
index e5709a63d0..9a3b8e8afc 100644
--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
+++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
@@ -81,7 +81,6 @@
   gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport
   gArmTokenSpaceGuid.PcdRelocateVectorTable
   gArmTokenSpaceGuid.PcdDebuggerExceptionSupport
-  gArmTokenSpaceGuid.PcdEfiUncachedMemoryToStronglyOrdered
 
 [Depex]
   TRUE
diff --git a/ArmPkg/Drivers/CpuDxe/Mmu.c b/ArmPkg/Drivers/CpuDxe/Mmu.c
index 6218b5d27f..f54350b5a2 100644
--- a/ArmPkg/Drivers/CpuDxe/Mmu.c
+++ b/ArmPkg/Drivers/CpuDxe/Mmu.c
@@ -498,13 +498,8 @@ UpdatePageEntries (
     case EFI_MEMORY_UC:
       // modify cacheability attributes
       EntryMask |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_MASK;
-      if (FeaturePcdGet(PcdEfiUncachedMemoryToStronglyOrdered)) {
-        // map to strongly ordered
-        EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0
-      } else {
-        // map to normal non-cachable
-        EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0
-      }
+      // map to strongly ordered
+      EntryValue |= TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0
       break;
 
     case EFI_MEMORY_WC:
@@ -646,13 +641,8 @@ UpdateSectionEntries (
     case EFI_MEMORY_UC:
       // modify cacheability attributes
       EntryMask |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK;
-      if (FeaturePcdGet(PcdEfiUncachedMemoryToStronglyOrdered)) {
-        // map to strongly ordered
-        EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0
-      } else {
-        // map to normal non-cachable
-        EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE; // TEX [2:0]= 001 = 0x2, B=0, C=0
-      }
+      // map to strongly ordered
+      EntryValue |= TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED; // TEX[2:0] = 0, C=0, B=0
       break;
 
     case EFI_MEMORY_WC:
-- 
cgit v1.2.3