Changes in / [b38dfd8:4006447] in mainline

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile.common (modified) (1 diff)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/isa/isa.c (modified) (2 diffs)
• uspace/drv/ns8250/ns8250.c (modified) (2 diffs)
• uspace/drv/pciintel/pci.c (modified) (2 diffs)
• uspace/drv/root/root.c (modified) (5 diffs)
• uspace/drv/rootia32/Makefile (deleted)
• uspace/drv/rootia32/rootia32.c (deleted)
• uspace/drv/rootia32/rootia32.ma (deleted)
• uspace/drv/rootpc/Makefile (added)
• uspace/drv/rootpc/rootpc.c (added)
• uspace/drv/rootpc/rootpc.ma (added)
• uspace/drv/rootvirt/Makefile (added)
• uspace/drv/rootvirt/devices.def (added)
• uspace/drv/rootvirt/rootvirt.c (added)
• uspace/drv/rootvirt/rootvirt.ma (added)
• uspace/drv/test1/Makefile (added)
• uspace/drv/test1/test1.c (added)
• uspace/drv/test1/test1.ma (added)
• uspace/drv/test2/Makefile (added)
• uspace/drv/test2/test2.c (added)
• uspace/drv/test2/test2.ma (added)
• uspace/lib/c/generic/devman.c (modified) (1 diff)
• uspace/lib/drv/generic/driver.c (modified) (3 diffs)
• uspace/lib/drv/include/driver.h (modified) (1 diff)
• uspace/srv/devman/devman.c (modified) (12 diffs)
• uspace/srv/devman/devman.h (modified) (1 diff)
• uspace/srv/devman/main.c (modified) (3 diffs)
• uspace/srv/devman/match.c (modified) (2 diffs)

HelenOS.config

@@ -545 +545 @@
 % Line debugging information
 ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)
+
+% Launch (devman) test drivers
+! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (y/n)
+

boot/Makefile.common

@@ -109 +109 @@
         
 RD_DRVS = \
-        root
+        root \
+        rootvirt \
+        test1 \
+        test2
 
 RD_DRV_CFG = 

boot/arch/amd64/Makefile.inc

@@ -37 +37 @@
 
 RD_DRVS += \
-        rootia32 \
+        rootpc \
         pciintel \
         isa \

uspace/Makefile

@@ -85 +85 @@
         srv/net/tl/tcp \
         srv/net/net \
-        drv/root
+        drv/root \
+        drv/rootvirt \
+        drv/test1 \
+        drv/test2
 
 ## Networking
@@ -108 +111 @@
 
 ifeq ($(UARCH),amd64)
+        DIRS += drv/rootpc
+        DIRS += drv/pciintel
+        DIRS += drv/isa
+        DIRS += drv/ns8250
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += drv/rootia32
+        DIRS += drv/rootpc
         DIRS += drv/pciintel
         DIRS += drv/isa

uspace/drv/isa/isa.c

@@ -282 +282 @@
 
                 printf(NAME ": added io range (addr=0x%x, size=0x%x) to "
-                    "device %s\n", addr, len, dev->name);
+                    "device %s\n", (unsigned int) addr, (unsigned int) len,
+                    dev->name);
         }
 }
@@ -489 +490 @@
 static int isa_add_device(device_t *dev)
 {
-        printf(NAME ": isa_add_device, device handle = %d\n", dev->handle);
+        printf(NAME ": isa_add_device, device handle = %d\n",
+            (int) dev->handle);
 
         /* Add child devices. */

uspace/drv/ns8250/ns8250.c

@@ -274 +274 @@
         
         /* Gain control over port's registers. */
-        if (pio_enable((void *) data->io_addr, REG_COUNT,
+        if (pio_enable((void *)(uintptr_t) data->io_addr, REG_COUNT,
             (void **) &data->port)) {
                 printf(NAME ": error - cannot gain the port %#" PRIx32 " for device "
@@ -727 +727 @@
 {
         printf(NAME ": ns8250_add_device %s (handle = %d)\n",
-            dev->name, dev->handle);
+            dev->name, (int) dev->handle);
         
         int res = ns8250_dev_initialize(dev);

uspace/drv/pciintel/pci.c

@@ -324 +324 @@
                 printf(NAME ": device %s : ", dev->name);
                 printf("address = %" PRIx64, range_addr);
-                printf(", size = %x\n", range_size);
+                printf(", size = %x\n", (unsigned int) range_size);
         }
         
@@ -489 +489 @@
             (uint32_t) hw_resources.resources[0].res.io_range.address;
         
-        if (pio_enable((void *)bus_data->conf_io_addr, 8,
+        if (pio_enable((void *)(uintptr_t)bus_data->conf_io_addr, 8,
             &bus_data->conf_addr_port)) {
                 printf(NAME ": failed to enable configuration ports.\n");

uspace/drv/root/root.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -53 +54 @@
 #define NAME "root"
 
+#define PLATFORM_DEVICE_NAME "hw"
+#define PLATFORM_DEVICE_MATCH_ID STRING(UARCH)
+#define PLATFORM_DEVICE_MATCH_SCORE 100
+
+#define VIRTUAL_DEVICE_NAME "virt"
+#define VIRTUAL_DEVICE_MATCH_ID "rootvirt"
+#define VIRTUAL_DEVICE_MATCH_SCORE 100
+
 static int root_add_device(device_t *dev);
 
@@ -66 +75 @@
 };
 
+/** Create the device which represents the root of virtual device tree.
+ *
+ * @param parent Parent of the newly created device.
+ * @return Error code.
+ */
+static int add_virtual_root_child(device_t *parent)
+{
+        printf(NAME ": adding new child for virtual devices.\n");
+        printf(NAME ":   device node is `%s' (%d %s)\n", VIRTUAL_DEVICE_NAME,
+            VIRTUAL_DEVICE_MATCH_SCORE, VIRTUAL_DEVICE_MATCH_ID);
+
+        int res = child_device_register_wrapper(parent, VIRTUAL_DEVICE_NAME,
+            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE);
+
+        return res;
+}
+
 /** Create the device which represents the root of HW device tree.
  *
@@ -74 +100 @@
 {
         printf(NAME ": adding new child for platform device.\n");
+        printf(NAME ":   device node is `%s' (%d %s)\n", PLATFORM_DEVICE_NAME,
+            PLATFORM_DEVICE_MATCH_SCORE, PLATFORM_DEVICE_MATCH_ID);
         
-        int res = EOK;
-        device_t *platform = NULL;
-        match_id_t *match_id = NULL;
-        
-        /* Create new device. */
-        platform = create_device();
-        if (NULL == platform) {
-                res = ENOMEM;
-                goto failure;
-        }       
-        
-        platform->name = "hw";
-        printf(NAME ": the new device's name is %s.\n", platform->name);
-        
-        /* Initialize match id list. */
-        match_id = create_match_id();
-        if (NULL == match_id) {
-                res = ENOMEM;
-                goto failure;
-        }
-        
-        /* TODO - replace this with some better solution (sysinfo ?) */
-        match_id->id = STRING(UARCH);
-        match_id->score = 100;
-        add_match_id(&platform->match_ids, match_id);
-        
-        /* Register child device. */
-        res = child_device_register(platform, parent);
-        if (EOK != res)
-                goto failure;
-        
-        return res;
-        
-failure:
-        if (NULL != match_id)
-                match_id->id = NULL;
-        
-        if (NULL != platform) {
-                platform->name = NULL;
-                delete_device(platform);
-        }
-        
+        int res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
+            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE);
+
         return res;
 }
@@ -130 +119 @@
             dev->handle);
         
+        /*
+         * Register virtual devices root.
+         * We ignore error occurrence because virtual devices shall not be
+         * vital for the system.
+         */
+        add_virtual_root_child(dev);
+
         /* Register root device's children. */
         int res = add_platform_child(dev);

uspace/lib/c/generic/devman.c

@@ -116 +116 @@
 {
         ipc_call_t answer;
-        async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer);
+        aid_t req = async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer);
         int retval = async_data_write_start(phone, match_id->id, str_size(match_id->id));
-        return retval;  
+        async_wait_for(req, NULL);
+        return retval;
 }
 

uspace/lib/drv/generic/driver.c

@@ -165 +165 @@
         
         devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
+        devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall);
+    
         device_t *dev = create_device();
         dev->handle = dev_handle;
@@ -172 +174 @@
         
         add_to_devices_list(dev);
+        dev->parent = driver_get_device(&devices, parent_dev_handle);
+        
         res = driver->driver_ops->add_device(dev);
         if (0 == res) {
@@ -377 +381 @@
 }
 
+/** Wrapper for child_device_register for devices with single match id.
+ *
+ * @param parent Parent device.
+ * @param child_name Child device name.
+ * @param child_match_id Child device match id.
+ * @param child_match_score Child device match score.
+ * @return Error code.
+ */
+int child_device_register_wrapper(device_t *parent, const char *child_name,
+    const char *child_match_id, int child_match_score)
+{
+        device_t *child = NULL;
+        match_id_t *match_id = NULL;
+        int rc;
+
+        child = create_device();
+        if (child == NULL) {
+                rc = ENOMEM;
+                goto failure;
+        }
+
+        child->name = child_name;
+
+        match_id = create_match_id();
+        if (match_id == NULL) {
+                rc = ENOMEM;
+                goto failure;
+        }
+
+        match_id->id = child_match_id;
+        match_id->score = child_match_score;
+        add_match_id(&child->match_ids, match_id);
+
+        rc = child_device_register(child, parent);
+        if (EOK != rc)
+                goto failure;
+
+        return EOK;
+
+failure:
+        if (match_id != NULL) {
+                match_id->id = NULL;
+                delete_match_id(match_id);
+        }
+
+        if (child != NULL) {
+                child->name = NULL;
+                delete_device(child);
+        }
+
+        return rc;
+}
+
 int driver_main(driver_t *drv)
 {

uspace/lib/drv/include/driver.h

@@ -199 +199 @@
 
 int child_device_register(device_t *, device_t *);
+int child_device_register_wrapper(device_t *, const char *, const char *, int);
 
 

uspace/srv/devman/devman.c

@@ -508 +508 @@
 /** Notify driver about the devices to which it was assigned.
  *
- * The driver's mutex must be locked.
- *
  * @param driver        The driver to which the devices are passed.
  */
@@ -518 +516 @@
         int phone;
 
-        printf(NAME ": pass_devices_to_driver\n");
-
-        phone = ipc_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
-        if (phone > 0) {
-                
+        printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name);
+
+        fibril_mutex_lock(&driver->driver_mutex);
+
+        phone = async_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
+
+        if (phone < 0) {
+                fibril_mutex_unlock(&driver->driver_mutex);
+                return;
+        }
+
+        /*
+         * Go through devices list as long as there is some device
+         * that has not been passed to the driver.
+         */
+        link = driver->devices.next;
+        while (link != &driver->devices) {
+                dev = list_get_instance(link, node_t, driver_devices);
+                if (dev->passed_to_driver) {
+                        link = link->next;
+                        continue;
+                }
+
+                /*
+                 * We remove the device from the list to allow safe adding
+                 * of new devices (no one will touch our item this way).
+                 */
+                list_remove(link);
+
+                /*
+                 * Unlock to avoid deadlock when adding device
+                 * handled by itself.
+                 */
+                fibril_mutex_unlock(&driver->driver_mutex);
+
+                add_device(phone, driver, dev, tree);
+
+                /*
+                 * Lock again as we will work with driver's
+                 * structure.
+                 */
+                fibril_mutex_lock(&driver->driver_mutex);
+
+                /*
+                 * Insert the device back.
+                 * The order is not relevant here so no harm is done
+                 * (actually, the order would be preserved in most cases).
+                 */
+                list_append(link, &driver->devices);
+
+                /*
+                 * Restart the cycle to go through all devices again.
+                 */
                 link = driver->devices.next;
-                while (link != &driver->devices) {
-                        dev = list_get_instance(link, node_t, driver_devices);
-                        add_device(phone, driver, dev, tree);
-                        link = link->next;
-                }
-                
-                ipc_hangup(phone);
-        }
+        }
+
+        ipc_hangup(phone);
+
+        /*
+         * Once we passed all devices to the driver, we need to mark the
+         * driver as running.
+         * It is vital to do it here and inside critical section.
+         *
+         * If we would change the state earlier, other devices added to
+         * the driver would be added to the device list and started
+         * immediately and possibly started here as well.
+         */
+        printf(NAME ": driver %s goes into running state.\n", driver->name);
+        driver->state = DRIVER_RUNNING;
+
+        fibril_mutex_unlock(&driver->driver_mutex);
 }
 
@@ -545 +600 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-        printf(NAME ": initialize_running_driver\n");
-        fibril_mutex_lock(&driver->driver_mutex);
+        printf(NAME ": initialize_running_driver (`%s')\n", driver->name);
         
         /*
@@ -553 +607 @@
          */
         pass_devices_to_driver(driver, tree);
-        
-        /* Change driver's state to running. */
-        driver->state = DRIVER_RUNNING;
-        
-        fibril_mutex_unlock(&driver->driver_mutex);
 }
 
@@ -629 +678 @@
 }
 
+static FIBRIL_MUTEX_INITIALIZE(add_device_guard);
 
 /** Pass a device to running driver.
@@ -637 +687 @@
 void add_device(int phone, driver_t *drv, node_t *node, dev_tree_t *tree)
 {
-        printf(NAME ": add_device\n");
+        fibril_mutex_lock(&add_device_guard);
+
+        /*
+         * We do not expect to have driver's mutex locked as we do not
+         * access any structures that would affect driver_t.
+         */
+        printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name,
+            node->name);
         
         ipcarg_t rc;
@@ -643 +700 @@
         
         /* Send the device to the driver. */
-        aid_t req = async_send_1(phone, DRIVER_ADD_DEVICE, node->handle,
-            &answer);
+        devman_handle_t parent_handle;
+        if (node->parent) {
+                parent_handle = node->parent->handle;
+        } else {
+                parent_handle = 0;
+        }
+
+        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, node->handle,
+            parent_handle, &answer);
         
         /* Send the device's name to the driver. */
@@ -652 +716 @@
                 /* TODO handle error */
         }
-        
+
         /* Wait for answer from the driver. */
         async_wait_for(req, &rc);
+
+        fibril_mutex_unlock(&add_device_guard);
+
         switch(rc) {
         case EOK:
@@ -667 +734 @@
         }
         
+        node->passed_to_driver = true;
+
         return;
 }
@@ -692 +761 @@
         attach_driver(node, drv);
         
+        fibril_mutex_lock(&drv->driver_mutex);
         if (drv->state == DRIVER_NOT_STARTED) {
                 /* Start the driver. */
                 start_driver(drv);
         }
-        
-        if (drv->state == DRIVER_RUNNING) {
+        bool is_running = drv->state == DRIVER_RUNNING;
+        fibril_mutex_unlock(&drv->driver_mutex);
+
+        if (is_running) {
                 /* Notify the driver about the new device. */
-                int phone = ipc_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
+                int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
                 if (phone > 0) {
                         add_device(phone, drv, node, tree);
@@ -861 +933 @@
         node->name = dev_name;
         if (!set_dev_path(node, parent)) {
-                fibril_rwlock_write_unlock(&tree->rwlock);
                 return false;
         }
@@ -1083 +1154 @@
         while (link != &class_list->classes) {
                 cl = list_get_instance(link, dev_class_t, link);
-                if (str_cmp(cl->name, class_name) == 0)
+                if (str_cmp(cl->name, class_name) == 0) {
                         return cl;
+                }
+                link = link->next;
         }
         

uspace/srv/devman/devman.h

@@ -168 +168 @@
          */
         link_t devmap_link;
+
+        /**
+         * Whether this device was already passed to the driver.
+         */
+        bool passed_to_driver;
 };
 

uspace/srv/devman/main.c

@@ -197 +197 @@
 }
 
+static int assign_driver_fibril(void *arg)
+{
+        node_t *node = (node_t *) arg;
+        assign_driver(node, &drivers_list, &device_tree);
+        return EOK;
+}
+
 /** Handle child device registration.
  *
@@ -237 +244 @@
         
         devman_receive_match_ids(match_count, &node->match_ids);
-        
+
+        /*
+         * Try to find a suitable driver and assign it to the device.  We do
+         * not want to block the current fibril that is used for processing
+         * incoming calls: we will launch a separate fibril to handle the
+         * driver assigning. That is because assign_driver can actually include
+         * task spawning which could take some time.
+         */
+        fid_t assign_fibril = fibril_create(assign_driver_fibril, node);
+        if (assign_fibril == 0) {
+                /*
+                 * Fallback in case we are out of memory.
+                 * Probably not needed as we will die soon anyway ;-).
+                 */
+                (void) assign_driver_fibril(node);
+        } else {
+                fibril_add_ready(assign_fibril);
+        }
+
         /* Return device handle to parent's driver. */
         ipc_answer_1(callid, EOK, node->handle);
-        
-        /* Try to find suitable driver and assign it to the device. */
-        assign_driver(node, &drivers_list, &device_tree);
 }
 
@@ -297 +319 @@
         printf(NAME ": device '%s' added to class '%s', class name '%s' was "
             "asigned to it\n", dev->pathname, class_name, class_info->dev_name);
-        
+
         ipc_answer_0(callid, EOK);
 }

uspace/srv/devman/match.c

@@ -35 +35 @@
 #include "devman.h"
 
+/** Compute compound score of driver and device.
+ *
+ * @param driver Match id of the driver.
+ * @param device Match id of the device.
+ * @return Compound score.
+ * @retval 0 No match at all.
+ */
+static int compute_match_score(match_id_t *driver, match_id_t *device)
+{
+        if (str_cmp(driver->id, device->id) == 0) {
+                /*
+                 * The strings match, return the product of their scores.
+                 */
+                return driver->score * device->score;
+        } else {
+                /*
+                 * Different strings, return zero.
+                 */
+                return 0;
+        }
+}
+
 int get_match_score(driver_t *drv, node_t *dev)
 {
@@ -43 +65 @@
                 return 0;
         
+        /*
+         * Go through all pairs, return the highest score obtained.
+         */
+        int highest_score = 0;
+        
         link_t *drv_link = drv->match_ids.ids.next;
-        link_t *dev_link = dev->match_ids.ids.next;
-        
-        match_id_t *drv_id = list_get_instance(drv_link, match_id_t, link);
-        match_id_t *dev_id = list_get_instance(dev_link, match_id_t, link);
-        
-        int score_next_drv = 0;
-        int score_next_dev = 0;
-        
-        do {
-                match_id_t *tmp_ma_id;
-        
-                if (str_cmp(drv_id->id, dev_id->id) == 0) {
-                        /*
-                         * We found a match.
-                         * Return the score of the match.
-                         */
-                        return drv_id->score * dev_id->score;
+        while (drv_link != drv_head) {
+                link_t *dev_link = dev_head->next;
+                while (dev_link != dev_head) {
+                        match_id_t *drv_id = list_get_instance(drv_link, match_id_t, link);
+                        match_id_t *dev_id = list_get_instance(dev_link, match_id_t, link);
+                        
+                        int score = compute_match_score(drv_id, dev_id);
+                        if (score > highest_score) {
+                                highest_score = score;
+                        }
+
+                        dev_link = dev_link->next;
                 }
                 
-                /*
-                 * Compute the next score we get, if we advance in the driver's
-                 * list of match ids.
-                 */
-                if (drv_link->next != drv_head) {
-                        tmp_ma_id = list_get_instance(drv_link->next,
-                            match_id_t, link);
-                        score_next_drv = dev_id->score * tmp_ma_id->score;
-                } else {
-                        score_next_drv = 0;
-                }
-                
-                /*
-                 * Compute the next score we get, if we advance in the device's
-                 * list of match ids.
-                 */
-                if (dev_link->next != dev_head) {
-                        tmp_ma_id = list_get_instance(dev_link->next,
-                            match_id_t, link);
-                        score_next_dev = drv_id->score * tmp_ma_id->score;
-                } else {
-                        score_next_dev = 0;
-                }
-                
-                /*
-                 * Advance in one of the two lists, so we get the next highest
-                 * score.
-                 */
-                if (score_next_drv > score_next_dev) {
-                        drv_link = drv_link->next;
-                        drv_id = list_get_instance(drv_link, match_id_t, link);
-                } else {
-                        dev_link = dev_link->next;
-                        dev_id = list_get_instance(dev_link, match_id_t, link);
-                }
-                
-        } while (drv_link->next != drv_head && dev_link->next != dev_head);
+                drv_link = drv_link->next;
+        }
         
-        return 0;
+        return highest_score;
 }