Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Load all SSDTs and PSDTs 

Spec says to load all tables with unique OEM table IDs but that seem
wrong.
This commit is contained in:
Bananymous 2024-04-12 16:45:00 +03:00
parent 8f2f98b7b4
commit 027016ddae
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
kernel/kernel/ACPI/AML.cpp
View File

@ -6,46 +6,21 @@
namespace Kernel::ACPI namespace Kernel::ACPI
{ {
// https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/05_ACPI_Software_Programming_Model/ACPI_Software_Programming_Model.html#secondary-system-description-table-ssdt static void load_all(AML::Namespace& ns, BAN::StringView signature)
// https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/05_ACPI_Software_Programming_Model/ACPI_Software_Programming_Model.html#persistent-system-description-table-psdt
static bool load_all_unique(AML::Namespace& ns, BAN::StringView signature)
{ {
// Only SSDT and PSDT that have unique OEM Table ID are loaded in order they appear in the RSDT/XSDT
BAN::Vector<uint64_t> loaded_oem_table_ids;
for (uint32_t i = 0;; i++) for (uint32_t i = 0;; i++)
{ {
auto* header = ACPI::ACPI::get().get_header(signature, i); auto* header = ACPI::ACPI::get().get_header(signature, i);
if (!header) if (!header)
break; break;
bool need_to_parse = true;
for (uint64_t id : loaded_oem_table_ids)
{
if (id == header->oem_table_id)
{
need_to_parse = false;
break;
}
}
if (!need_to_parse)
{
dprintln("Skipping {}{} ({} bytes)", signature, i, header->length);
continue;
}
dprintln("Parsing {}{} ({} bytes)", signature, i, header->length); dprintln("Parsing {}{} ({} bytes)", signature, i, header->length);
if (!ns.parse(*header)) if (!ns.parse(*header))
{ {
dwarnln("Failed to parse {}", signature); dwarnln("Failed to parse {}", signature);
return false; continue;
} }
MUST(loaded_oem_table_ids.push_back(header->oem_table_id));
} }
return true;
} }
BAN::RefPtr<AML::Namespace> AML::initialize_namespace() BAN::RefPtr<AML::Namespace> AML::initialize_namespace()
@ -66,11 +41,11 @@ namespace Kernel::ACPI
return {}; return {};
} }
if (!load_all_unique(*ns, "SSDT")) // https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/05_ACPI_Software_Programming_Model/ACPI_Software_Programming_Model.html#secondary-system-description-table-ssdt
return {}; load_all(*ns, "SSDT");
if (!load_all_unique(*ns, "PSDT")) // https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/05_ACPI_Software_Programming_Model/ACPI_Software_Programming_Model.html#persistent-system-description-table-psdt
return {}; load_all(*ns, "PSDT");
#if AML_DEBUG_LEVEL >= 1 #if AML_DEBUG_LEVEL >= 1
ns->debug_print(0); ns->debug_print(0);