tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmPkg/ArmMmuLib AARCH64: use helpers to determine table entry types 

Given how the meaning of the attribute bits for page table entry types
is slightly awkward, and changes between levels, add some helpers to
abstract from this.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>
Reviewed-by: Ashish Singhal <ashishsingha@nvidia.com>
Tested-by: Ashish Singhal <ashishsingha@nvidia.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Ard Biesheuvel 2020-03-07 12:44:16 +01:00 committed by mergify[bot]
parent d390920ed4
commit 5fc899535e
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
View File

@ -162,6 +162,36 @@ FreePageTablesRecursive (
FreePages (TranslationTable, 1);
}
STATIC
BOOLEAN
IsBlockEntry (
IN UINT64 Entry,
IN UINTN Level
)
{
if (Level == 3) {
return (Entry & TT_TYPE_MASK) == TT_TYPE_BLOCK_ENTRY_LEVEL3;
}
return (Entry & TT_TYPE_MASK) == TT_TYPE_BLOCK_ENTRY;
}
STATIC
BOOLEAN
IsTableEntry (
IN UINT64 Entry,
IN UINTN Level
)
{
if (Level == 3) {
//
// TT_TYPE_TABLE_ENTRY aliases TT_TYPE_BLOCK_ENTRY_LEVEL3
// so we need to take the level into account as well.
//
return FALSE;
}
return (Entry & TT_TYPE_MASK) == TT_TYPE_TABLE_ENTRY;
}
STATIC
EFI_STATUS
UpdateRegionMappingRecursive (
@ -203,7 +233,7 @@ UpdateRegionMappingRecursive (
if (Level == 0 || ((RegionStart | BlockEnd) & BlockMask) != 0) {
ASSERT (Level < 3);
if ((*Entry & TT_TYPE_MASK) != TT_TYPE_TABLE_ENTRY) {
if (!IsTableEntry (*Entry, Level)) {
//
// No table entry exists yet, so we need to allocate a page table
// for the next level.
@ -221,7 +251,7 @@ UpdateRegionMappingRecursive (
InvalidateDataCacheRange (TranslationTable, EFI_PAGE_SIZE);
}
if ((*Entry & TT_TYPE_MASK) == TT_TYPE_BLOCK_ENTRY) {
if (IsBlockEntry (*Entry, Level)) {
//
// We are splitting an existing block entry, so we have to populate
// the new table with the attributes of the block entry it replaces.
@ -252,7 +282,7 @@ UpdateRegionMappingRecursive (
AttributeSetMask, AttributeClearMask, TranslationTable,
Level + 1);
if (EFI_ERROR (Status)) {
if ((*Entry & TT_TYPE_MASK) != TT_TYPE_TABLE_ENTRY) {
if (!IsTableEntry (*Entry, Level)) {
//
// We are creating a new table entry, so on failure, we can free all
// allocations we made recursively, given that the whole subhierarchy
@ -265,10 +295,10 @@ UpdateRegionMappingRecursive (
return Status;
}
if ((*Entry & TT_TYPE_MASK) != TT_TYPE_TABLE_ENTRY) {
if (!IsTableEntry (*Entry, Level)) {
EntryValue = (UINTN)TranslationTable | TT_TYPE_TABLE_ENTRY;
ReplaceTableEntry (Entry, EntryValue, RegionStart,
(*Entry & TT_TYPE_MASK) == TT_TYPE_BLOCK_ENTRY);
IsBlockEntry (*Entry, Level));
}
} else {
EntryValue = (*Entry & AttributeClearMask) | AttributeSetMask;