ArmPkg/Mmu: Increase PageLevel when table found at the targeted level

Below code has bug since *BlockEntrySize and *TableLevel are not
updated accordingly:

if (IndexLevel == PageLevel) {
  // And get the appropriate BlockEntry at the next level
  BlockEntry = (UINT64*)TT_GET_ENTRY_FOR_ADDRESS (TranslationTable, \
      IndexLevel + 1, RegionStart);

  // Set the last block for this new table
  *LastBlockEntry = TT_LAST_BLOCK_ADDRESS(TranslationTable, \
      TT_ENTRY_COUNT);
}

Also it doesn't check recursively to get the last level, e.g. the
initial PageLevel is 1 and we already have level 2 and 3 tables at
this address.

What's more, *LastBlockEntry was not updated when we get a table and
IndexLevel != PageLevel.

So we reorganize the sequence, only updating TranslationTable,
PageLevel and BlockEntry in the loop, and setting the other output
parameters with the final PageLevel before returning.

And LastBlockEntry is only an OUT parameter.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18424 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Mmu.c b/ArmPkg/Library/ArmLib/AArch64/AArch64Mmu.c
index dc50e0e0ec1bdea439b8310333afcdf1cebf5c7b..850fe7ff1483639e62514c6a1f3a439c367881a6 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Mmu.c
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Mmu.c
@@ -244,7 +244,7 @@ GetBlockEntryListFromAddress (
   IN  UINT64        RegionStart,\r
   OUT UINTN        *TableLevel,\r
   IN OUT UINT64    *BlockEntrySize,\r
-  IN OUT UINT64   **LastBlockEntry\r
+  OUT UINT64      **LastBlockEntry\r
   )\r
 {\r
   UINTN   RootTableLevel;\r
@@ -282,14 +282,9 @@ GetBlockEntryListFromAddress (
     return NULL;\r
   }\r
 \r
-  //\r
-  // Calculate LastBlockEntry from T0SZ - this is the last block entry of the root Translation table\r
-  //\r
   T0SZ = ArmGetTCR () & TCR_T0SZ_MASK;\r
   // Get the Table info from T0SZ\r
   GetRootTranslationTableInfo (T0SZ, &RootTableLevel, &RootTableEntryCount);\r
-  // The last block of the root table depends on the number of entry in this table\r
-  *LastBlockEntry = TT_LAST_BLOCK_ADDRESS(RootTable, RootTableEntryCount);\r
 \r
   // If the start address is 0x0 then we use the size of the region to identify the alignment\r
   if (RegionStart == 0) {\r
@@ -311,12 +306,6 @@ GetBlockEntryListFromAddress (
     PageLevel++;\r
   }\r
 \r
-  // Expose the found PageLevel to the caller\r
-  *TableLevel = PageLevel;\r
-\r
-  // Now, we have the Table Level we can get the Block Size associated to this table\r
-  *BlockEntrySize = TT_BLOCK_ENTRY_SIZE_AT_LEVEL (PageLevel);\r
-\r
   //\r
   // Get the Table Descriptor for the corresponding PageLevel. We need to decompose RegionStart to get appropriate entries\r
   //\r
@@ -329,13 +318,10 @@ GetBlockEntryListFromAddress (
       // Go to the next table\r
       TranslationTable = (UINT64*)(*BlockEntry & TT_ADDRESS_MASK_DESCRIPTION_TABLE);\r
 \r
-      // If we are at the last level then update the output\r
+      // If we are at the last level then update the last level to next level\r
       if (IndexLevel == PageLevel) {\r
-        // And get the appropriate BlockEntry at the next level\r
-        BlockEntry = (UINT64*)TT_GET_ENTRY_FOR_ADDRESS (TranslationTable, IndexLevel + 1, RegionStart);\r
-\r
-        // Set the last block for this new table\r
-        *LastBlockEntry = TT_LAST_BLOCK_ADDRESS(TranslationTable, TT_ENTRY_COUNT);\r
+        // Enter the next level\r
+        PageLevel++;\r
       }\r
     } else if ((*BlockEntry & TT_TYPE_MASK) == TT_TYPE_BLOCK_ENTRY) {\r
       // If we are not at the last level then we need to split this BlockEntry\r
@@ -383,11 +369,6 @@ GetBlockEntryListFromAddress (
 \r
         // Fill the BlockEntry with the new TranslationTable\r
         *BlockEntry = ((UINTN)TranslationTable & TT_ADDRESS_MASK_DESCRIPTION_TABLE) | TableAttributes | TT_TYPE_TABLE_ENTRY;\r
-        // Update the last block entry with the newly created translation table\r
-        *LastBlockEntry = TT_LAST_BLOCK_ADDRESS(TranslationTable, TT_ENTRY_COUNT);\r
-\r
-        // Block Entry points at the beginning of the Translation Table\r
-        BlockEntry = TranslationTable;\r
       }\r
     } else {\r
       if (IndexLevel != PageLevel) {\r
@@ -405,17 +386,21 @@ GetBlockEntryListFromAddress (
 \r
         // Fill the new BlockEntry with the TranslationTable\r
         *BlockEntry = ((UINTN)TranslationTable & TT_ADDRESS_MASK_DESCRIPTION_TABLE) | TT_TYPE_TABLE_ENTRY;\r
-        // Update the last block entry with the newly created translation table\r
-        *LastBlockEntry = TT_LAST_BLOCK_ADDRESS(TranslationTable, TT_ENTRY_COUNT);\r
-      } else {\r
-        //\r
-        // Case when the new region is part of an existing page table\r
-        //\r
-        *LastBlockEntry = TT_LAST_BLOCK_ADDRESS(TranslationTable, TT_ENTRY_COUNT);\r
       }\r
     }\r
   }\r
 \r
+  // Expose the found PageLevel to the caller\r
+  *TableLevel = PageLevel;\r
+\r
+  // Now, we have the Table Level we can get the Block Size associated to this table\r
+  *BlockEntrySize = TT_BLOCK_ENTRY_SIZE_AT_LEVEL (PageLevel);\r
+\r
+  // The last block of the root table depends on the number of entry in this table,\r
+  // otherwise it is always the (TT_ENTRY_COUNT - 1)th entry in the table.\r
+  *LastBlockEntry = TT_LAST_BLOCK_ADDRESS(TranslationTable,\r
+      (PageLevel == RootTableLevel) ? RootTableEntryCount : TT_ENTRY_COUNT);\r
+\r
   return BlockEntry;\r
 }\r
 \r