RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:04:59 +00:00
Code Issues Activity Actions

Kernel: Scan ACPI memory ranges for the RSDP table

Browse source 
On some systems the ACPI RSDP table may be located in ACPI reserved
memory ranges rather than in the EBDA or BIOS areas.
This commit is contained in:
Tom 2022-01-02 16:27:21 -07:00 • committed by Linus Groh
parent 190572b714
commit 10efbfb09e
3 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Kernel/Firmware/ACPI/Parser.cpp
View file

@ -388,7 +388,28 @@ UNMAP_AFTER_INIT Optional<PhysicalAddress> StaticParsing::find_rsdp()
auto rsdp = map_ebda().find_chunk_starting_with(signature, 16);
if (rsdp.has_value())
return rsdp;
return map_bios().find_chunk_starting_with(signature, 16);
rsdp = map_bios().find_chunk_starting_with(signature, 16);
if (rsdp.has_value())
return rsdp;
// On some systems the RSDP may be located in ACPI NVS or reclaimable memory regions
MM.for_each_physical_memory_range([&](auto& memory_range) {
if (!(memory_range.type == Memory::PhysicalMemoryRangeType::ACPI_NVS || memory_range.type == Memory::PhysicalMemoryRangeType::ACPI_Reclaimable))
return IterationDecision::Continue;
Memory::MappedROM mapping;
mapping.region = MM.allocate_kernel_region(memory_range.start, Memory::page_round_up(memory_range.length).release_value_but_fixme_should_propagate_errors(), {}, Memory::Region::Access::Read).release_value();
mapping.offset = memory_range.start.offset_in_page();
mapping.size = memory_range.length;
mapping.paddr = memory_range.start;
rsdp = mapping.find_chunk_starting_with(signature, 16);
if (rsdp.has_value())
return IterationDecision::Break;
return IterationDecision::Continue;
});
return rsdp;
}
UNMAP_AFTER_INIT Optional<PhysicalAddress> StaticParsing::find_table(PhysicalAddress rsdp_address, StringView signature)

11
Kernel/Memory/MemoryManager.cpp
View file

@ -174,6 +174,17 @@ UNMAP_AFTER_INIT void MemoryManager::protect_ksyms_after_init()
dmesgln("Write-protected kernel symbols after init.");
}
IterationDecision MemoryManager::for_each_physical_memory_range(Function<IterationDecision(PhysicalMemoryRange const&)> callback)
{
VERIFY(!m_physical_memory_ranges.is_empty());
for (auto& current_range : m_physical_memory_ranges) {
IterationDecision decision = callback(current_range);
if (decision != IterationDecision::Continue)
return decision;
}
return IterationDecision::Continue;
}
UNMAP_AFTER_INIT void MemoryManager::register_reserved_ranges()
{
VERIFY(!m_physical_memory_ranges.is_empty());

2
Kernel/Memory/MemoryManager.h
View file

@ -237,6 +237,8 @@ public:
void copy_physical_page(PhysicalPage&, u8 page_buffer[PAGE_SIZE]);
IterationDecision for_each_physical_memory_range(Function<IterationDecision(PhysicalMemoryRange const&)>);
private:
MemoryManager();
~MemoryManager();