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>
This commit is contained in:
Ard Biesheuvel 2020-03-31 19:25:06 +02:00 committed by mergify[bot]
parent db0f8c2f84
commit 991c5d89ba
1 changed files with 6 additions and 16 deletions

View File

@ -70,21 +70,13 @@ GetRootTableEntryCount (
return TT_ENTRY_COUNT >> (T0SZ - MIN_T0SZ) % BITS_PER_LEVEL;
}
VOID
GetRootTranslationTableInfo (
IN UINTN T0SZ,
OUT UINTN *TableLevel,
OUT UINTN *TableEntryCount
STATIC
UINTN
GetRootTableLevel (
IN UINTN T0SZ
)
{
// Get the level of the root table
if (TableLevel) {
*TableLevel = (T0SZ - MIN_T0SZ) / BITS_PER_LEVEL;
}
if (TableEntryCount) {
*TableEntryCount = 1UL << (BITS_PER_LEVEL - (T0SZ - MIN_T0SZ) % BITS_PER_LEVEL);
}
return (T0SZ - MIN_T0SZ) / BITS_PER_LEVEL;
}
STATIC
@ -303,7 +295,6 @@ UpdateRegionMapping (
IN UINT64 AttributeClearMask
)
{
UINTN RootTableLevel;
UINTN T0SZ;
if (((RegionStart | RegionLength) & EFI_PAGE_MASK)) {
@ -311,11 +302,10 @@ UpdateRegionMapping (
}
T0SZ = ArmGetTCR () & TCR_T0SZ_MASK;
GetRootTranslationTableInfo (T0SZ, &RootTableLevel, NULL);
return UpdateRegionMappingRecursive (RegionStart, RegionStart + RegionLength,
AttributeSetMask, AttributeClearMask, ArmGetTTBR0BaseAddress (),
RootTableLevel);
GetRootTableLevel (T0SZ));
}
STATIC