Changes in uspace/srv/devman/driver.c [5aa06ad:c3d9aaf5] in mainline

File:

• uspace/srv/devman/driver.c (modified) (5 diffs)

uspace/srv/devman/driver.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2018 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -284 +284 @@
         dev->drv = drv;
         dev->passed_to_driver = false;
-        dev->state = DEVICE_NOT_INITIALIZED;
+        fibril_mutex_lock(&dev->state_lock);
+        dev->state = DEVICE_ATTACHING;
+        fibril_mutex_unlock(&dev->state_lock);
+        fibril_condvar_broadcast(&dev->state_cv);
         list_append(&dev->driver_devices, &drv->devices);
 
@@ -631 +634 @@
 void add_device(driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
 {
+        link_t *link;
+        fun_node_t *fun;
+
         /*
          * We do not expect to have driver's mutex locked as we do not
@@ -664 +670 @@
                 async_wait_for(req, &rc);
         }
+
+        if (rc == EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Device was added. Wait for "
+                    "child functions' devices to stabilize.");
+                fibril_rwlock_read_lock(&tree->rwlock);
+                link = list_first(&dev->functions);
+                while (link != NULL) {
+                        fun = list_get_instance(link, fun_node_t,
+                            dev_functions);
+
+                        if (fun->child != NULL) {
+                                log_msg(LOG_DEFAULT, LVL_DEBUG2, "Wait for "
+                                    "child device %p.", (void *)fun->child);
+                                fun_add_ref(fun);
+                                fibril_rwlock_read_unlock(&tree->rwlock);
+                                dev_wait_stable(fun->child);
+                                fibril_rwlock_read_lock(&tree->rwlock);
+                                fun_del_ref(fun);
+                        }
+
+                        link = list_next(link, &dev->functions);
+                }
+
+                fibril_rwlock_read_unlock(&tree->rwlock);
+                log_msg(LOG_DEFAULT, LVL_DEBUG,
+                    "Finished waiting for children.");
+        }
+
+        fibril_mutex_lock(&dev->state_lock);
 
         switch (rc) {
@@ -677 +712 @@
         }
 
+        fibril_mutex_unlock(&dev->state_lock);
+        fibril_condvar_broadcast(&dev->state_cv);
+
         dev->passed_to_driver = true;
 }