ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-06 17:31:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

driver_manager: defer block_devices report

Browse Source 
Now, block_devices are reported earliest right after the devices ROM was
parsed and neither AHCI nor NVMe were found. If one or both devices were
found, the report is deferred after all expected reports arrived.

Issue #4791
This commit is contained in:
Christian Helmuth 2023-03-21 11:59:32 +01:00
parent 6884e6b1ec
commit a2e29c0226
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
repos/gems/src/app/driver_manager/main.cc
View File

@ -30,7 +30,6 @@
namespace Driver_manager { namespace Driver_manager {
using namespace Genode; using namespace Genode;
struct Main; struct Main;
struct Block_devices_generator;
struct Device_driver; struct Device_driver;
struct Intel_gpu_driver; struct Intel_gpu_driver;
struct Intel_fb_driver; struct Intel_fb_driver;
@ -45,12 +44,6 @@ namespace Driver_manager {
} }
struct Driver_manager::Block_devices_generator : Interface
{
virtual void generate_block_devices() = 0;
};
class Driver_manager::Device_driver : Noncopyable class Driver_manager::Device_driver : Noncopyable
{ {
public: public:
@ -351,7 +344,7 @@ struct Driver_manager::Nvme_driver : Device_driver
}; };
struct Driver_manager::Main : private Block_devices_generator struct Driver_manager::Main
{ {
Env &_env; Env &_env;
@ -373,6 +366,8 @@ struct Driver_manager::Main : private Block_devices_generator
Constructible<Ahci_driver> _ahci_driver { }; Constructible<Ahci_driver> _ahci_driver { };
Constructible<Nvme_driver> _nvme_driver { }; Constructible<Nvme_driver> _nvme_driver { };
bool _devices_rom_parsed { false };
bool _use_ohci { true }; bool _use_ohci { true };
Boot_fb_driver::Mode _boot_fb_mode() const Boot_fb_driver::Mode _boot_fb_mode() const
@ -423,10 +418,20 @@ struct Driver_manager::Main : private Block_devices_generator
Ahci_driver::Default_label _default_block_device() const; Ahci_driver::Default_label _default_block_device() const;
/** void _generate_block_devices()
* Block_devices_generator interface {
*/ /* devices must be detected before the checks below can be conducted */
void generate_block_devices() override { _generate_block_devices(_block_devices); } if (!_devices_rom_parsed)
return;
/* check that all drivers completed initialization before reporting */
if (_ahci_driver.constructed() && !_ahci_ports.xml().has_type("ports"))
return;
if (_nvme_driver.constructed() && !_nvme_ns.xml().has_type("controller"))
return;
_generate_block_devices(_block_devices);
}
Main(Env &env) : _env(env) Main(Env &env) : _env(env)
{ {
@ -535,13 +540,15 @@ void Driver_manager::Main::_handle_devices_update()
_usb_devices.sigh(_usb_devices_update_handler); _usb_devices.sigh(_usb_devices_update_handler);
_handle_usb_devices_update(); _handle_usb_devices_update();
_devices_rom_parsed = true;
} }
void Driver_manager::Main::_handle_ahci_ports_update() void Driver_manager::Main::_handle_ahci_ports_update()
{ {
_ahci_ports.update(); _ahci_ports.update();
_generate_block_devices(_block_devices); _generate_block_devices();
/* update service forwarding rules */ /* update service forwarding rules */
_generate_init_config(_init_config); _generate_init_config(_init_config);
@ -551,7 +558,7 @@ void Driver_manager::Main::_handle_ahci_ports_update()
void Driver_manager::Main::_handle_nvme_ns_update() void Driver_manager::Main::_handle_nvme_ns_update()
{ {
_nvme_ns.update(); _nvme_ns.update();
_generate_block_devices(_block_devices); _generate_block_devices();
/* update service forwarding rules */ /* update service forwarding rules */
_generate_init_config(_init_config); _generate_init_config(_init_config);