ArmPkg/ArmMmuLib: get rid of GetRootTranslationTableInfo()

Only a single call to GetRootTranslationTableInfo() remains, which
only provides the root table level. So let's create a new static
helper function that returns just this value, and use it instead.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
index b6f3ef54aa26aa72bb98e7c7843ca9389e3bbf66..a82596d290f125f0c191b4c5f5c6e8ac10c8779d 100644 (file)
--- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
+++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
@@ -70,21 +70,13 @@ GetRootTableEntryCount (
   return TT_ENTRY_COUNT >> (T0SZ - MIN_T0SZ) % BITS_PER_LEVEL;\r
 }\r
 \r
-VOID\r
-GetRootTranslationTableInfo (\r
-  IN UINTN     T0SZ,\r
-  OUT UINTN   *TableLevel,\r
-  OUT UINTN   *TableEntryCount\r
+STATIC\r
+UINTN\r
+GetRootTableLevel (\r
+  IN  UINTN T0SZ\r
   )\r
 {\r
-  // Get the level of the root table\r
-  if (TableLevel) {\r
-    *TableLevel = (T0SZ - MIN_T0SZ) / BITS_PER_LEVEL;\r
-  }\r
-\r
-  if (TableEntryCount) {\r
-    *TableEntryCount = 1UL << (BITS_PER_LEVEL - (T0SZ - MIN_T0SZ) % BITS_PER_LEVEL);\r
-  }\r
+  return (T0SZ - MIN_T0SZ) / BITS_PER_LEVEL;\r
 }\r
 \r
 STATIC\r
@@ -303,7 +295,6 @@ UpdateRegionMapping (
   IN  UINT64  AttributeClearMask\r
   )\r
 {\r
-  UINTN     RootTableLevel;\r
   UINTN     T0SZ;\r
 \r
   if (((RegionStart | RegionLength) & EFI_PAGE_MASK)) {\r
@@ -311,11 +302,10 @@ UpdateRegionMapping (
   }\r
 \r
   T0SZ = ArmGetTCR () & TCR_T0SZ_MASK;\r
-  GetRootTranslationTableInfo (T0SZ, &RootTableLevel, NULL);\r
 \r
   return UpdateRegionMappingRecursive (RegionStart, RegionStart + RegionLength,\r
            AttributeSetMask, AttributeClearMask, ArmGetTTBR0BaseAddress (),\r
-           RootTableLevel);\r
+           GetRootTableLevel (T0SZ));\r
 }\r
 \r
 STATIC\r