i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot/efi/arm: use insert_address_range for virtual_ranges_to_keep

Browse Source 
Change-Id: Iaf67838e8ef3d9a9494791945bd777b92315a948
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4877
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Fredrik Holmqvist <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
David Karoly
2022-01-25 11:39:14 +00:00
committed by Adrien Destugues
parent 971ad09095
commit 9a573968a2
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/efi/arch/arm/arch_mmu.cpp
+11 -8
View File
@@ -98,14 +98,17 @@ map_range(addr_t virt_addr, phys_addr_t phys_addr, size_t size, uint32_t flags)
static void static void
insert_virtual_range_to_keep(const addr_range& range) insert_virtual_range_to_keep(uint64 start, uint64 size)
{ {
if (gKernelArgs.arch_args.num_virtual_ranges_to_keep status_t status = insert_address_range(
>= MAX_VIRTUAL_RANGES_TO_KEEP) gKernelArgs.arch_args.virtual_ranges_to_keep,
panic("too many virtual ranges to keep"); &gKernelArgs.arch_args.num_virtual_ranges_to_keep,
MAX_VIRTUAL_RANGES_TO_KEEP, start, size);
gKernelArgs.arch_args.virtual_ranges_to_keep[ if (status == B_ENTRY_NOT_FOUND)
gKernelArgs.arch_args.num_virtual_ranges_to_keep++] = range; panic("too many virtual ranges to keep");
else if (status != B_OK)
panic("failed to add virtual range to keep");
} }
@@ -124,7 +127,7 @@ map_range_to_new_area(addr_range& range, uint32_t flags)
range.start = virt_addr; range.start = virt_addr;
insert_virtual_range_to_keep(range); insert_virtual_range_to_keep(range.start, range.size);
} }
@@ -134,7 +137,7 @@ map_range_to_new_area(efi_memory_descriptor *entry, uint32_t flags)
uint64_t size = entry->NumberOfPages * B_PAGE_SIZE; uint64_t size = entry->NumberOfPages * B_PAGE_SIZE;
entry->VirtualStart = get_next_virtual_address(size); entry->VirtualStart = get_next_virtual_address(size);
map_range(entry->VirtualStart, entry->PhysicalStart, size, flags); map_range(entry->VirtualStart, entry->PhysicalStart, size, flags);
insert_virtual_range_to_keep({start: entry->VirtualStart, size: size}); insert_virtual_range_to_keep(entry->VirtualStart, size);
} }