RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:38:11 +00:00
Code Issues Activity Actions

Kernel/aarch64: Change MMU::kernel_virtual_range to high virtual memory

Browse source 
This was previously hardcoded this to be the physical memory range,
since we identity mapped the memory, however we now run the kernel at
a high virtual memory address.

Also changes PageDirectory.h to store up-to 512 pages, as the code now
needs access to more than 4 pages.
This commit is contained in:
Timon Kruiper 2023-01-07 15:18:33 +01:00 • committed by Linus Groh
parent 5db32ecbe1
commit 5e00bb0b9f
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Kernel/Memory/MemoryManager.cpp
View file

@ -72,9 +72,8 @@ bool MemoryManager::is_initialized()
static UNMAP_AFTER_INIT VirtualRange kernel_virtual_range() static UNMAP_AFTER_INIT VirtualRange kernel_virtual_range()
{ {
#if ARCH(AARCH64) #if ARCH(AARCH64)
// NOTE: We currently identity map the kernel image for aarch64, so the kernel virtual range // NOTE: This is not the same as x86_64, because the aarch64 kernel currently doesn't use the pre-kernel.
// is the complete memory range. return VirtualRange { VirtualAddress(kernel_mapping_base), KERNEL_PD_END - kernel_mapping_base };
return VirtualRange { VirtualAddress((FlatPtr)0), 0x3F000000 };
#else #else
size_t kernel_range_start = kernel_mapping_base + 2 * MiB; // The first 2 MiB are used for mapping the pre-kernel size_t kernel_range_start = kernel_mapping_base + 2 * MiB; // The first 2 MiB are used for mapping the pre-kernel
return VirtualRange { VirtualAddress(kernel_range_start), KERNEL_PD_END - kernel_range_start }; return VirtualRange { VirtualAddress(kernel_range_start), KERNEL_PD_END - kernel_range_start };

4
Kernel/Memory/PageDirectory.h
View file

@ -67,11 +67,7 @@ private:
RefPtr<PhysicalPage> m_pml4t; RefPtr<PhysicalPage> m_pml4t;
#endif #endif
RefPtr<PhysicalPage> m_directory_table; RefPtr<PhysicalPage> m_directory_table;
#if ARCH(X86_64)
RefPtr<PhysicalPage> m_directory_pages[512]; RefPtr<PhysicalPage> m_directory_pages[512];
#else
RefPtr<PhysicalPage> m_directory_pages[4];
#endif
RecursiveSpinlock<LockRank::None> m_lock {}; RecursiveSpinlock<LockRank::None> m_lock {};
}; };