ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 13:47:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pci_decode: report ACPI SCI IRQ in acpi device

Browse Source 
Issue #4679
This commit is contained in:
Christian Helmuth 2022-12-13 12:36:46 +01:00
parent 53c2cff331
commit 2353082bda
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
repos/os/src/app/pci_decode/main.cc
View File

@ -54,7 +54,7 @@ struct Main
void parse_irq_override_rules(Xml_node & xml);
void parse_pci_config_spaces(Xml_node & xml, Xml_generator & generator);
void parse_acpi_device_info(Xml_generator & generator);
void parse_acpi_device_info(Xml_node const &xml, Xml_generator & generator);
void sys_rom_update();
template <typename FN>
@ -262,13 +262,28 @@ void Main::parse_pci_bus(bus_t bus,
}
static void parse_acpica_info(Xml_node const &xml, Xml_generator &gen)
{
gen.node("device", [&] {
gen.attribute("name", "acpi");
gen.attribute("type", "acpi");
xml.with_optional_sub_node("sci_int", [&] (Xml_node xml) {
gen.node("irq", [&] {
gen.attribute("number", xml.attribute_value("irq", 0xff));
});
});
});
}
/*
* By now, we do not have the necessary information about non-PCI devices
* available from the ACPI tables, therefore we hard-code typical devices
* we assume to be found in this function. In the future, this function
* shall interpret ACPI tables information.
*/
void Main::parse_acpi_device_info(Xml_generator & gen)
void Main::parse_acpi_device_info(Xml_node const &xml, Xml_generator & gen)
{
/*
* PS/2 device
@ -305,12 +320,10 @@ void Main::parse_acpi_device_info(Xml_generator & gen)
});
/*
* ACPI device
* ACPI device (if applicable)
*/
gen.node("device", [&]
{
gen.attribute("name", "acpi");
});
if (xml.has_sub_node("sci_int"))
parse_acpica_info(xml, gen);
}
@ -384,7 +397,7 @@ void Main::sys_rom_update()
pci_reporter.generate([&] (Xml_generator & generator)
{
parse_acpi_device_info(generator);
parse_acpi_device_info(xml, generator);
parse_pci_config_spaces(xml, generator);
});
}