Index: HelenOS.config =================================================================== --- HelenOS.config (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ HelenOS.config (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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: Makefile =================================================================== --- Makefile (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ Makefile (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -41,5 +41,5 @@ CONFIG_HEADER = config.h -.PHONY: all precheck cscope autotool config_default config distclean clean +.PHONY: all precheck cscope autotool config_auto config_default config distclean clean all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) @@ -66,5 +66,9 @@ config_default: $(CONFIG_RULES) - $(CONFIG) $< default +ifeq ($(HANDS_OFF),y) + $(CONFIG) $< hands-off $(PROFILE) +else + $(CONFIG) $< default $(PROFILE) +endif config: $(CONFIG_RULES) Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ boot/Makefile.common (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -111,4 +111,7 @@ RD_DRVS = \ root \ + rootvirt \ + test1 \ + test2 \ vhc Index: boot/arch/amd64/Makefile.inc =================================================================== --- boot/arch/amd64/Makefile.inc (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ boot/arch/amd64/Makefile.inc (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -37,5 +37,5 @@ RD_DRVS += \ - rootia32 \ + rootpc \ pciintel \ isa \ Index: tools/config.py =================================================================== --- tools/config.py (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ tools/config.py (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -47,5 +47,5 @@ def read_config(fname, config): - "Read saved values from last configuration run" + "Read saved values from last configuration run or a preset file" inf = open(fname, 'r') @@ -218,9 +218,9 @@ # and verify that all variables have a value (previously specified or inferred). # -# @param config Configuration to work on -# @param rules Rules -# -# @return True if configuration is complete and valid, False -# otherwise. +# @param config Configuration to work on +# @param rules Rules +# +# @return True if configuration is complete and valid, False +# otherwise. # def infer_verify_choices(config, rules): @@ -229,5 +229,5 @@ for rule in rules: varname, vartype, name, choices, cond = rule - + if cond and (not check_condition(cond, config, rules)): continue @@ -237,12 +237,18 @@ else: value = config[varname] - - if not rule_value_is_valid(rule, value): + + if not validate_rule_value(rule, value): value = None - - default = rule_get_default(rule) - if default != None: + + default = get_default_rule(rule) + + # + # If we don't have a value but we do have + # a default, use it. + # + if value == None and default != None: + value = default config[varname] = default - + if not varname in config: return False @@ -251,9 +257,9 @@ ## Get default value from a rule. -def rule_get_default(rule): +def get_default_rule(rule): varname, vartype, name, choices, cond = rule - + default = None - + if vartype == 'choice': # If there is just one option, use it @@ -270,19 +276,19 @@ else: raise RuntimeError("Unknown variable type: %s" % vartype) - + return default ## Get option from a rule. # -# @param rule Rule for a variable -# @param value Current value of the variable +# @param rule Rule for a variable +# @param value Current value of the variable # # @return Option (string) to ask or None which means not to ask. # -def rule_get_option(rule, value): +def get_rule_option(rule, value): varname, vartype, name, choices, cond = rule - + option = None - + if vartype == 'choice': # If there is just one option, don't ask @@ -302,20 +308,20 @@ else: raise RuntimeError("Unknown variable type: %s" % vartype) - + return option ## Check if variable value is valid. # -# @param rule Rule for the variable -# @param value Value of the variable -# -# @return True if valid, False if not valid. -# -def rule_value_is_valid(rule, value): +# @param rule Rule for the variable +# @param value Value of the variable +# +# @return True if valid, False if not valid. +# +def validate_rule_value(rule, value): varname, vartype, name, choices, cond = rule if value == None: return True - + if vartype == 'choice': if not value in [choice[0] for choice in choices]: @@ -335,5 +341,5 @@ else: raise RuntimeError("Unknown variable type: %s" % vartype) - + return True @@ -413,7 +419,7 @@ return list -## Choose a profile and load configuration presets. -# -def load_presets(root, fname, screen, config): +## Ask user to choose a configuration profile. +# +def choose_profile(root, fname, screen, config): options = [] opt2path = {} @@ -436,10 +442,10 @@ subprofile = True options.append("%s (%s)" % (name, subname)) - opt2path[cnt] = (canon, subcanon) + opt2path[cnt] = [name, subname] cnt += 1 if not subprofile: options.append(name) - opt2path[cnt] = (canon, None) + opt2path[cnt] = [name] cnt += 1 @@ -449,9 +455,36 @@ return None - read_config(opt2path[value][0], config) - if opt2path[value][1] != None: - read_config(opt2path[value][1], config) + return opt2path[value] + +## Read presets from a configuration profile. +# +# @param profile Profile to load from (a list of string components) +# @param config Output configuration +# +def read_presets(profile, config): + path = os.path.join(PRESETS_DIR, profile[0], MAKEFILE) + read_config(path, config) + + if len(profile) > 1: + path = os.path.join(PRESETS_DIR, profile[0], profile[1], MAKEFILE) + read_config(path, config) + +## Parse profile name (relative OS path) into a list of components. +# +# @param profile_name Relative path (using OS separator) +# @return List of components +# +def parse_profile_name(profile_name): + profile = [] + + head, tail = os.path.split(profile_name) + if head != '': + profile.append(head) + + profile.append(tail) + return profile def main(): + profile = None config = {} rules = [] @@ -460,13 +493,33 @@ parse_rules(RULES_FILE, rules) - # Read configuration from previous run - if os.path.exists(MAKEFILE): + # Input configuration file can be specified on command line + # otherwise configuration from previous run is used. + if len(sys.argv) >= 4: + profile = parse_profile_name(sys.argv[3]) + read_presets(profile, config) + elif os.path.exists(MAKEFILE): read_config(MAKEFILE, config) - # Default mode: only check values and regenerate configuration files + # Default mode: check values and regenerate configuration files if (len(sys.argv) >= 3) and (sys.argv[2] == 'default'): if (infer_verify_choices(config, rules)): create_output(MAKEFILE, MACROS, config, rules) return 0 + + # Hands-off mode: check values and regenerate configuration files, + # but no interactive fallback + if (len(sys.argv) >= 3) and (sys.argv[2] == 'hands-off'): + # We deliberately test sys.argv >= 4 because we do not want + # to read implicitly any possible previous run configuration + if len(sys.argv) < 4: + sys.stderr.write("Configuration error: No presets specified\n") + return 2 + + if (infer_verify_choices(config, rules)): + create_output(MAKEFILE, MACROS, config, rules) + return 0 + + sys.stderr.write("Configuration error: The presets are ambiguous\n") + return 1 # Check mode: only check configuration @@ -507,15 +560,22 @@ value = config[varname] - if not rule_value_is_valid(rule, value): + if not validate_rule_value(rule, value): value = None - - default = rule_get_default(rule) - if default != None: + + default = get_default_rule(rule) + + # + # If we don't have a value but we do have + # a default, use it. + # + if value == None and default != None: value = default config[varname] = default - - option = rule_get_option(rule, value) + + option = get_rule_option(rule, value) if option != None: options.append(option) + else: + continue opt2row[cnt] = (varname, vartype, name, choices) @@ -539,5 +599,7 @@ if value == 0: - load_presets(PRESETS_DIR, MAKEFILE, screen, config) + profile = choose_profile(PRESETS_DIR, MAKEFILE, screen, config) + if profile != None: + read_presets(profile, config) position = 1 continue Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/Makefile (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -88,4 +88,7 @@ srv/net/net \ drv/root \ + drv/rootvirt \ + drv/test1 \ + drv/test2 \ drv/vhc @@ -111,8 +114,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/app/netecho/print_error.c =================================================================== --- uspace/app/netecho/print_error.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/app/netecho/print_error.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -164,5 +164,5 @@ case EDESTADDRREQ: fprintf(output, "Destination address required (%d) error", error_code); - case TRY_AGAIN: + case EAGAIN: fprintf(output, "Try again (%d) error", error_code); default: Index: uspace/drv/isa/isa.c =================================================================== --- uspace/drv/isa/isa.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/drv/isa/isa.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/drv/ns8250/ns8250.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/drv/pciintel/pci.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/drv/root/root.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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; } @@ -184,4 +173,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 07b9203e8dd598d81634d43931691038db19c2b2) +++ (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 07b9203e8dd598d81634d43931691038db19c2b2) +++ (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 07b9203e8dd598d81634d43931691038db19c2b2) +++ (revision ) @@ -1,1 +1,0 @@ -10 ia32 Index: uspace/drv/rootpc/Makefile =================================================================== --- uspace/drv/rootpc/Makefile (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/rootpc/Makefile (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/rootpc/rootpc.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/rootpc/rootpc.ma (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -0,0 +1,2 @@ +10 ia32 +10 amd64 Index: uspace/drv/rootvirt/Makefile =================================================================== --- uspace/drv/rootvirt/Makefile (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/rootvirt/Makefile (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/rootvirt/devices.def (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/rootvirt/rootvirt.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/rootvirt/rootvirt.ma (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -0,0 +1,1 @@ +10 rootvirt Index: uspace/drv/test1/Makefile =================================================================== --- uspace/drv/test1/Makefile (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/test1/Makefile (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/test1/test1.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/test1/test1.ma (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -0,0 +1,2 @@ +10 virtual&test1 +10 virtual&test1&child Index: uspace/drv/test2/Makefile =================================================================== --- uspace/drv/test2/Makefile (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/test2/Makefile (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/test2/test2.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 fe2333da175feb0b278049830a4be0cfc3e3baeb) +++ uspace/drv/test2/test2.ma (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -0,0 +1,1 @@ +10 virtual&test2 Index: uspace/lib/c/generic/adt/char_map.c =================================================================== --- uspace/lib/c/generic/adt/char_map.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/lib/c/generic/adt/char_map.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -90,8 +90,8 @@ } - map->items[map->next]->c = * identifier; - ++ identifier; - ++ map->next; - if ((length > 1) || ((length == 0) && (*identifier))) { + map->items[map->next]->c = *identifier; + identifier++; + map->next++; + if ((length > 1) || ((length == 0) && *identifier)) { map->items[map->next - 1]->value = CHAR_MAP_NULL; return char_map_add_item(map->items[map->next - 1], identifier, @@ -142,14 +142,13 @@ const int value) { - if (char_map_is_valid(map) && (identifier) && - ((length) || (*identifier))) { + if (char_map_is_valid(map) && identifier && (length || *identifier)) { int index; - for (index = 0; index < map->next; ++ index) { + for (index = 0; index < map->next; index++) { if (map->items[index]->c != *identifier) continue; - ++ identifier; - if((length > 1) || ((length == 0) && (*identifier))) { + identifier++; + if((length > 1) || ((length == 0) && *identifier)) { return char_map_add(map->items[index], identifier, length ? length - 1 : 0, value); @@ -178,5 +177,5 @@ map->magic = 0; - for (index = 0; index < map->next; ++index) + for (index = 0; index < map->next; index++) char_map_destroy(map->items[index]); @@ -207,10 +206,10 @@ return NULL; - if (length || (*identifier)) { + if (length || *identifier) { int index; - for (index = 0; index < map->next; ++index) { + for (index = 0; index < map->next; index++) { if (map->items[index]->c == *identifier) { - ++identifier; + identifier++; if (length == 1) return map->items[index]; Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/lib/c/generic/devman.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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/c/include/adt/generic_field.h =================================================================== --- uspace/lib/c/include/adt/generic_field.h (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/lib/c/include/adt/generic_field.h (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -91,5 +91,5 @@ } \ field->items[field->next] = value; \ - ++field->next; \ + field->next++; \ field->items[field->next] = NULL; \ return field->next - 1; \ @@ -108,5 +108,5 @@ int index; \ field->magic = 0; \ - for (index = 0; index < field->next; ++ index) { \ + for (index = 0; index < field->next; index++) { \ if (field->items[index]) \ free(field->items[index]); \ Index: uspace/lib/c/include/errno.h =================================================================== --- uspace/lib/c/include/errno.h (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/lib/c/include/errno.h (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -83,8 +83,6 @@ #define ENOTCONN (-10057) -/** The requested operation was not performed. - * Try again later. - */ -#define TRY_AGAIN (-11002) +/** The requested operation was not performed. Try again later. */ +#define EAGAIN (-11002) /** No data. Index: uspace/lib/c/include/ipc/vfs.h =================================================================== --- uspace/lib/c/include/ipc/vfs.h (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/lib/c/include/ipc/vfs.h (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -36,6 +36,7 @@ #define LIBC_IPC_VFS_H_ +#include #include -#include +#include #define FS_NAME_MAXLEN 20 @@ -55,4 +56,6 @@ /** Unique identifier of the fs. */ char name[FS_NAME_MAXLEN + 1]; + bool concurrent_read_write; + bool write_retains_size; } vfs_info_t; Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/lib/drv/generic/driver.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -381,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 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/lib/drv/include/driver.h (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/devman/devman.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -516,6 +516,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. */ @@ -526,18 +524,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); } @@ -553,6 +608,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); /* @@ -561,9 +615,4 @@ */ pass_devices_to_driver(driver, tree); - - /* Change driver's state to running. */ - driver->state = DRIVER_RUNNING; - - fibril_mutex_unlock(&driver->driver_mutex); } @@ -637,4 +686,5 @@ } +static FIBRIL_MUTEX_INITIALIZE(add_device_guard); /** Pass a device to running driver. @@ -645,5 +695,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; @@ -657,4 +714,5 @@ parent_handle = 0; } + aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, node->handle, parent_handle, &answer); @@ -666,7 +724,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: @@ -681,4 +742,6 @@ } + node->passed_to_driver = true; + return; } @@ -706,12 +769,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); @@ -875,5 +941,4 @@ node->name = dev_name; if (!set_dev_path(node, parent)) { - fibril_rwlock_write_unlock(&tree->rwlock); return false; } @@ -1097,6 +1162,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 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/devman/devman.h (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/devman/main.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -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 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/devman/match.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -46,5 +46,5 @@ if (str_cmp(driver->id, device->id) == 0) { /* - * The strings matches, return their score multiplied. + * The strings match, return the product of their scores. */ return driver->score * device->score; @@ -66,5 +66,5 @@ /* - * Go through all pairs, return the highest score obtainetd. + * Go through all pairs, return the highest score obtained. */ int highest_score = 0; Index: uspace/srv/fs/devfs/devfs.c =================================================================== --- uspace/srv/fs/devfs/devfs.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/fs/devfs/devfs.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -53,4 +53,6 @@ static vfs_info_t devfs_vfs_info = { .name = NAME, + .concurrent_read_write = false, + .write_retains_size = false, }; Index: uspace/srv/fs/fat/fat.c =================================================================== --- uspace/srv/fs/fat/fat.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/fs/fat/fat.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -52,4 +52,6 @@ vfs_info_t fat_vfs_info = { .name = NAME, + .concurrent_read_write = false, + .write_retains_size = false, }; Index: uspace/srv/fs/tmpfs/tmpfs.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/fs/tmpfs/tmpfs.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -57,4 +57,6 @@ vfs_info_t tmpfs_vfs_info = { .name = NAME, + .concurrent_read_write = false, + .write_retains_size = false, }; Index: uspace/srv/net/il/arp/arp.c =================================================================== --- uspace/srv/net/il/arp/arp.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/net/il/arp/arp.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -72,4 +72,7 @@ #define NAME "arp" +/** Number of microseconds to wait for an ARP reply. */ +#define ARP_TRANS_WAIT 1000000 + /** ARP global data. */ arp_globals_t arp_globals; @@ -77,5 +80,27 @@ DEVICE_MAP_IMPLEMENT(arp_cache, arp_device_t); INT_MAP_IMPLEMENT(arp_protos, arp_proto_t); -GENERIC_CHAR_MAP_IMPLEMENT(arp_addr, measured_string_t); +GENERIC_CHAR_MAP_IMPLEMENT(arp_addr, arp_trans_t); + +static void arp_clear_trans(arp_trans_t *trans) +{ + if (trans->hw_addr) { + free(trans->hw_addr); + trans->hw_addr = NULL; + } + fibril_condvar_broadcast(&trans->cv); +} + +static void arp_clear_addr(arp_addr_t *addresses) +{ + int count; + arp_trans_t *trans; + + for (count = arp_addr_count(addresses) - 1; count >= 0; count--) { + trans = arp_addr_items_get_index(&addresses->values, count); + if (trans) + arp_clear_trans(trans); + } +} + /** Clears the device specific data. @@ -96,4 +121,5 @@ if (proto->addr_data) free(proto->addr_data); + arp_clear_addr(&proto->addresses); arp_addr_destroy(&proto->addresses); } @@ -107,5 +133,5 @@ arp_device_t *device; - fibril_rwlock_write_lock(&arp_globals.lock); + fibril_mutex_lock(&arp_globals.lock); for (count = arp_cache_count(&arp_globals.cache) - 1; count >= 0; count--) { @@ -120,5 +146,5 @@ } arp_cache_clear(&arp_globals.cache); - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); printf("Cache cleaned\n"); return EOK; @@ -130,18 +156,22 @@ arp_device_t *device; arp_proto_t *proto; - - fibril_rwlock_write_lock(&arp_globals.lock); + arp_trans_t *trans; + + fibril_mutex_lock(&arp_globals.lock); device = arp_cache_find(&arp_globals.cache, device_id); if (!device) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return ENOENT; } proto = arp_protos_find(&device->protos, protocol); if (!proto) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return ENOENT; } + trans = arp_addr_find(&proto->addresses, address->value, address->length); + if (trans) + arp_clear_trans(trans); arp_addr_exclude(&proto->addresses, address->value, address->length); - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return EOK; } @@ -152,13 +182,13 @@ arp_device_t *device; - fibril_rwlock_write_lock(&arp_globals.lock); + fibril_mutex_lock(&arp_globals.lock); device = arp_cache_find(&arp_globals.cache, device_id); if (!device) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return ENOENT; } arp_clear_device(device); printf("Device %d cleared\n", device_id); - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return EOK; } @@ -221,5 +251,5 @@ int rc; - fibril_rwlock_write_lock(&arp_globals.lock); + fibril_mutex_lock(&arp_globals.lock); /* An existing device? */ @@ -229,5 +259,5 @@ if (device->service != service) { printf("Device %d already exists\n", device->device_id); - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return EEXIST; } @@ -241,5 +271,5 @@ rc = arp_proto_create(&proto, protocol, address); if (rc != EOK) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return rc; } @@ -247,5 +277,5 @@ proto); if (index < 0) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); free(proto); return index; @@ -262,5 +292,5 @@ device = (arp_device_t *) malloc(sizeof(arp_device_t)); if (!device) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return ENOMEM; } @@ -269,5 +299,5 @@ rc = arp_protos_initialize(&device->protos); if (rc != EOK) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); free(device); return rc; @@ -275,5 +305,5 @@ rc = arp_proto_create(&proto, protocol, address); if (rc != EOK) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); free(device); return rc; @@ -281,5 +311,5 @@ index = arp_protos_add(&device->protos, proto->service, proto); if (index < 0) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); arp_protos_destroy(&device->protos); free(device); @@ -293,5 +323,5 @@ arp_globals.client_connection); if (device->phone < 0) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); arp_protos_destroy(&device->protos); free(device); @@ -303,5 +333,5 @@ &device->packet_dimension); if (rc != EOK) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); arp_protos_destroy(&device->protos); free(device); @@ -313,5 +343,5 @@ &device->addr_data); if (rc != EOK) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); arp_protos_destroy(&device->protos); free(device); @@ -323,5 +353,5 @@ &device->broadcast_addr, &device->broadcast_data); if (rc != EOK) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); free(device->addr); free(device->addr_data); @@ -334,5 +364,5 @@ device); if (rc != EOK) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); free(device->addr); free(device->addr_data); @@ -347,5 +377,5 @@ device->service, protocol); } - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return EOK; @@ -363,9 +393,9 @@ int rc; - fibril_rwlock_initialize(&arp_globals.lock); - fibril_rwlock_write_lock(&arp_globals.lock); + fibril_mutex_initialize(&arp_globals.lock); + fibril_mutex_lock(&arp_globals.lock); arp_globals.client_connection = client_connection; rc = arp_cache_initialize(&arp_globals.cache); - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return rc; @@ -383,12 +413,12 @@ arp_device_t *device; - fibril_rwlock_write_lock(&arp_globals.lock); + fibril_mutex_lock(&arp_globals.lock); device = arp_cache_find(&arp_globals.cache, device_id); if (!device) { - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return ENOENT; } device->packet_dimension.content = mtu; - fibril_rwlock_write_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); printf("arp - device %d changed mtu to %zu\n\n", device_id, mtu); return EOK; @@ -421,5 +451,5 @@ arp_device_t *device; arp_proto_t *proto; - measured_string_t *hw_source; + arp_trans_t *trans; uint8_t *src_hw; uint8_t *src_proto; @@ -452,13 +482,13 @@ des_hw = src_proto + header->protocol_length; des_proto = des_hw + header->hardware_length; - hw_source = arp_addr_find(&proto->addresses, (char *) src_proto, + trans = arp_addr_find(&proto->addresses, (char *) src_proto, CONVERT_SIZE(uint8_t, char, header->protocol_length)); /* Exists? */ - if (hw_source) { - if (hw_source->length != CONVERT_SIZE(uint8_t, char, + if (trans && trans->hw_addr) { + if (trans->hw_addr->length != CONVERT_SIZE(uint8_t, char, header->hardware_length)) { return EINVAL; } - memcpy(hw_source->value, src_hw, hw_source->length); + memcpy(trans->hw_addr->value, src_hw, trans->hw_addr->length); } /* Is my protocol address? */ @@ -470,16 +500,27 @@ proto->addr->length)) { /* Not already updated? */ - if (!hw_source) { - hw_source = measured_string_create_bulk((char *) src_hw, - CONVERT_SIZE(uint8_t, char, + if (!trans) { + trans = (arp_trans_t *) malloc(sizeof(arp_trans_t)); + if (!trans) + return ENOMEM; + trans->hw_addr = NULL; + fibril_condvar_initialize(&trans->cv); + rc = arp_addr_add(&proto->addresses, (char *) src_proto, + CONVERT_SIZE(uint8_t, char, header->protocol_length), + trans); + if (rc != EOK) { + /* The generic char map has already freed trans! */ + return rc; + } + } + if (!trans->hw_addr) { + trans->hw_addr = measured_string_create_bulk( + (char *) src_hw, CONVERT_SIZE(uint8_t, char, header->hardware_length)); - if (!hw_source) + if (!trans->hw_addr) return ENOMEM; - rc = arp_addr_add(&proto->addresses, (char *) src_proto, - CONVERT_SIZE(uint8_t, char, - header->protocol_length), hw_source); - if (rc != EOK) - return rc; + /* Notify the fibrils that wait for the translation. */ + fibril_condvar_broadcast(&trans->cv); } if (ntohs(header->operation) == ARPOP_REQUEST) { @@ -490,5 +531,5 @@ memcpy(src_hw, device->addr->value, device->packet_dimension.addr_len); - memcpy(des_hw, hw_source->value, + memcpy(des_hw, trans->hw_addr->value, header->hardware_length); @@ -516,36 +557,51 @@ * @param[in] protocol The protocol service. * @param[in] target The target protocol address. - * @return The hardware address of the target. - * @return NULL if the target parameter is NULL. - * @return NULL if the device is not found. - * @return NULL if the device packet is too small to send a - * request. - * @return NULL if the hardware address is not found in the cache. - */ -static measured_string_t * + * @param[out] translation Where the hardware address of the target is stored. + * @return EOK on success. + * @return EAGAIN if the caller should try again. + * @return Other error codes in case of error. + */ +static int arp_translate_message(device_id_t device_id, services_t protocol, - measured_string_t *target) + measured_string_t *target, measured_string_t **translation) { arp_device_t *device; arp_proto_t *proto; - measured_string_t *addr; + arp_trans_t *trans; size_t length; packet_t *packet; arp_header_t *header; - - if (!target) - return NULL; + bool retry = false; + int rc; + +restart: + if (!target || !translation) + return EBADMEM; device = arp_cache_find(&arp_globals.cache, device_id); if (!device) - return NULL; + return ENOENT; proto = arp_protos_find(&device->protos, protocol); if (!proto || (proto->addr->length != target->length)) - return NULL; - - addr = arp_addr_find(&proto->addresses, target->value, target->length); - if (addr) - return addr; + return ENOENT; + + trans = arp_addr_find(&proto->addresses, target->value, target->length); + if (trans) { + if (trans->hw_addr) { + *translation = trans->hw_addr; + return EOK; + } + if (retry) + return EAGAIN; + rc = fibril_condvar_wait_timeout(&trans->cv, &arp_globals.lock, + ARP_TRANS_WAIT); + if (rc == ETIMEOUT) + return ENOENT; + retry = true; + goto restart; + } + if (retry) + return EAGAIN; /* ARP packet content size = header + (address + translation) * 2 */ @@ -553,5 +609,5 @@ CONVERT_SIZE(char, uint8_t, device->addr->length)); if (length > device->packet_dimension.content) - return NULL; + return ELIMIT; packet = packet_get_4_remote(arp_globals.net_phone, @@ -559,10 +615,10 @@ length, device->packet_dimension.suffix); if (!packet) - return NULL; + return ENOMEM; header = (arp_header_t *) packet_suffix(packet, length); if (!header) { pq_release_remote(arp_globals.net_phone, packet_get_id(packet)); - return NULL; + return ENOMEM; } @@ -583,13 +639,32 @@ memcpy(((uint8_t *) header) + length, target->value, target->length); - if (packet_set_addr(packet, (uint8_t *) device->addr->value, + rc = packet_set_addr(packet, (uint8_t *) device->addr->value, (uint8_t *) device->broadcast_addr->value, - CONVERT_SIZE(char, uint8_t, device->addr->length)) != EOK) { + CONVERT_SIZE(char, uint8_t, device->addr->length)); + if (rc != EOK) { pq_release_remote(arp_globals.net_phone, packet_get_id(packet)); - return NULL; + return rc; } nil_send_msg(device->phone, device_id, packet, SERVICE_ARP); - return NULL; + + trans = (arp_trans_t *) malloc(sizeof(arp_trans_t)); + if (!trans) + return ENOMEM; + trans->hw_addr = NULL; + fibril_condvar_initialize(&trans->cv); + rc = arp_addr_add(&proto->addresses, target->value, target->length, + trans); + if (rc != EOK) { + /* The generic char map has already freed trans! */ + return rc; + } + + rc = fibril_condvar_wait_timeout(&trans->cv, &arp_globals.lock, + ARP_TRANS_WAIT); + if (rc == ETIMEOUT) + return ENOENT; + retry = true; + goto restart; } @@ -642,15 +717,19 @@ return rc; - fibril_rwlock_read_lock(&arp_globals.lock); - translation = arp_translate_message(IPC_GET_DEVICE(call), - IPC_GET_SERVICE(call), address); + fibril_mutex_lock(&arp_globals.lock); + rc = arp_translate_message(IPC_GET_DEVICE(call), + IPC_GET_SERVICE(call), address, &translation); free(address); free(data); + if (rc != EOK) { + fibril_mutex_unlock(&arp_globals.lock); + return rc; + } if (!translation) { - fibril_rwlock_read_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return ENOENT; } rc = measured_strings_reply(translation, 1); - fibril_rwlock_read_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return rc; @@ -682,5 +761,5 @@ return rc; - fibril_rwlock_read_lock(&arp_globals.lock); + fibril_mutex_lock(&arp_globals.lock); do { next = pq_detach(packet); @@ -692,5 +771,5 @@ packet = next; } while (packet); - fibril_rwlock_read_unlock(&arp_globals.lock); + fibril_mutex_unlock(&arp_globals.lock); return EOK; Index: uspace/srv/net/il/arp/arp.h =================================================================== --- uspace/srv/net/il/arp/arp.h (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/net/il/arp/arp.h (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -65,4 +65,9 @@ typedef struct arp_proto arp_proto_t; +/** Type definition of the ARP address translation record. + * @see arp_trans + */ +typedef struct arp_trans arp_trans_t; + /** ARP address map. * @@ -70,5 +75,5 @@ * @see generic_char_map.h */ -GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t); +GENERIC_CHAR_MAP_DECLARE(arp_addr, arp_trans_t); /** ARP address cache. @@ -89,9 +94,9 @@ struct arp_device { /** Actual device hardware address. */ - measured_string_t * addr; + measured_string_t *addr; /** Actual device hardware address data. */ char *addr_data; /** Broadcast device hardware address. */ - measured_string_t * broadcast_addr; + measured_string_t *broadcast_addr; /** Broadcast device hardware address data. */ char *broadcast_data; @@ -129,5 +134,5 @@ int net_phone; /** Safety lock. */ - fibril_rwlock_t lock; + fibril_mutex_t lock; }; @@ -144,6 +149,18 @@ }; +/** ARP address translation record. */ +struct arp_trans { + /** + * Hardware address for the translation. NULL denotes an incomplete + * record with possible waiters. + */ + measured_string_t *hw_addr; + /** Condition variable used for waiting for completion of the record. */ + fibril_condvar_t cv; +}; + #endif /** @} */ + Index: uspace/srv/vfs/vfs.h =================================================================== --- uspace/srv/vfs/vfs.h (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/vfs/vfs.h (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -172,4 +172,5 @@ extern fs_handle_t fs_name_to_handle(char *, bool); +extern vfs_info_t *fs_handle_to_info(fs_handle_t); extern int vfs_lookup_internal(char *, int, vfs_lookup_res_t *, Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/vfs/vfs_ops.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -781,4 +781,5 @@ static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read) { + vfs_info_t *vi; /* @@ -807,9 +808,13 @@ fibril_mutex_lock(&file->lock); + vi = fs_handle_to_info(file->node->fs_handle); + assert(vi); + /* * Lock the file's node so that no other client can read/write to it at - * the same time. - */ - if (read) + * the same time unless the FS supports concurrent reads/writes and its + * write implementation does not modify the file size. + */ + if (read || (vi->concurrent_read_write && vi->write_retains_size)) fibril_rwlock_read_lock(&file->node->contents_rwlock); else @@ -857,5 +862,5 @@ /* Unlock the VFS node. */ - if (read) + if (read || (vi->concurrent_read_write && vi->write_retains_size)) fibril_rwlock_read_unlock(&file->node->contents_rwlock); else { Index: uspace/srv/vfs/vfs_register.c =================================================================== --- uspace/srv/vfs/vfs_register.c (revision 07b9203e8dd598d81634d43931691038db19c2b2) +++ uspace/srv/vfs/vfs_register.c (revision fe2333da175feb0b278049830a4be0cfc3e3baeb) @@ -333,4 +333,27 @@ } +/** Find the VFS info structure. + * + * @param handle FS handle for which the VFS info structure is sought. + * @return VFS info structure on success or NULL otherwise. + */ +vfs_info_t *fs_handle_to_info(fs_handle_t handle) +{ + vfs_info_t *info = NULL; + link_t *cur; + + fibril_mutex_lock(&fs_head_lock); + for (cur = fs_head.next; cur != &fs_head; cur = cur->next) { + fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link); + if (fs->fs_handle == handle) { + info = &fs->vfs_info; + break; + } + } + fibril_mutex_unlock(&fs_head_lock); + + return info; +} + /** * @}