Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pmm: Properly handle memory map entries that cross 4GiB on UEFI

Browse Source
This commit is contained in:
mintsuki 2022-08-13 17:52:01 +02:00
parent bdcf562e2c
commit 71fd2d2516
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/mm/pmm.s2.c
View File

@ -350,8 +350,21 @@ void init_memmap(void) {
uint64_t base = entry->PhysicalStart;
uint64_t length = entry->NumberOfPages * 4096;
// We only manage memory below 4GiB. For anything above that, make it
// EFI reclaimable.
if (our_type == MEMMAP_USABLE) {
if (base + length >= 0x100000000) {
if (base + length > 0x100000000) {
if (base < 0x100000000) {
memmap[memmap_entries].base = base;
memmap[memmap_entries].length = 0x100000000 - base;
memmap[memmap_entries].type = our_type;
base = 0x100000000;
length -= memmap[memmap_entries].length;
memmap_entries++;
}
our_type = MEMMAP_EFI_RECLAIMABLE;
}
}