Index: HelenOS.config =================================================================== --- HelenOS.config (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ HelenOS.config (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -545,2 +545,6 @@ % Line debugging information ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y) + +% Launch (devman) test drivers +! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (y/n) + Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ boot/Makefile.common (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -109,5 +109,8 @@ RD_DRVS = \ - root + root \ + rootvirt \ + test1 \ + test2 RD_DRV_CFG = Index: boot/arch/amd64/Makefile.inc =================================================================== --- boot/arch/amd64/Makefile.inc (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ boot/arch/amd64/Makefile.inc (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -37,5 +37,5 @@ RD_DRVS += \ - rootia32 \ + rootpc \ pciintel \ isa \ Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/Makefile (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -85,5 +85,8 @@ srv/net/tl/tcp \ srv/net/net \ - drv/root + drv/root \ + drv/rootvirt \ + drv/test1 \ + drv/test2 ## Networking @@ -108,8 +111,12 @@ 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 Index: uspace/drv/isa/isa.c =================================================================== --- uspace/drv/isa/isa.c (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/drv/isa/isa.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -282,5 +282,6 @@ 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,5 +490,6 @@ 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. */ Index: uspace/drv/ns8250/ns8250.c =================================================================== --- uspace/drv/ns8250/ns8250.c (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/drv/ns8250/ns8250.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -274,5 +274,5 @@ /* 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,5 +727,5 @@ { printf(NAME ": ns8250_add_device %s (handle = %d)\n", - dev->name, dev->handle); + dev->name, (int) dev->handle); int res = ns8250_dev_initialize(dev); Index: uspace/drv/pciintel/pci.c =================================================================== --- uspace/drv/pciintel/pci.c (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/drv/pciintel/pci.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -324,5 +324,5 @@ 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,5 +489,5 @@ (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"); Index: uspace/drv/root/root.c =================================================================== --- uspace/drv/root/root.c (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/drv/root/root.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Lenka Trochtova + * Copyright (c) 2010 Vojtech Horky * All rights reserved. * @@ -53,4 +54,12 @@ #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,4 +75,21 @@ }; +/** 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,47 +100,10 @@ { 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,4 +119,11 @@ 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); Index: pace/drv/rootia32/Makefile =================================================================== --- uspace/drv/rootia32/Makefile (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2010 Lenka Trochtova -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../.. -LIBS = $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -BINARY = rootia32 - -SOURCES = \ - rootia32.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/drv/rootia32/rootia32.c =================================================================== --- uspace/drv/rootia32/rootia32.c (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ (revision ) @@ -1,204 +1,0 @@ -/* - * Copyright (c) 2010 Lenka Trochtova - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @defgroup root_ia32 Root HW device driver for ia32 platform. - * @brief HelenOS root HW device driver for ia32 platform. - * @{ - */ - -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#define NAME "rootia32" - -typedef struct rootia32_child_dev_data { - hw_resource_list_t hw_resources; -} rootia32_child_dev_data_t; - -static int rootia32_add_device(device_t *dev); -static void root_ia32_init(void); - -/** The root device driver's standard operations. */ -static driver_ops_t rootia32_ops = { - .add_device = &rootia32_add_device -}; - -/** The root device driver structure. */ -static driver_t rootia32_driver = { - .name = NAME, - .driver_ops = &rootia32_ops -}; - -static hw_resource_t pci_conf_regs = { - .type = IO_RANGE, - .res.io_range = { - .address = 0xCF8, - .size = 8, - .endianness = LITTLE_ENDIAN - } -}; - -static rootia32_child_dev_data_t pci_data = { - .hw_resources = { - 1, - &pci_conf_regs - } -}; - -static hw_resource_list_t *rootia32_get_child_resources(device_t *dev) -{ - rootia32_child_dev_data_t *data; - - data = (rootia32_child_dev_data_t *) dev->driver_data; - if (NULL == data) - return NULL; - - return &data->hw_resources; -} - -static bool rootia32_enable_child_interrupt(device_t *dev) -{ - /* TODO */ - - return false; -} - -static resource_iface_t child_res_iface = { - &rootia32_get_child_resources, - &rootia32_enable_child_interrupt -}; - -/* Initialized in root_ia32_init() function. */ -static device_ops_t rootia32_child_ops; - -static bool -rootia32_add_child(device_t *parent, const char *name, const char *str_match_id, - rootia32_child_dev_data_t *drv_data) -{ - printf(NAME ": adding new child device '%s'.\n", name); - - device_t *child = NULL; - match_id_t *match_id = NULL; - - /* Create new device. */ - child = create_device(); - if (NULL == child) - goto failure; - - child->name = name; - child->driver_data = drv_data; - - /* Initialize match id list */ - match_id = create_match_id(); - if (NULL == match_id) - goto failure; - - match_id->id = str_match_id; - match_id->score = 100; - add_match_id(&child->match_ids, match_id); - - /* Set provided operations to the device. */ - child->ops = &rootia32_child_ops; - - /* Register child device. */ - if (EOK != child_device_register(child, parent)) - goto failure; - - return true; - -failure: - if (NULL != match_id) - match_id->id = NULL; - - if (NULL != child) { - child->name = NULL; - delete_device(child); - } - - printf(NAME ": failed to add child device '%s'.\n", name); - - return false; -} - -static bool rootia32_add_children(device_t *dev) -{ - return rootia32_add_child(dev, "pci0", "intel_pci", &pci_data); -} - -/** Get the root device. - * - * @param dev The device which is root of the whole device tree (both - * of HW and pseudo devices). - * @return Zero on success, negative error number otherwise. - */ -static int rootia32_add_device(device_t *dev) -{ - printf(NAME ": rootia32_add_device, device handle = %d\n", dev->handle); - - /* Register child devices. */ - if (!rootia32_add_children(dev)) { - printf(NAME ": failed to add child devices for platform " - "ia32.\n"); - } - - return EOK; -} - -static void root_ia32_init(void) -{ - rootia32_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_res_iface; -} - -int main(int argc, char *argv[]) -{ - printf(NAME ": HelenOS rootia32 device driver\n"); - root_ia32_init(); - return driver_main(&rootia32_driver); -} - -/** - * @} - */ Index: pace/drv/rootia32/rootia32.ma =================================================================== --- uspace/drv/rootia32/rootia32.ma (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ (revision ) @@ -1,1 +1,0 @@ -10 ia32 Index: uspace/drv/rootpc/Makefile =================================================================== --- uspace/drv/rootpc/Makefile (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/rootpc/Makefile (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2010 Lenka Trochtova +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +LIBS = $(LIBDRV_PREFIX)/libdrv.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +BINARY = rootpc + +SOURCES = \ + rootpc.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/rootpc/rootpc.c =================================================================== --- uspace/drv/rootpc/rootpc.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/rootpc/rootpc.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,205 @@ +/* + * Copyright (c) 2010 Lenka Trochtova + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @defgroup root_pc Root HW device driver for ia32 and amd64 platform. + * @brief HelenOS root HW device driver for ia32 and amd64 platform. + * @{ + */ + +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#define NAME "rootpc" + +typedef struct rootpc_child_dev_data { + hw_resource_list_t hw_resources; +} rootpc_child_dev_data_t; + +static int rootpc_add_device(device_t *dev); +static void root_pc_init(void); + +/** The root device driver's standard operations. */ +static driver_ops_t rootpc_ops = { + .add_device = &rootpc_add_device +}; + +/** The root device driver structure. */ +static driver_t rootpc_driver = { + .name = NAME, + .driver_ops = &rootpc_ops +}; + +static hw_resource_t pci_conf_regs = { + .type = IO_RANGE, + .res.io_range = { + .address = 0xCF8, + .size = 8, + .endianness = LITTLE_ENDIAN + } +}; + +static rootpc_child_dev_data_t pci_data = { + .hw_resources = { + 1, + &pci_conf_regs + } +}; + +static hw_resource_list_t *rootpc_get_child_resources(device_t *dev) +{ + rootpc_child_dev_data_t *data; + + data = (rootpc_child_dev_data_t *) dev->driver_data; + if (NULL == data) + return NULL; + + return &data->hw_resources; +} + +static bool rootpc_enable_child_interrupt(device_t *dev) +{ + /* TODO */ + + return false; +} + +static resource_iface_t child_res_iface = { + &rootpc_get_child_resources, + &rootpc_enable_child_interrupt +}; + +/* Initialized in root_pc_init() function. */ +static device_ops_t rootpc_child_ops; + +static bool +rootpc_add_child(device_t *parent, const char *name, const char *str_match_id, + rootpc_child_dev_data_t *drv_data) +{ + printf(NAME ": adding new child device '%s'.\n", name); + + device_t *child = NULL; + match_id_t *match_id = NULL; + + /* Create new device. */ + child = create_device(); + if (NULL == child) + goto failure; + + child->name = name; + child->driver_data = drv_data; + + /* Initialize match id list */ + match_id = create_match_id(); + if (NULL == match_id) + goto failure; + + match_id->id = str_match_id; + match_id->score = 100; + add_match_id(&child->match_ids, match_id); + + /* Set provided operations to the device. */ + child->ops = &rootpc_child_ops; + + /* Register child device. */ + if (EOK != child_device_register(child, parent)) + goto failure; + + return true; + +failure: + if (NULL != match_id) + match_id->id = NULL; + + if (NULL != child) { + child->name = NULL; + delete_device(child); + } + + printf(NAME ": failed to add child device '%s'.\n", name); + + return false; +} + +static bool rootpc_add_children(device_t *dev) +{ + return rootpc_add_child(dev, "pci0", "intel_pci", &pci_data); +} + +/** Get the root device. + * + * @param dev The device which is root of the whole device tree (both + * of HW and pseudo devices). + * @return Zero on success, negative error number otherwise. + */ +static int rootpc_add_device(device_t *dev) +{ + printf(NAME ": rootpc_add_device, device handle = %d\n", + (int)dev->handle); + + /* Register child devices. */ + if (!rootpc_add_children(dev)) { + printf(NAME ": failed to add child devices for platform " + "ia32.\n"); + } + + return EOK; +} + +static void root_pc_init(void) +{ + rootpc_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_res_iface; +} + +int main(int argc, char *argv[]) +{ + printf(NAME ": HelenOS rootpc device driver\n"); + root_pc_init(); + return driver_main(&rootpc_driver); +} + +/** + * @} + */ Index: uspace/drv/rootpc/rootpc.ma =================================================================== --- uspace/drv/rootpc/rootpc.ma (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/rootpc/rootpc.ma (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,2 @@ +10 ia32 +10 amd64 Index: uspace/drv/rootvirt/Makefile =================================================================== --- uspace/drv/rootvirt/Makefile (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/rootvirt/Makefile (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2010 Vojtech Horky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +LIBS = $(LIBDRV_PREFIX)/libdrv.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +BINARY = rootvirt + +SOURCES = \ + rootvirt.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/rootvirt/devices.def =================================================================== --- uspace/drv/rootvirt/devices.def (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/rootvirt/devices.def (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,19 @@ +/* + * Add list of virtual devices you want to launch driver for here. + * + * Unless the list is empty, the last item shall be followed by a comma. + */ +#ifdef CONFIG_TEST_DRIVERS +{ + .name = "test1", + .match_id = "virtual&test1" +}, +{ + .name = "test2alpha", + .match_id = "virtual&test2" +}, +{ + .name = "test2bravo", + .match_id = "virtual&test2" +}, +#endif Index: uspace/drv/rootvirt/rootvirt.c =================================================================== --- uspace/drv/rootvirt/rootvirt.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/rootvirt/rootvirt.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @defgroup rootvirt Root device driver for virtual devices. + * @{ + */ + +/** @file + */ + +#include +#include +#include +#include +#include + +#define NAME "rootvirt" + +/** Virtual device entry. */ +typedef struct { + /** Device name. */ + const char *name; + /** Device match id. */ + const char *match_id; +} virtual_device_t; + +/** List of existing virtual devices. */ +virtual_device_t virtual_devices[] = { +#include "devices.def" + /* Terminating item. */ + { + .name = NULL, + .match_id = NULL + } +}; + +static int add_device(device_t *dev); + +static driver_ops_t rootvirt_ops = { + .add_device = &add_device +}; + +static driver_t rootvirt_driver = { + .name = NAME, + .driver_ops = &rootvirt_ops +}; + +/** Add child device. + * + * @param parent Parent device. + * @param virt_dev Virtual device to add. + * @return Error code. + */ +static int add_child(device_t *parent, virtual_device_t *virt_dev) +{ + printf(NAME ": registering child device `%s' (match \"%s\")\n", + virt_dev->name, virt_dev->match_id); + + int rc = child_device_register_wrapper(parent, virt_dev->name, + virt_dev->match_id, 10); + + if (rc == EOK) { + printf(NAME ": registered child device `%s'\n", + virt_dev->name); + } else { + printf(NAME ": failed to register child device `%s': %s\n", + virt_dev->name, str_error(rc)); + } + + return rc; +} + +static int add_device(device_t *dev) +{ + static int instances = 0; + + /* + * Allow only single instance of root virtual device. + */ + instances++; + if (instances > 1) { + return ELIMIT; + } + + printf(NAME ": add_device(name=\"%s\", handle=%d)\n", + dev->name, (int)dev->handle); + + /* + * Go through all virtual devices and try to add them. + * We silently ignore failures. + */ + virtual_device_t *virt_dev = virtual_devices; + while (virt_dev->name != NULL) { + (void) add_child(dev, virt_dev); + virt_dev++; + } + + return EOK; +} + +int main(int argc, char *argv[]) +{ + printf(NAME ": HelenOS virtual devices root driver\n"); + return driver_main(&rootvirt_driver); +} + +/** + * @} + */ + Index: uspace/drv/rootvirt/rootvirt.ma =================================================================== --- uspace/drv/rootvirt/rootvirt.ma (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/rootvirt/rootvirt.ma (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,1 @@ +10 rootvirt Index: uspace/drv/test1/Makefile =================================================================== --- uspace/drv/test1/Makefile (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/test1/Makefile (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2010 Vojtech Horky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +LIBS = $(LIBDRV_PREFIX)/libdrv.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +BINARY = test1 + +SOURCES = \ + test1.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/test1/test1.c =================================================================== --- uspace/drv/test1/test1.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/test1/test1.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @file + */ + +#include +#include +#include +#include +#include + +#define NAME "test1" + +static int add_device(device_t *dev); + +static driver_ops_t driver_ops = { + .add_device = &add_device +}; + +static driver_t the_driver = { + .name = NAME, + .driver_ops = &driver_ops +}; + +/** Register child and inform user about it. + * + * @param parent Parent device. + * @param message Message for the user. + * @param name Device name. + * @param match_id Device match id. + * @param score Device match score. + */ +static void register_child_verbose(device_t *parent, const char *message, + const char *name, const char *match_id, int match_score) +{ + printf(NAME ": registering child device `%s': %s.\n", + name, message); + + int rc = child_device_register_wrapper(parent, name, + match_id, match_score); + + if (rc == EOK) { + printf(NAME ": registered child device `%s'.\n", name); + } else { + printf(NAME ": failed to register child `%s' (%s).\n", + name, str_error(rc)); + } +} + +/** Callback when new device is passed to this driver. + * This function is the body of the test: it shall register new child + * (named `clone') that shall be driven by the same task. When the clone + * is added, it registers another child (named `child') that is also driven + * by this task. The conditions ensure that we do not recurse indefinitely. + * When successful, the device tree shall contain following fragment: + * + * /virtual/test1 + * /virtual/test1/clone + * /virtual/test1/clone/child + * + * and devman shall not deadlock. + * + * + * @param dev New device. + * @return Error code reporting success of the operation. + */ +static int add_device(device_t *dev) +{ + printf(NAME ": add_device(name=\"%s\", handle=%d)\n", + dev->name, (int) dev->handle); + + add_device_to_class(dev, "virtual"); + + if (dev->parent == NULL) { + register_child_verbose(dev, "cloning myself ;-)", "clone", + "virtual&test1", 10); + } else if (str_cmp(dev->name, "clone") == 0) { + register_child_verbose(dev, "run by the same task", "child", + "virtual&test1&child", 10); + } + + printf(NAME ": device `%s' accepted.\n", dev->name); + + return EOK; +} + +int main(int argc, char *argv[]) +{ + printf(NAME ": HelenOS test1 virtual device driver\n"); + return driver_main(&the_driver); +} + + Index: uspace/drv/test1/test1.ma =================================================================== --- uspace/drv/test1/test1.ma (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/test1/test1.ma (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,2 @@ +10 virtual&test1 +10 virtual&test1&child Index: uspace/drv/test2/Makefile =================================================================== --- uspace/drv/test2/Makefile (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/test2/Makefile (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2010 Vojtech Horky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +LIBS = $(LIBDRV_PREFIX)/libdrv.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +BINARY = test2 + +SOURCES = \ + test2.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/test2/test2.c =================================================================== --- uspace/drv/test2/test2.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/test2/test2.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @file + */ + +#include +#include +#include +#include +#include + +#define NAME "test2" + +static int add_device(device_t *dev); + +static driver_ops_t driver_ops = { + .add_device = &add_device +}; + +static driver_t the_driver = { + .name = NAME, + .driver_ops = &driver_ops +}; + +/** Register child and inform user about it. + * + * @param parent Parent device. + * @param message Message for the user. + * @param name Device name. + * @param match_id Device match id. + * @param score Device match score. + */ +static void register_child_verbose(device_t *parent, const char *message, + const char *name, const char *match_id, int match_score) +{ + printf(NAME ": registering child device `%s': %s.\n", + name, message); + + int rc = child_device_register_wrapper(parent, name, + match_id, match_score); + + if (rc == EOK) { + printf(NAME ": registered child device `%s'.\n", name); + } else { + printf(NAME ": failed to register child `%s' (%s).\n", + name, str_error(rc)); + } +} + +/** Add child devices after some sleep. + * + * @param arg Parent device structure (device_t *). + * @return Always EOK. + */ +static int postponed_birth(void *arg) +{ + device_t *dev = (device_t *) arg; + + async_usleep(1000); + + register_child_verbose(dev, "child driven by the same task", + "child", "virtual&test2", 10); + register_child_verbose(dev, "child driven by test1", + "test1", "virtual&test1", 10); + + add_device_to_class(dev, "virtual"); + + return EOK; +} + + +static int add_device(device_t *dev) +{ + printf(NAME ": add_device(name=\"%s\", handle=%d)\n", + dev->name, (int) dev->handle); + + if (dev->parent == NULL) { + fid_t postpone = fibril_create(postponed_birth, dev); + fibril_add_ready(postpone); + } else { + register_child_verbose(dev, "child without available driver", + "ERROR", "non-existent.match.id", 10); + } + + return EOK; +} + +int main(int argc, char *argv[]) +{ + printf(NAME ": HelenOS test2 virtual device driver\n"); + return driver_main(&the_driver); +} + + Index: uspace/drv/test2/test2.ma =================================================================== --- uspace/drv/test2/test2.ma (revision 4006447f76b2458440272197d0fda72d4caecbe8) +++ uspace/drv/test2/test2.ma (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -0,0 +1,1 @@ +10 virtual&test2 Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/lib/c/generic/devman.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -116,7 +116,8 @@ { 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; } Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/lib/drv/generic/driver.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -165,4 +165,6 @@ 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,4 +174,6 @@ 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,4 +381,57 @@ } +/** 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) { Index: uspace/lib/drv/include/driver.h =================================================================== --- uspace/lib/drv/include/driver.h (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/lib/drv/include/driver.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -199,4 +199,5 @@ int child_device_register(device_t *, device_t *); +int child_device_register_wrapper(device_t *, const char *, const char *, int); Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/srv/devman/devman.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -508,6 +508,4 @@ /** 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,18 +516,75 @@ 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,6 +600,5 @@ 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,9 +607,4 @@ */ pass_devices_to_driver(driver, tree); - - /* Change driver's state to running. */ - driver->state = DRIVER_RUNNING; - - fibril_mutex_unlock(&driver->driver_mutex); } @@ -629,4 +678,5 @@ } +static FIBRIL_MUTEX_INITIALIZE(add_device_guard); /** Pass a device to running driver. @@ -637,5 +687,12 @@ 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,6 +700,13 @@ /* 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,7 +716,10 @@ /* 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,4 +734,6 @@ } + node->passed_to_driver = true; + return; } @@ -692,12 +761,15 @@ 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,5 +933,4 @@ node->name = dev_name; if (!set_dev_path(node, parent)) { - fibril_rwlock_write_unlock(&tree->rwlock); return false; } @@ -1083,6 +1154,8 @@ 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; } Index: uspace/srv/devman/devman.h =================================================================== --- uspace/srv/devman/devman.h (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/srv/devman/devman.h (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -168,4 +168,9 @@ */ link_t devmap_link; + + /** + * Whether this device was already passed to the driver. + */ + bool passed_to_driver; }; Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/srv/devman/main.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -197,4 +197,11 @@ } +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,10 +244,25 @@ 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,5 +319,5 @@ 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); } Index: uspace/srv/devman/match.c =================================================================== --- uspace/srv/devman/match.c (revision b38dfd8028d6cec3849c0eccfe3dff997f218265) +++ uspace/srv/devman/match.c (revision 4006447f76b2458440272197d0fda72d4caecbe8) @@ -35,4 +35,26 @@ #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,63 +65,28 @@ 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; }