ArmPkg/CpuDxe: Fixed AArch64 MMU/GCD synchronization

- Fix the length used to set the GCD Memory Space attribute
- Print a warning message if the given length of a memory space region is not 4KB-aligned

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14562 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 10 insertions, 8 deletions

diff --git a/ArmPkg/Drivers/CpuDxe/AArch64/Mmu.c b/ArmPkg/Drivers/CpuDxe/AArch64/Mmu.c
index da6e6225be..40a4c1b0aa 100644
--- a/ArmPkg/Drivers/CpuDxe/AArch64/Mmu.c
+++ b/ArmPkg/Drivers/CpuDxe/AArch64/Mmu.c
@@ -89,7 +89,7 @@ GetNextEntryAttribute (
           // Update GCD with the last region

           SetGcdMemorySpaceAttributes (MemorySpaceMap, NumberOfDescriptors,

               *StartGcdRegion,

-              (BaseAddress + (Index * TT_ADDRESS_AT_LEVEL(TableLevel)) - 1) - *StartGcdRegion,

+              (BaseAddress + (Index * TT_ADDRESS_AT_LEVEL(TableLevel))) - *StartGcdRegion,

               PageAttributeToGcdAttribute (EntryAttribute));

         }

 

@@ -113,8 +113,8 @@ GetNextEntryAttribute (
         // Update GCD with the last region

         SetGcdMemorySpaceAttributes (MemorySpaceMap, NumberOfDescriptors,

             *StartGcdRegion,

-            (BaseAddress + (Index * TT_ADDRESS_AT_LEVEL(TableLevel)) - 1) - *StartGcdRegion,

-            PageAttributeToGcdAttribute (EntryAttribute));

+            (BaseAddress + (Index * TT_ADDRESS_AT_LEVEL(TableLevel))) - *StartGcdRegion,

+            PageAttributeToGcdAttribute (*PrevEntryAttribute));

 

         // Start of the new region

         *StartGcdRegion = BaseAddress + (Index * TT_ADDRESS_AT_LEVEL(TableLevel));

@@ -182,11 +182,13 @@ SyncCacheConfig (
                                                BaseAddressGcdRegion,

                                                &PageAttribute, &BaseAddressGcdRegion);

 

-  // Update GCD with the last region

-  SetGcdMemorySpaceAttributes (MemorySpaceMap, NumberOfDescriptors,

-      BaseAddressGcdRegion,

-      EndAddressGcdRegion - BaseAddressGcdRegion,

-      PageAttributeToGcdAttribute (PageAttribute));

+  // Update GCD with the last region if valid

+  if (PageAttribute != TT_ATTR_INDX_INVALID) {

+    SetGcdMemorySpaceAttributes (MemorySpaceMap, NumberOfDescriptors,

+        BaseAddressGcdRegion,

+        EndAddressGcdRegion - BaseAddressGcdRegion,

+        PageAttributeToGcdAttribute (PageAttribute));

+  }

 

   FreePool (MemorySpaceMap);