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

Kernel: Simplify scanning BIOS/EBDA and MP parser initialization

Browse source 
Add a MappedROM::find_chunk_starting_with() helper since that's a very
common usage pattern in clients of this code.

Also convert MultiProcessorParser from a persistent singleton object
to a temporary object constructed via a failable factory function.
This commit is contained in:
Andreas Kling 2020-05-22 13:34:53 +02:00
parent 84b7bc5e14
commit 4b847810bf
8 changed files with 47 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Kernel/ACPI/Parser.cpp
View file

@ -322,29 +322,6 @@ Parser::Parser(PhysicalAddress rsdp)
locate_static_data();
}
static PhysicalAddress find_rsdp_in_ebda()
{
auto ebda = map_ebda();
for (auto* rsdp_str = ebda.base(); rsdp_str < ebda.end(); rsdp_str += 16) {
#ifdef ACPI_DEBUG
dbg() << "ACPI: Looking for RSDP in EBDA @ V " << (void*)rsdp_str << ", P " << (void*)p_rsdp_str;
#endif
if (!strncmp("RSD PTR ", (const char*)rsdp_str, strlen("RSD PTR ")))
return ebda.paddr_of(rsdp_str);
}
return {};
}
static PhysicalAddress find_rsdp_in_bios_area()
{
auto bios = map_bios();
for (auto* rsdp_str = bios.base(); rsdp_str < bios.end(); rsdp_str += 16) {
if (!strncmp("RSD PTR ", (const char*)rsdp_str, strlen("RSD PTR ")))
return bios.paddr_of(rsdp_str);
}
return {};
}
static bool validate_table(const Structures::SDTHeader& v_header, size_t length)
{
u8 checksum = 0;
@ -356,13 +333,13 @@ static bool validate_table(const Structures::SDTHeader& v_header, size_t length)
return false;
}
PhysicalAddress StaticParsing::find_rsdp()
Optional<PhysicalAddress> StaticParsing::find_rsdp()
{
klog() << "ACPI: Probing EBDA";
auto rsdp = find_rsdp_in_ebda();
if (!rsdp.is_null())
StringView signature("RSD PTR ");
auto rsdp = map_ebda().find_chunk_starting_with(signature, 16);
if (rsdp.has_value())
return rsdp;
return find_rsdp_in_bios_area();
return map_bios().find_chunk_starting_with(signature, 16);
}
PhysicalAddress StaticParsing::find_table(PhysicalAddress rsdp_address, const StringView& signature)