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

Kernel: Allow looking up devices with multiple eisa ids 

Also match against _CIDs in addition to _HID
This commit is contained in:
Bananymous 2025-08-13 18:59:46 +03:00
parent 58ad839136
commit c2017a5181
2 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/include/kernel/ACPI/AML/Namespace.h
View File

@ -50,6 +50,7 @@ namespace Kernel::ACPI::AML
BAN::ErrorOr<void> for_each_child(const Scope&, const BAN::Function<BAN::Iteration(const Scope&, Reference*)>&); BAN::ErrorOr<void> for_each_child(const Scope&, const BAN::Function<BAN::Iteration(const Scope&, Reference*)>&);
BAN::ErrorOr<BAN::Vector<Scope>> find_device_with_eisa_id(BAN::StringView eisa_id); BAN::ErrorOr<BAN::Vector<Scope>> find_device_with_eisa_id(BAN::StringView eisa_id);
BAN::ErrorOr<BAN::Vector<Scope>> find_device_with_eisa_id(BAN::Span<BAN::StringView> eisa_ids);
private: private:
BAN::ErrorOr<Scope> resolve_path(const Scope& scope, const NameString& name_string); BAN::ErrorOr<Scope> resolve_path(const Scope& scope, const NameString& name_string);

69
kernel/kernel/ACPI/AML/Namespace.cpp
View File

@ -586,14 +586,40 @@ namespace Kernel::ACPI::AML
} }
BAN::ErrorOr<BAN::Vector<Scope>> Namespace::find_device_with_eisa_id(BAN::StringView eisa_id) BAN::ErrorOr<BAN::Vector<Scope>> Namespace::find_device_with_eisa_id(BAN::StringView eisa_id)
{
return find_device_with_eisa_id(BAN::Span<BAN::StringView>{ &eisa_id, 1 });
}
BAN::ErrorOr<BAN::Vector<Scope>> Namespace::find_device_with_eisa_id(BAN::Span<BAN::StringView> eisa_ids)
{
BAN::Vector<uint32_t> encoded_ids;
for (const auto& eisa_id : eisa_ids)
{ {
if (!is_valid_eisa_id(eisa_id)) if (!is_valid_eisa_id(eisa_id))
{ {
dwarnln("Invalid EISA id '{}'", eisa_id); dwarnln("Invalid EISA id '{}'", eisa_id);
return BAN::Error::from_errno(EINVAL); return BAN::Error::from_errno(EINVAL);
} }
TRY(encoded_ids.emplace_back(encode_eisa_id(eisa_id)));
}
const uint32_t encoded = encode_eisa_id(eisa_id); const auto check_node_id =
[&encoded_ids](const Node& node) -> BAN::ErrorOr<bool>
{
uint32_t device_id;
if (node.type == Node::Type::Integer)
device_id = node.as.integer.value;
else if (node.type == Node::Type::String && is_valid_eisa_id(node.as.str_buf->as_sv()))
device_id = encode_eisa_id(node.as.str_buf->as_sv());
else
return false;
for (auto id : encoded_ids)
if (device_id == id)
return true;
return false;
};
BAN::Vector<Scope> result; BAN::Vector<Scope> result;
@ -602,22 +628,39 @@ namespace Kernel::ACPI::AML
if (obj_ref->node.type != Node::Type::Device) if (obj_ref->node.type != Node::Type::Device)
continue; continue;
auto [_, hid] = TRY(find_named_object(obj_path, TRY(NameString::from_string("_HID"_sv)), true)); auto [_0, hid] = TRY(find_named_object(obj_path, TRY(NameString::from_string("_HID"_sv)), true));
if (hid == nullptr) if (hid == nullptr)
continue; continue;
uint32_t device_hid = 0; if (TRY(check_node_id(hid->node)))
if (hid->node.type == Node::Type::Integer) {
device_hid = hid->node.as.integer.value;
else if (hid->node.type == Node::Type::String && is_valid_eisa_id(hid->node.as.str_buf->as_sv()))
device_hid = encode_eisa_id(hid->node.as.str_buf->as_sv());
else
continue;
if (device_hid != encoded)
continue;
TRY(result.push_back(TRY(obj_path.copy()))); TRY(result.push_back(TRY(obj_path.copy())));
continue;
}
auto [_1, cid] = TRY(find_named_object(obj_path, TRY(NameString::from_string("_CID"_sv)), true));
if (cid == nullptr)
continue;
if (cid->node.type != Node::Type::Package)
{
if (TRY(check_node_id(cid->node)))
TRY(result.push_back(TRY(obj_path.copy())));
}
else
{
for (size_t i = 0; i < cid->node.as.package->num_elements; i++)
{
auto& element = cid->node.as.package->elements[i];
if (resolve_package_element(element, true).is_error())
continue;
if (TRY(check_node_id(hid->node)))
{
TRY(result.push_back(TRY(obj_path.copy())));
break;
}
}
}
} }
return result; return result;