Skip to content

UefiCpuPkg/BaseRiscVMmuLib: Support MMU page unmap #12393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benjamindoron wants to merge 2 commits into
base: master
Choose a base branch
from
Open

UefiCpuPkg/BaseRiscVMmuLib: Support MMU page unmap #12393

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe7aafc
UefiCpuPkg/BaseRiscVMmuLib: Unset the 'valid' bit when unmapping memory
benjamindoron Apr 3, 2026
496cffa
UefiCpuPkg/BaseRiscVMmuLib: Support MMU page unmap
benjamindoron Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion UefiCpuPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,18 @@ UpdateRegionMappingRecursive (
}

EntryValue = SetPpnToPte (EntryValue, RegionStart);
EntryValue = SetValidPte (EntryValue);

//
// Unmapped memory regions must have the 'valid' bit cleared.
// This is because entries with 'valid' set and RWX clear are considered as "table entries"
// (non-leaves), and trigger the ASSERT above for reaching the leaf-level with a non-leaf.
//
if ((AttributeClearMask == PTE_ATTRIBUTES_MASK) && (AttributeSetMask == 0)) {
Comment thread
benjamindoron marked this conversation as resolved.
EntryValue &= ~RISCV_PG_V;
} else {
EntryValue = SetValidPte (EntryValue);
}

ReplaceTableEntry (Entry, EntryValue, RegionStart, TableIsLive);
}
}
Expand Down Expand Up @@ -521,6 +532,10 @@ GcdAttributeToPageAttribute (
}

// Determine protection attributes
if ((GcdAttributes & EFI_MEMORY_RP) != 0) {
*RiscVAttributes &= ~(UINT64)(RISCV_PG_R);
}

if ((GcdAttributes & EFI_MEMORY_RO) != 0) {
*RiscVAttributes &= ~(UINT64)(RISCV_PG_W);
}
Expand Down
Loading