diff --git a/repos/gems/recipes/pkg/drivers_managed-pc/README b/repos/gems/recipes/pkg/drivers_managed-pc/README deleted file mode 100644 index 01323fae15..0000000000 --- a/repos/gems/recipes/pkg/drivers_managed-pc/README +++ /dev/null @@ -1,4 +0,0 @@ - - Device-driver subsystem that starts drivers for - framebuffer, input, and block devices on demand - diff --git a/repos/gems/recipes/pkg/sculpt_distribution-pc/archives b/repos/gems/recipes/pkg/sculpt_distribution-pc/archives index a1c619a829..7941f50624 100644 --- a/repos/gems/recipes/pkg/sculpt_distribution-pc/archives +++ b/repos/gems/recipes/pkg/sculpt_distribution-pc/archives @@ -1,7 +1,5 @@ _/pkg/sculpt -_/pkg/drivers_managed-pc -_/pkg/pc_wifi -_/pkg/pc_nic_drv +_/pkg/sculpt_drivers-pc _/pkg/vbox6 _/pkg/acpica _/pkg/system_clock-pc diff --git a/repos/gems/recipes/pkg/sculpt_drivers-pc/README b/repos/gems/recipes/pkg/sculpt_drivers-pc/README new file mode 100644 index 0000000000..1f840be1c1 --- /dev/null +++ b/repos/gems/recipes/pkg/sculpt_drivers-pc/README @@ -0,0 +1,3 @@ + + Device drivers for the Sculpt OS base system on the PC + diff --git a/repos/gems/recipes/pkg/drivers_managed-pc/archives b/repos/gems/recipes/pkg/sculpt_drivers-pc/archives similarity index 69% rename from repos/gems/recipes/pkg/drivers_managed-pc/archives rename to repos/gems/recipes/pkg/sculpt_drivers-pc/archives index 23edcacd3b..aa38c7236f 100644 --- a/repos/gems/recipes/pkg/drivers_managed-pc/archives +++ b/repos/gems/recipes/pkg/sculpt_drivers-pc/archives @@ -1,20 +1,16 @@ -_/src/pc_platform_drv -_/src/pci_decode +_/pkg/pc_wifi _/src/acpi_drv -_/src/ps2_drv -_/src/pc_usb_host_drv -_/src/usb_hid_drv -_/src/usb_block_drv -_/src/vesa_drv -_/src/pc_intel_fb_drv -_/src/intel_gpu_drv -_/src/boot_fb_drv _/src/ahci_drv +_/src/boot_fb_drv +_/src/intel_gpu_drv _/src/nvme_drv -_/src/report_rom -_/src/event_filter -_/src/init -_/src/driver_manager -_/src/rom_filter +_/src/pci_decode +_/src/pc_intel_fb_drv +_/src/pc_nic_drv +_/src/pc_platform_drv +_/src/pc_usb_host_drv +_/src/ps2_drv +_/src/usb_block_drv +_/src/usb_hid_drv +_/src/vesa_drv _/src/rom_reporter -_/raw/drivers_managed-pc diff --git a/repos/gems/recipes/pkg/drivers_managed-pc/hash b/repos/gems/recipes/pkg/sculpt_drivers-pc/hash similarity index 100% rename from repos/gems/recipes/pkg/drivers_managed-pc/hash rename to repos/gems/recipes/pkg/sculpt_drivers-pc/hash diff --git a/repos/gems/recipes/raw/drivers_managed-pc/content.mk b/repos/gems/recipes/raw/drivers_managed-pc/content.mk deleted file mode 100644 index 50da72e44b..0000000000 --- a/repos/gems/recipes/raw/drivers_managed-pc/content.mk +++ /dev/null @@ -1,20 +0,0 @@ -content: drivers.config fb_drv.config event_filter.config en_us.chargen \ - special.chargen numlock_remap.config gpu_drv.config - -drivers.config: - cp $(REP_DIR)/sculpt/drivers/pc $@ - -numlock_remap.config: - cp $(REP_DIR)/sculpt/numlock_remap/default $@ - -event_filter.config: - cp $(REP_DIR)/sculpt/event_filter/pc $@ - -fb_drv.config: - cp $(REP_DIR)/sculpt/fb_drv/default $@ - -gpu_drv.config: - cp $(REP_DIR)/sculpt/gpu_drv/intel $@ - -en_us.chargen special.chargen: - cp $(GENODE_DIR)/repos/os/src/server/event_filter/$@ $@ diff --git a/repos/gems/recipes/raw/drivers_managed-pc/hash b/repos/gems/recipes/raw/drivers_managed-pc/hash deleted file mode 100644 index ef51dbe134..0000000000 --- a/repos/gems/recipes/raw/drivers_managed-pc/hash +++ /dev/null @@ -1 +0,0 @@ -2023-11-29 c9447e22a08d7ea395792c64bf1c59f5e091664e diff --git a/repos/gems/recipes/src/driver_manager/content.mk b/repos/gems/recipes/src/driver_manager/content.mk deleted file mode 100644 index 1080a34fe8..0000000000 --- a/repos/gems/recipes/src/driver_manager/content.mk +++ /dev/null @@ -1,2 +0,0 @@ -SRC_DIR := src/app/driver_manager -include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/gems/recipes/src/driver_manager/hash b/repos/gems/recipes/src/driver_manager/hash deleted file mode 100644 index e8192637ae..0000000000 --- a/repos/gems/recipes/src/driver_manager/hash +++ /dev/null @@ -1 +0,0 @@ -2024-02-25 93cc0093e10f3300e2c7cc633c24c8430299322b diff --git a/repos/gems/recipes/src/driver_manager/used_apis b/repos/gems/recipes/src/driver_manager/used_apis deleted file mode 100644 index ddedb5e584..0000000000 --- a/repos/gems/recipes/src/driver_manager/used_apis +++ /dev/null @@ -1,9 +0,0 @@ -base -os -report_session -block_session -usb_session -capture_session -timer_session -platform_session -gpu_session diff --git a/repos/gems/run/driver_manager.run b/repos/gems/run/driver_manager.run deleted file mode 100644 index 1c034d01cd..0000000000 --- a/repos/gems/run/driver_manager.run +++ /dev/null @@ -1,166 +0,0 @@ -if {![have_spec x86] || [have_spec linux]} { - puts "Platform is unsupported." - exit 0 -} - -build { app/driver_manager test/driver_manager lib/ld } - -create_boot_directory - -import_from_depot [depot_user]/src/[base_src] \ - [depot_user]/pkg/drivers_managed-pc \ - [depot_user]/src/report_rom \ - [depot_user]/src/dynamic_rom \ - [depot_user]/src/nitpicker \ - [depot_user]/src/init - -install_config { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -} - -set fd [open [run_dir]/genode/fb_drv.config "w"] -puts $fd { - - - -} -close $fd - -set fd [open [run_dir]/genode/usb_policy "w"] -puts $fd {} -close $fd - -copy_file [genode_dir]/repos/gems/sculpt/drivers/pc \ - [run_dir]/genode/drivers.config - -build_boot_image [build_artifacts] - -# -# Build ext2 file-system images to be supplied to Qemu -# -if {[have_include "power_on/qemu"]} { - - set mke2fs [installed_command mke2fs] - set dd [installed_command dd] - - catch { exec $dd if=/dev/zero of=bin/hdd_disk.raw bs=1M count=32 } - catch { exec $mke2fs -F bin/hdd_disk.raw } -} - -# -# Qemu opts for supplying hdd_disk.raw as AHCI disk -# -append qemu_args " -nographic " -append qemu_args " -device ahci,id=ahci " -append qemu_args " -drive id=hdd,file=bin/hdd_disk.raw,format=raw,if=none -device ide-hd,drive=hdd,bus=ahci.1 " - -run_genode_until {.*all expected devices present and accessible.*\n} 120 - diff --git a/repos/gems/sculpt/default-pc.sculpt b/repos/gems/sculpt/default-pc.sculpt index 825c875071..c4b25aa540 100644 --- a/repos/gems/sculpt/default-pc.sculpt +++ b/repos/gems/sculpt/default-pc.sculpt @@ -4,7 +4,7 @@ system: pc gpu_drv: intel # supplemental depot content added to the system image -import: pkg/drivers_managed-pc pkg/pc_wifi src/pc_nic_drv +import: pkg/sculpt_drivers-pc # selection of launcher-menu entries launcher: vm_fs shared_fs download_debug_info diff --git a/repos/gems/sculpt/net_test-pc.sculpt b/repos/gems/sculpt/net_test-pc.sculpt index 3c3875aaef..5bdcb0c080 100644 --- a/repos/gems/sculpt/net_test-pc.sculpt +++ b/repos/gems/sculpt/net_test-pc.sculpt @@ -6,4 +6,4 @@ ram_fs: depot launcher: ping pc_nic # supplemental depot content added to the system image -import: pkg/drivers_managed-pc src/pc_nic_drv pkg/pc_nic pkg/ping +import: pkg/sculpt_drivers-pc pkg/pc_nic pkg/ping diff --git a/repos/gems/src/app/driver_manager/main.cc b/repos/gems/src/app/driver_manager/main.cc deleted file mode 100644 index b893847486..0000000000 --- a/repos/gems/src/app/driver_manager/main.cc +++ /dev/null @@ -1,354 +0,0 @@ -/* - * \brief Driver manager - * \author Norman Feske - * \date 2017-06-13 - */ - -/* - * Copyright (C) 2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -/* Genode includes */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace Driver_manager { - using namespace Genode; - struct Main; - struct Device_driver; - struct Nvme_driver; - - struct Priority { int value; }; - - struct Version { unsigned value; }; -} - - -class Driver_manager::Device_driver : Noncopyable -{ - public: - - typedef String<64> Name; - typedef String<100> Binary; - typedef String<32> Service; - - protected: - - static void _gen_common_start_node_content(Xml_generator &xml, - Name const &name, - Binary const &binary, - Ram_quota ram, - Cap_quota caps, - Priority priority, - Version version) - { - xml.attribute("name", name); - xml.attribute("caps", String<64>(caps)); - xml.attribute("priority", priority.value); - xml.attribute("version", version.value); - xml.node("binary", [&] () { xml.attribute("name", binary); }); - xml.node("resource", [&] () { - xml.attribute("name", "RAM"); - xml.attribute("quantum", String<64>(ram)); - }); - } - - template - static void _gen_provides_node(Xml_generator &xml) - { - xml.node("provides", [&] () { - xml.node("service", [&] () { - xml.attribute("name", SESSION::service_name()); }); }); - } - - static void _gen_config_route(Xml_generator &xml, char const *config_name) - { - xml.node("service", [&] () { - xml.attribute("name", Rom_session::service_name()); - xml.attribute("label", "config"); - xml.node("parent", [&] () { - xml.attribute("label", config_name); }); - }); - } - - static void _gen_default_parent_route(Xml_generator &xml) - { - xml.node("any-service", [&] () { - xml.node("parent", [&] () { }); }); - } - - template - static void _gen_forwarded_service(Xml_generator &xml, - Device_driver::Name const &name) - { - xml.node("service", [&] () { - xml.attribute("name", SESSION::service_name()); - xml.node("default-policy", [&] () { - xml.node("child", [&] () { - xml.attribute("name", name); - }); - }); - }); - }; - - virtual ~Device_driver() { } - - public: - - virtual void generate_start_node(Xml_generator &xml) const = 0; -}; - - -struct Driver_manager::Nvme_driver : Device_driver -{ - void generate_start_node(Xml_generator &xml) const override - { - xml.node("start", [&] () { - _gen_common_start_node_content(xml, "nvme_drv", "nvme_drv", - Ram_quota{8*1024*1024}, Cap_quota{100}, - Priority{-1}, Version{0}); - _gen_provides_node(xml); - xml.node("config", [&] () { - xml.node("report", [&] () { xml.attribute("namespaces", "yes"); }); - xml.node("policy", [&] () { - xml.attribute("label_suffix", String<64>("nvme-0")); - xml.attribute("namespace", 1); - xml.attribute("writeable", "yes"); - }); - }); - xml.node("route", [&] () { - xml.node("service", [&] () { - xml.attribute("name", "Report"); - xml.node("parent", [&] () { xml.attribute("label", "nvme_ns"); }); - }); - _gen_default_parent_route(xml); - }); - }); - } - - typedef String<32> Default_label; - - void gen_service_forwarding_policy(Xml_generator &xml, - Default_label const &default_label) const - { - xml.node("policy", [&] () { - xml.attribute("label_suffix", String<64>("nvme-0")); - xml.node("child", [&] () { - xml.attribute("name", "nvme_drv"); }); - }); - - if (default_label.valid()) { - xml.node("policy", [&] () { - xml.attribute("label_suffix", " default"); - xml.node("child", [&] () { - xml.attribute("name", "nvme_drv"); - xml.attribute("label", default_label); - }); - }); - } - } -}; - - -struct Driver_manager::Main -{ - Env &_env; - - Attached_rom_dataspace _platform { _env, "platform_info" }; - Attached_rom_dataspace _devices { _env, "devices" }; - Attached_rom_dataspace _nvme_ns { _env, "nvme_ns" }; - - Reporter _init_config { _env, "config", "init.config" }; - Reporter _block_devices { _env, "block_devices" }; - - Constructible _nvme_driver { }; - - bool _devices_rom_parsed { false }; - - void _handle_devices_update(); - - Signal_handler
_devices_update_handler { - _env.ep(), *this, &Main::_handle_devices_update }; - - void _handle_nvme_ns_update(); - - Signal_handler
_nvme_ns_update_handler { - _env.ep(), *this, &Main::_handle_nvme_ns_update }; - - static void _gen_parent_service_xml(Xml_generator &xml, char const *name) - { - xml.node("service", [&] () { xml.attribute("name", name); }); - }; - - void _generate_init_config (Reporter &) const; - void _generate_block_devices(Reporter &) const; - - void _generate_block_devices() - { - /* devices must be detected before the checks below can be conducted */ - if (!_devices_rom_parsed) - return; - - /* check that all drivers completed initialization before reporting */ - if (_nvme_driver.constructed() && !_nvme_ns.xml().has_type("controller")) - return; - - _generate_block_devices(_block_devices); - } - - Main(Env &env) : _env(env) - { - _init_config.enabled(true); - _block_devices.enabled(true); - - _devices .sigh(_devices_update_handler); - _nvme_ns .sigh(_nvme_ns_update_handler); - - _generate_init_config(_init_config); - - _handle_devices_update(); - _handle_nvme_ns_update(); - } -}; - - -void Driver_manager::Main::_handle_devices_update() -{ - _devices.update(); - - if (!_devices.valid()) - return; - - bool has_ahci = false; - bool has_nvme = false; - - _devices.xml().for_each_sub_node([&] (Xml_node device) { - device.with_optional_sub_node("pci-config", [&] (Xml_node pci) { - - uint16_t const vendor_id = (uint16_t)pci.attribute_value("vendor_id", 0U); - uint16_t const class_code = (uint16_t)(pci.attribute_value("class", 0U) >> 8); - - enum { - VENDOR_INTEL = 0x8086U, - CLASS_AHCI = 0x106U, - CLASS_NVME = 0x108U, - }; - - if (vendor_id == VENDOR_INTEL && class_code == CLASS_AHCI) - has_ahci = true; - - if (class_code == CLASS_NVME) - has_nvme = true; - }); - }); - - if (!_nvme_driver.constructed() && has_nvme) { - _nvme_driver.construct(); - _generate_init_config(_init_config); - } - - _devices_rom_parsed = true; -} - - -void Driver_manager::Main::_handle_nvme_ns_update() -{ - _nvme_ns.update(); - _generate_block_devices(); - - /* update service forwarding rules */ - _generate_init_config(_init_config); -} - - -void Driver_manager::Main::_generate_init_config(Reporter &init_config) const -{ - Reporter::Xml_generator xml(init_config, [&] () { - - xml.attribute("verbose", false); - xml.attribute("prio_levels", 2); - - xml.node("report", [&] () { - xml.attribute("child_ram", true); - xml.attribute("delay_ms", 2500); - }); - - xml.node("heartbeat", [&] () { xml.attribute("rate_ms", 2500); }); - - xml.node("parent-provides", [&] () { - _gen_parent_service_xml(xml, Rom_session::service_name()); - _gen_parent_service_xml(xml, Io_mem_session::service_name()); - _gen_parent_service_xml(xml, Io_port_session::service_name()); - _gen_parent_service_xml(xml, Cpu_session::service_name()); - _gen_parent_service_xml(xml, Pd_session::service_name()); - _gen_parent_service_xml(xml, Rm_session::service_name()); - _gen_parent_service_xml(xml, Log_session::service_name()); - _gen_parent_service_xml(xml, Timer::Session::service_name()); - _gen_parent_service_xml(xml, Platform::Session::service_name()); - _gen_parent_service_xml(xml, Report::Session::service_name()); - _gen_parent_service_xml(xml, Capture::Session::service_name()); - }); - - if (_nvme_driver.constructed()) - _nvme_driver->generate_start_node(xml); - - /* block-service forwarding rules */ - bool const nvme = _nvme_driver.constructed() && _nvme_ns.xml().has_sub_node("namespace"); - - if (!nvme) return; - - xml.node("service", [&] () { - xml.attribute("name", Block::Session::service_name()); - if (nvme) - _nvme_driver->gen_service_forwarding_policy(xml, "nvme-0"); - }); - }); -} - - -void Driver_manager::Main::_generate_block_devices(Reporter &block_devices) const -{ - Reporter::Xml_generator xml(block_devices, [&] () { - - /* for now just report the first name space */ - if (_nvme_ns.xml().has_sub_node("namespace")) { - - Xml_node nvme_ctrl = _nvme_ns.xml(); - Xml_node nvme_ns = _nvme_ns.xml().sub_node("namespace"); - xml.node("device", [&] () { - - unsigned long const - block_count = nvme_ns.attribute_value("block_count", 0UL), - block_size = nvme_ns.attribute_value("block_size", 0UL); - - typedef String<40+1> Model; - Model const model = nvme_ctrl.attribute_value("model", Model()); - typedef String<20+1> Serial; - Serial const serial = nvme_ctrl.attribute_value("serial", Serial()); - - xml.attribute("label", String<16>("nvme-0")); - xml.attribute("block_count", block_count); - xml.attribute("block_size", block_size); - xml.attribute("model", model); - xml.attribute("serial", serial); - }); - } - }); -} - - -void Component::construct(Genode::Env &env) { static Driver_manager::Main main(env); } diff --git a/repos/gems/src/app/driver_manager/target.mk b/repos/gems/src/app/driver_manager/target.mk deleted file mode 100644 index 8dafdfea07..0000000000 --- a/repos/gems/src/app/driver_manager/target.mk +++ /dev/null @@ -1,5 +0,0 @@ -TARGET = driver_manager -SRC_CC = main.cc -LIBS += base - -REQUIRES = x86 diff --git a/repos/gems/src/test/driver_manager/main.cc b/repos/gems/src/test/driver_manager/main.cc deleted file mode 100644 index d7a973a097..0000000000 --- a/repos/gems/src/test/driver_manager/main.cc +++ /dev/null @@ -1,138 +0,0 @@ -/* - * \brief Test for validating the device detection of the driver manager - * \author Norman Feske - * \date 2017-06-30 - */ - -/* - * Copyright (C) 2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -/* Genode includes */ -#include -#include -#include -#include -#include - -namespace Test { - using namespace Genode; - struct Main; -} - - -struct Test::Main -{ - Env &_env; - - Attached_rom_dataspace _config { _env, "config" }; - Attached_rom_dataspace _block_devices { _env, "block_devices" }; - Attached_rom_dataspace _displays { _env, "displays" }; - - static bool _attribute_matches(char const *attr, Xml_node expected, Xml_node checked) - { - typedef String<80> Value; - return !expected.has_attribute(attr) - || (expected.attribute_value(attr, Value()) == - checked .attribute_value(attr, Value())); - } - - static bool _block_device_matches(Xml_node expect, Xml_node device) - { - return _attribute_matches("label", expect, device) - && _attribute_matches("block_size", expect, device) - && _attribute_matches("block_count", expect, device); - } - - static bool _usb_block_device_matches(Xml_node expect, Xml_node device) - { - return _block_device_matches(expect, device) - && _attribute_matches("vendor", expect, device) - && _attribute_matches("product", expect, device); - } - - static bool _ahci_block_device_matches(Xml_node expect, Xml_node device) - { - return _block_device_matches(expect, device) - && _attribute_matches("model", expect, device) - && _attribute_matches("serial", expect, device); - } - - void _check_conditions() - { - _block_devices.update(); - - bool expected_devices_present = true; - - log("-- check presence of expected block devices --"); - - _config.xml().for_each_sub_node([&] (Xml_node expect) { - - /* skip nodes that are unrelated to block devices */ - if (expect.type() != "check_usb_block_device" - && expect.type() != "check_ahci_block_device") - return; - - bool device_exists = false; - - _block_devices.xml().for_each_sub_node("device", [&] (Xml_node device) { - - if (expect.type() == "check_usb_block_device" - && _usb_block_device_matches(expect, device)) - device_exists = true; - - if (expect.type() == "check_ahci_block_device" - && _ahci_block_device_matches(expect, device)) - device_exists = true; - }); - - log("block device '", expect.attribute_value("label", String<80>()), "' ", - device_exists ? "present" : "not present"); - - if (!device_exists) - expected_devices_present = false; - }); - - if (!expected_devices_present) - return; - - /* attempt to create a session to each block device */ - _block_devices.xml().for_each_sub_node("device", [&] (Xml_node device) { - - typedef String<64> Label; - Label label = device.attribute_value("label", Label()); - - log("connect to block device '", label, "'"); - - Heap heap(_env.ram(), _env.rm()); - Allocator_avl packet_alloc(&heap); - Block::Connection<> block(_env, &packet_alloc, 128*1024, label.string()); - }); - - if (_config.xml().has_sub_node("check_displays")) { - _displays.update(); - if (!_displays.xml().has_sub_node("display")) - return; - - log("available displays: ", _displays.xml()); - } - - log("all expected devices present and accessible"); - } - - Signal_handler
_block_devices_update_handler { - _env.ep(), *this, &Main::_check_conditions }; - - Main(Env &env) : _env(env) - { - _block_devices.sigh(_block_devices_update_handler); - _check_conditions(); - } -}; - - -void Component::construct(Genode::Env &env) { static Test::Main main(env); } - diff --git a/repos/gems/src/test/driver_manager/target.mk b/repos/gems/src/test/driver_manager/target.mk deleted file mode 100644 index a09c0d524a..0000000000 --- a/repos/gems/src/test/driver_manager/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = test-driver_manager -SRC_CC = main.cc -LIBS += base