X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ArmPkg%2FLibrary%2FArmMmuLib%2FAArch64%2FArmMmuLibCore.c;fp=ArmPkg%2FLibrary%2FArmMmuLib%2FAArch64%2FArmMmuLibCore.c;h=a82596d290f125f0c191b4c5f5c6e8ac10c8779d;hb=991c5d89ba245f623c61fe5568d29cb3c7f6bb11;hp=b6f3ef54aa26aa72bb98e7c7843ca9389e3bbf66;hpb=db0f8c2f849e9bc0c965db0d1befb19050224d66;p=mirror_edk2.git diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c index b6f3ef54aa..a82596d290 100644 --- 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; } -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