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

pci_decode: report devices from ACPI info

Browse Source 
Although we do not have the full ACPI information parsed yet, to
announce non-PCI devices derived from the ACPI tables, the device
description of the assumed devices is now integral-part of pci_decode.
Formerly, the information was gained separatedly as boot-module, whereby
we lost synchronization in between ACPI/PCI parsing, BIOS handover, and
PS/2 emulation code already acting.
This commit is contained in:
Stefan Kalkowski 2022-11-18 13:59:10 +01:00 committed by Christian Helmuth
parent c9efcfab17
commit 10aa5ebf03
8 changed files with 97 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
repos/gems/recipes/pkg/drivers_managed-pc/archives
View File

@ -18,4 +18,3 @@ _/src/driver_manager
_/src/rom_filter _/src/rom_filter
_/src/rom_reporter _/src/rom_reporter
_/raw/drivers_managed-pc _/raw/drivers_managed-pc
_/raw/pc-devices

24
repos/gems/sculpt/drivers/pc
View File

@ -41,7 +41,7 @@
<config verbose="no"> <config verbose="no">
<policy label="pci_decode -> system" report="acpi_drv -> acpi"/> <policy label="pci_decode -> system" report="acpi_drv -> acpi"/>
<policy label="platform_drv -> acpi" report="acpi_drv -> acpi"/> <policy label="platform_drv -> acpi" report="acpi_drv -> acpi"/>
<policy label="rom_filter -> pci_devices" report="pci_decode -> devices"/> <policy label="platform_drv -> devices" report="pci_decode -> devices"/>
<policy label="usb_drv -> config" report="driver_manager -> usb_drv.config"/> <policy label="usb_drv -> config" report="driver_manager -> usb_drv.config"/>
<policy label="dynamic -> config" report="driver_manager -> init.config"/> <policy label="dynamic -> config" report="driver_manager -> init.config"/>
<policy label="driver_manager -> devices" report="platform_drv -> devices"/> <policy label="driver_manager -> devices" report="platform_drv -> devices"/>
@ -115,33 +115,13 @@
</route> </route>
</start> </start>
<start name="rom_filter" caps="70">
<resource name="RAM" quantum="1M"/>
<provides> <service name="ROM" /> </provides>
<config buffer="32K">
<input name="devices"/>
<input name="pci_devices"/>
<output node="devices">
<input name="devices" skip_toplevel="yes"/>
<input name="pci_devices" skip_toplevel="yes"/>
</output>
</config>
<route>
<service name="ROM" label="pci_devices"> <child name="report_rom"/> </service>
<service name="LOG"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="ROM"> <parent/> </service>
</route>
</start>
<start name="platform_drv" caps="400" managing_system="yes"> <start name="platform_drv" caps="400" managing_system="yes">
<binary name="pc_platform_drv"/> <binary name="pc_platform_drv"/>
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides> <service name="Platform"/> </provides> <provides> <service name="Platform"/> </provides>
<route> <route>
<service name="ROM" label="system"> <parent label="system"/> </service> <service name="ROM" label="system"> <parent label="system"/> </service>
<service name="ROM" label="devices"> <child name="rom_filter"/> </service> <service name="ROM" label="devices"> <child name="report_rom"/> </service>
<service name="ROM" label="acpi"> <child name="report_rom"/> </service> <service name="ROM" label="acpi"> <child name="report_rom"/> </service>
<service name="Report" label="devices"> <child name="report_rom"/> </service> <service name="Report" label="devices"> <child name="report_rom"/> </service>
<service name="IRQ"> <parent/> </service> <service name="IRQ"> <parent/> </service>

29
repos/libports/run/acpica.run
View File

@ -24,7 +24,6 @@ import_from_depot [depot_user]/src/dynamic_rom \
[depot_user]/src/event_filter \ [depot_user]/src/event_filter \
[depot_user]/src/pc_usb_host_drv \ [depot_user]/src/pc_usb_host_drv \
[depot_user]/src/ps2_drv \ [depot_user]/src/ps2_drv \
[depot_user]/src/rom_filter \
[depot_user]/src/report_rom \ [depot_user]/src/report_rom \
[depot_user]/src/usb_hid_drv [depot_user]/src/usb_hid_drv
@ -57,9 +56,9 @@ set config {
<service name="ROM"/> <service name="ROM"/>
</provides> </provides>
<config verbose="no"> <config verbose="no">
<policy label="pci_decode -> system" report="acpi_drv -> acpi"/> <policy label="pci_decode -> system" report="acpi_drv -> acpi"/>
<policy label="rom_filter -> pci_devices" report="pci_decode -> devices"/> <policy label="platform_drv -> devices" report="pci_decode -> devices"/>
<policy label="usb_hid_drv -> report" report="usb_drv -> devices"/> <policy label="usb_hid_drv -> report" report="usb_drv -> devices"/>
</config> </config>
</start> </start>
@ -80,26 +79,6 @@ set config {
</route> </route>
</start> </start>
<start name="rom_filter" caps="70">
<resource name="RAM" quantum="1M"/>
<provides> <service name="ROM"/> </provides>
<config buffer="32K">
<input name="devices"/>
<input name="pci_devices"/>
<output node="devices">
<input name="devices" skip_toplevel="yes"/>
<input name="pci_devices" skip_toplevel="yes"/>
</output>
</config>
<route>
<service name="ROM" label="pci_devices"> <child name="drivers_reports"/> </service>
<service name="LOG"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="ROM"> <parent/> </service>
</route>
</start>
<start name="platform_drv" caps="400" managing_system="yes"> <start name="platform_drv" caps="400" managing_system="yes">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides> <provides>
@ -111,7 +90,7 @@ set config {
<policy label_prefix="acpica"/> <policy label_prefix="acpica"/>
</config> </config>
<route> <route>
<service name="ROM" label="devices"> <child name="rom_filter"/> </service> <service name="ROM" label="devices"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>

1
repos/os/recipes/pkg/drivers_interactive-pc/archives
View File

@ -9,4 +9,3 @@ _/src/rom_filter
_/src/event_filter _/src/event_filter
_/src/pci_decode _/src/pci_decode
_/raw/drivers_interactive-pc _/raw/drivers_interactive-pc
_/raw/pc-devices

28
repos/os/recipes/raw/drivers_interactive-pc/drivers.config
View File

@ -36,9 +36,9 @@
<service name="Report" /> <service name="Report" />
</provides> </provides>
<config> <config>
<policy label="pci_decode -> system" report="acpi_drv -> acpi"/> <policy label="pci_decode -> system" report="acpi_drv -> acpi"/>
<policy label="rom_filter -> pci_devices" report="pci_decode -> devices"/> <policy label="platform_drv -> devices" report="pci_decode -> devices"/>
<policy label="usb_hid_drv -> report" report="usb_drv -> devices"/> <policy label="usb_hid_drv -> report" report="usb_drv -> devices"/>
</config> </config>
<route> <route>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
@ -48,26 +48,6 @@
</route> </route>
</start> </start>
<start name="rom_filter" caps="70">
<resource name="RAM" quantum="1M"/>
<provides> <service name="ROM" /> </provides>
<config buffer="32K">
<input name="devices"/>
<input name="pci_devices"/>
<output node="devices">
<input name="devices" skip_toplevel="yes"/>
<input name="pci_devices" skip_toplevel="yes"/>
</output>
</config>
<route>
<service name="ROM" label="pci_devices"> <child name="report_rom"/> </service>
<service name="LOG"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="ROM"> <parent/> </service>
</route>
</start>
<start name="pci_decode" caps="100"> <start name="pci_decode" caps="100">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<route> <route>
@ -88,7 +68,7 @@
<service name="Platform"/> <service name="Platform"/>
</provides> </provides>
<route> <route>
<service name="ROM" label="devices"> <child name="rom_filter"/> </service> <service name="ROM" label="devices"> <child name="report_rom"/> </service>
<service name="Report"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service>
<service name="IRQ"> <parent/> </service> <service name="IRQ"> <parent/> </service>
<service name="IO_MEM"> <parent/> </service> <service name="IO_MEM"> <parent/> </service>

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

@ -53,7 +53,8 @@ struct Main
Xml_generator & generator, unsigned & msi); Xml_generator & generator, unsigned & msi);
void parse_irq_override_rules(Xml_node & xml); void parse_irq_override_rules(Xml_node & xml);
void parse_pci_config_spaces(Xml_node & xml); void parse_pci_config_spaces(Xml_node & xml, Xml_generator & generator);
void parse_acpi_device_info(Xml_generator & generator);
void sys_rom_update(); void sys_rom_update();
template <typename FN> template <typename FN>
@ -261,49 +262,90 @@ void Main::parse_pci_bus(bus_t bus,
} }
void Main::parse_pci_config_spaces(Xml_node & xml) /*
* 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)
{ {
pci_reporter.generate([&] (Xml_generator & generator) /*
* PS/2 device
*/
gen.node("device", [&]
{ {
/* gen.attribute("name", "ps2");
* We count beginning from 1 not 0, because some clients (Linux drivers) gen.node("irq", [&] { gen.attribute("number", 1U); });
* do not ignore the pseudo MSI number announced, but interpret zero as gen.node("irq", [&] { gen.attribute("number", 12U); });
* invalid. gen.node("io_port_range", [&]
*/
unsigned msi_number = 1;
unsigned host_bridge_num = 0;
xml.for_each_sub_node("bdf", [&] (Xml_node & xml)
{ {
addr_t const start = xml.attribute_value("start", 0UL); gen.attribute("address", "0x60");
addr_t const base = xml.attribute_value("base", 0UL); gen.attribute("size", 1U);
size_t const count = xml.attribute_value("count", 0UL);
bus_t const bus_off = (bus_t) (start / FUNCTION_PER_BUS_MAX);
bus_t const last_bus = (bus_t)
(max(1UL, (count / FUNCTION_PER_BUS_MAX)) - 1);
if (host_bridge_num++) {
error("We do not support multiple host bridges by now!");
return;
}
new (heap) Bridge(bridge_registry, { bus_off, 0, 0 },
bus_off, last_bus);
bus_t bus = 0;
do {
enum { BUS_SIZE = DEVICES_PER_BUS_MAX * FUNCTION_PER_DEVICE_MAX
* FUNCTION_CONFIG_SPACE_SIZE };
addr_t offset = base + bus * BUS_SIZE;
pci_config_ds.construct(env, offset, BUS_SIZE);
parse_pci_bus((bus_t)bus + bus_off,
(addr_t)pci_config_ds->local_addr<void>(),
offset, generator, msi_number);
} while (bus++ < last_bus);
pci_config_ds.destruct();
}); });
gen.node("io_port_range", [&]
{
gen.attribute("address", "0x64");
gen.attribute("size", 1U);
});
});
/*
* PIT device
*/
gen.node("device", [&]
{
gen.attribute("name", "pit");
gen.node("irq", [&] { gen.attribute("number", 0U); });
gen.node("io_port_range", [&]
{
gen.attribute("address", "0x40");
gen.attribute("size", 4U);
});
});
}
void Main::parse_pci_config_spaces(Xml_node & xml, Xml_generator & generator)
{
/*
* We count beginning from 1 not 0, because some clients (Linux drivers)
* do not ignore the pseudo MSI number announced, but interpret zero as
* invalid.
*/
unsigned msi_number = 1;
unsigned host_bridge_num = 0;
xml.for_each_sub_node("bdf", [&] (Xml_node & xml)
{
addr_t const start = xml.attribute_value("start", 0UL);
addr_t const base = xml.attribute_value("base", 0UL);
size_t const count = xml.attribute_value("count", 0UL);
bus_t const bus_off = (bus_t) (start / FUNCTION_PER_BUS_MAX);
bus_t const last_bus = (bus_t)
(max(1UL, (count / FUNCTION_PER_BUS_MAX)) - 1);
if (host_bridge_num++) {
error("We do not support multiple host bridges by now!");
return;
}
new (heap) Bridge(bridge_registry, { bus_off, 0, 0 },
bus_off, last_bus);
bus_t bus = 0;
do {
enum { BUS_SIZE = DEVICES_PER_BUS_MAX * FUNCTION_PER_DEVICE_MAX
* FUNCTION_CONFIG_SPACE_SIZE };
addr_t offset = base + bus * BUS_SIZE;
pci_config_ds.construct(env, offset, BUS_SIZE);
parse_pci_bus((bus_t)bus + bus_off,
(addr_t)pci_config_ds->local_addr<void>(),
offset, generator, msi_number);
} while (bus++ < last_bus);
pci_config_ds.destruct();
}); });
} }
@ -332,7 +374,11 @@ void Main::sys_rom_update()
reserved_memory_list.update_from_xml(policy, xml); reserved_memory_list.update_from_xml(policy, xml);
} }
parse_pci_config_spaces(xml); pci_reporter.generate([&] (Xml_generator & generator)
{
parse_acpi_device_info(generator);
parse_pci_config_spaces(xml, generator);
});
} }

4
repos/pc/recipes/raw/pc-devices/content.mk
View File

@ -1,4 +0,0 @@
content: devices
devices:
cp $(GENODE_DIR)/repos/base/board/pc/$@ $@

1
repos/pc/recipes/raw/pc-devices/hash
View File

@ -1 +0,0 @@
2022-09-15 184a930a9bf6fa8dc67582adbd3f940bf815a767