Sync up ArmPkg with patch from mailing list. Changed name of BdsLib.h to BdsUnixLib...

[mirror_edk2.git] / ArmPkg / Library / ArmLib / Arm11 / Arm11Lib.c

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c b/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c
index 710b838073ce214c40f03d67e516be0234a0efae..1257be8cf60a67f6e274904e7d6cc2c092cbccd0 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c
@@ -31,14 +31,25 @@ FillTranslationTable (
   
   switch (MemoryRegion->Attributes) {
     case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK:
   
   switch (MemoryRegion->Attributes) {
     case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK:

-      Attributes = TT_DESCRIPTOR_SECTION_WRITE_BACK;
+      Attributes = TT_DESCRIPTOR_SECTION_WRITE_BACK(0);

       break;
     case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_THROUGH:
       break;
     case ARM_MEMORY_REGION_ATTRIBUTE_WRITE_THROUGH:

-      Attributes = TT_DESCRIPTOR_SECTION_WRITE_THROUGH;
+      Attributes = TT_DESCRIPTOR_SECTION_WRITE_THROUGH(0);

       break;
     case ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED:
       break;
     case ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED:

+      Attributes = TT_DESCRIPTOR_SECTION_UNCACHED(0);
+      break;
+    case ARM_MEMORY_REGION_ATTRIBUTE_SECURE_WRITE_BACK:
+      Attributes = TT_DESCRIPTOR_SECTION_WRITE_BACK(1);
+      break;
+    case ARM_MEMORY_REGION_ATTRIBUTE_SECURE_WRITE_THROUGH:
+      Attributes = TT_DESCRIPTOR_SECTION_WRITE_THROUGH(1);
+      break;
+    case ARM_MEMORY_REGION_ATTRIBUTE_SECURE_UNCACHED_UNBUFFERED:
+      Attributes = TT_DESCRIPTOR_SECTION_UNCACHED(1);
+      break;

     default:
     default:

-      Attributes = TT_DESCRIPTOR_SECTION_UNCACHED;
+      Attributes = TT_DESCRIPTOR_SECTION_UNCACHED(0);

       break;
   }
   
       break;
   }
   


@@ -93,7 +104,7 @@ ArmConfigureMmu (
     MemoryTable++;
   }
 
     MemoryTable++;
   }
 

-  ArmSetTranslationTableBaseAddress(TranslationTable);
+  ArmSetTTBR0(TranslationTable);

     
   ArmSetDomainAccessControl(DOMAIN_ACCESS_CONTROL_NONE(15) |
                             DOMAIN_ACCESS_CONTROL_NONE(14) |
     
   ArmSetDomainAccessControl(DOMAIN_ACCESS_CONTROL_NONE(15) |
                             DOMAIN_ACCESS_CONTROL_NONE(14) |