Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ boot/Makefile.common (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -107,6 +107,4 @@ $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \ $(USPACE_PATH)/srv/taskmon/taskmon \ - $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \ - $(USPACE_PATH)/srv/net/netif/lo/lo \ $(USPACE_PATH)/srv/net/nil/eth/eth \ $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \ @@ -124,5 +122,7 @@ test/test1 \ test/test2 \ - test/test3 + test/test3 \ + nic/lo \ + nic/ne2k RD_DRV_CFG = @@ -202,6 +202,6 @@ NET_CFG = \ $(USPACE_PATH)/srv/net/cfg/general \ - $(USPACE_PATH)/srv/net/cfg/lo \ - $(USPACE_PATH)/srv/net/cfg/ne2k + $(USPACE_PATH)/srv/net/cfg/lo.nic \ + $(USPACE_PATH)/srv/net/cfg/ne2k.nic endif Index: kernel/arch/ia32/src/boot/boot.S =================================================================== --- kernel/arch/ia32/src/boot/boot.S (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ kernel/arch/ia32/src/boot/boot.S (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -2,4 +2,5 @@ * Copyright (c) 2001 Jakub Jermar * Copyright (c) 2005 Martin Decky + * Copyright (c) 2011 Martin Sucha * All rights reserved. * @@ -124,5 +125,5 @@ /* Map kernel and turn paging on */ pm_status $status_non_pse - call map_kernel + call map_kernel_non_pse stack_init: @@ -195,6 +196,5 @@ * */ -.global map_kernel -map_kernel: +map_kernel_non_pse: /* Paging features */ movl %cr4, %ecx Index: kernel/arch/ia32/src/smp/ap.S =================================================================== --- kernel/arch/ia32/src/smp/ap.S (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ kernel/arch/ia32/src/smp/ap.S (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -28,7 +28,7 @@ # -# -# Init code for application processors. -# +/* + * Init code for application processors. + */ #include @@ -46,7 +46,9 @@ KDATA=16 -# This piece of code is real-mode and is meant to be aligned at 4K boundary. -# The requirement for such an alignment comes from MP Specification's STARTUP IPI -# requirements. +/* + * This piece of code is real-mode and is meant to be aligned at 4K boundary. + * The requirement for such an alignment comes from MP Specification's + * STARTUP IPI requirements. + */ .align 4096 @@ -57,9 +59,11 @@ movw %ax, %ds - lgdtl ap_gdtr # initialize Global Descriptor Table register + /* initialize Global Descriptor Table register */ + lgdtl ap_gdtr + /* switch to protected mode */ movl %cr0, %eax orl $1, %eax - movl %eax, %cr0 # switch to protected mode + movl %eax, %cr0 jmpl $KTEXT, $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET @@ -70,13 +74,18 @@ movw %ax, %es movw %ax, %ss - movl $KA2PA(ctx), %eax # KA2PA((uintptr_t) &ctx) + movl $KA2PA(ctx), %eax /* KA2PA((uintptr_t) &ctx) */ movl (%eax), %esp - subl $0x80000000, %esp # KA2PA(ctx.sp) + subl $0x80000000, %esp /* KA2PA(ctx.sp) */ - call map_kernel # map kernel and turn paging on + /* + * Map kernel and turn paging on. + * We assume that when using SMP, PSE is always available + */ + call map_kernel_pse - addl $0x80000000, %esp # PA2KA(ctx.sp) + addl $0x80000000, %esp /* PA2KA(ctx.sp) */ - pushl $0 # create the first stack frame + /* create the first stack frame */ + pushl $0 movl %esp, %ebp Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -94,6 +94,4 @@ srv/hw/char/i8042 \ srv/hw/char/s3c24xx_uart \ - srv/hw/netif/ne2000 \ - srv/net/netif/lo \ srv/net/il/arp \ srv/net/il/ip \ @@ -101,4 +99,6 @@ srv/net/tl/udp \ srv/net/tl/tcp \ + srv/net/nil/eth \ + srv/net/nil/nildummy \ srv/net/net \ drv/infrastructure/root \ @@ -117,5 +117,7 @@ drv/bus/usb/usbmid \ drv/bus/usb/usbmouse \ - drv/bus/usb/vhc + drv/bus/usb/vhc \ + drv/nic/lo \ + drv/nic/ne2k ifeq ($(CONFIG_PCC),y) @@ -131,11 +133,4 @@ app/binutils endif - -## Networking -# - -DIRS += \ - srv/net/nil/eth \ - srv/net/nil/nildummy ## Platform-specific hardware support @@ -186,7 +181,7 @@ lib/softfloat \ lib/drv \ - lib/packet \ lib/fb \ lib/net \ + lib/nic \ lib/ext2 \ lib/usb \ Index: uspace/Makefile.common =================================================================== --- uspace/Makefile.common (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/Makefile.common (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -123,6 +123,6 @@ LIBDRV_PREFIX = $(LIB_PREFIX)/drv -LIBPACKET_PREFIX = $(LIB_PREFIX)/packet LIBNET_PREFIX = $(LIB_PREFIX)/net +LIBNIC_PREFIX = $(LIB_PREFIX)/nic LIBMINIX_PREFIX = $(LIB_PREFIX)/minix Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/app/init/init.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -306,4 +306,6 @@ srv_start("/srv/s3c24ts"); + spawn("/srv/net"); + spawn("/srv/fb"); spawn("/srv/input"); Index: uspace/doc/doxygroups.h =================================================================== --- uspace/doc/doxygroups.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/doc/doxygroups.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -33,16 +33,16 @@ /** - * @defgroup netif Network interface drivers - * @ingroup net - */ - - /** - * @defgroup lo Loopback Service - * @ingroup netif - */ - - /** - * @defgroup ne2000 NE2000 network interface service - * @ingroup netif + * @defgroup nic Network interface controllers + * @ingroup net + */ + + /** + * @defgroup libnic Base NIC framework library + * @ingroup nic + */ + + /** + * @defgroup nic_drivers Drivers using the NICF + * @ingroup nic */ Index: uspace/drv/bus/usb/usbhub/Makefile =================================================================== --- uspace/drv/bus/usb/usbhub/Makefile (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/drv/bus/usb/usbhub/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ # # Copyright (c) 2010 Vojtech Horky +# Copyright (c) 2011 Jan Vesely # All rights reserved. # @@ -43,7 +44,6 @@ SOURCES = \ main.c \ - utils.c \ usbhub.c \ - ports.c + port.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/bus/usb/usbhub/main.c =================================================================== --- uspace/drv/bus/usb/usbhub/main.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/drv/bus/usb/usbhub/main.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Vojtech Horky + * Copyright (c) 2011 Jan Vesely * All rights reserved. * @@ -38,7 +39,7 @@ #include #include +#include #include "usbhub.h" -#include "usbhub_private.h" /** Hub status-change endpoint description. @@ -56,5 +57,5 @@ /** - * usb hub driver operations + * USB hub driver operations * * The most important one is add_device, which is set to usb_hub_add_device. @@ -64,15 +65,10 @@ }; -/** - * hub endpoints, excluding control endpoint - */ +/** Hub endpoints, excluding control endpoint. */ static usb_endpoint_description_t *usb_hub_endpoints[] = { &hub_status_change_endpoint_description, - NULL + NULL, }; - -/** - * static usb hub driver information - */ +/** Static usb hub driver information. */ static usb_driver_t usb_hub_driver = { .name = NAME, @@ -85,5 +81,4 @@ { printf(NAME ": HelenOS USB hub driver.\n"); - usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME); @@ -94,3 +89,2 @@ * @} */ - Index: uspace/drv/bus/usb/usbhub/port.c =================================================================== --- uspace/drv/bus/usb/usbhub/port.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/bus/usb/usbhub/port.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,481 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * Copyright (c) 2011 Jan Vesely + * 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. + */ +/** @addtogroup drvusbhub + * @{ + */ +/** @file + * Hub ports functions. + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "port.h" +#include "usbhub.h" +#include "status.h" + +/** Information for fibril for device discovery. */ +struct add_device_phase1 { + usb_hub_info_t *hub; + usb_hub_port_t *port; + usb_speed_t speed; +}; + +static void usb_hub_port_removed_device(usb_hub_port_t *port, + usb_hub_info_t *hub); +static void usb_hub_port_reset_completed(usb_hub_port_t *port, + usb_port_status_t status); +static int get_port_status(usb_hub_port_t *port, usb_port_status_t *status); +static int enable_port_callback(int port_no, void *arg); +static int add_device_phase1_worker_fibril(void *arg); +static int create_add_device_fibril(usb_hub_port_t *port, usb_hub_info_t *hub, + usb_speed_t speed); + +/** + * Clear feature on hub port. + * + * @param hc Host controller telephone + * @param address Hub address + * @param port_index Port + * @param feature Feature selector + * @return Operation result + */ +int usb_hub_port_clear_feature( + usb_hub_port_t *port, usb_hub_class_feature_t feature) +{ + assert(port); + usb_device_request_setup_packet_t clear_request = { + .request_type = USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE, + .request = USB_DEVREQ_CLEAR_FEATURE, + .value = feature, + .index = port->port_number, + .length = 0, + }; + return usb_pipe_control_write(port->control_pipe, &clear_request, + sizeof(clear_request), NULL, 0); +} +/*----------------------------------------------------------------------------*/ +/** + * Clear feature on hub port. + * + * @param hc Host controller telephone + * @param address Hub address + * @param port_index Port + * @param feature Feature selector + * @return Operation result + */ +int usb_hub_port_set_feature( + usb_hub_port_t *port, usb_hub_class_feature_t feature) +{ + assert(port); + usb_device_request_setup_packet_t clear_request = { + .request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE, + .request = USB_DEVREQ_SET_FEATURE, + .index = port->port_number, + .value = feature, + .length = 0, + }; + return usb_pipe_control_write(port->control_pipe, &clear_request, + sizeof(clear_request), NULL, 0); +} +/*----------------------------------------------------------------------------*/ +void usb_hub_port_reset_fail(usb_hub_port_t *port) +{ + assert(port); + fibril_mutex_lock(&port->mutex); + port->reset_completed = true; + port->reset_okay = false; + fibril_condvar_broadcast(&port->reset_cv); + fibril_mutex_unlock(&port->mutex); +} +/*----------------------------------------------------------------------------*/ +/** + * Process interrupts on given hub port + * + * Accepts connection, over current and port reset change. + * @param hub hub representation + * @param port port number, starting from 1 + */ +void usb_hub_port_process_interrupt(usb_hub_port_t *port, usb_hub_info_t *hub) +{ + assert(port); + assert(hub); + usb_log_debug("Interrupt at port %zu\n", port->port_number); + + usb_port_status_t status; + const int opResult = get_port_status(port, &status); + if (opResult != EOK) { + usb_log_error("Failed to get port %zu status: %s.\n", + port->port_number, str_error(opResult)); + return; + } + + /* Connection change */ + if (status & USB_HUB_PORT_C_STATUS_CONNECTION) { + const bool connected = + (status & USB_HUB_PORT_STATUS_CONNECTION) != 0; + usb_log_debug("Connection change on port %zu: device %s.\n", + port->port_number, connected ? "attached" : "removed"); + + /* ACK the change */ + const int opResult = usb_hub_port_clear_feature(port, + USB_HUB_FEATURE_C_PORT_CONNECTION); + if (opResult != EOK) { + usb_log_warning("Failed to clear port-change-connection" + " flag: %s.\n", str_error(opResult)); + } + + if (connected) { + const int opResult = create_add_device_fibril(port, hub, + usb_port_speed(status)); + if (opResult != EOK) { + usb_log_error( + "Cannot handle change on port %zu: %s.\n", + port->port_number, str_error(opResult)); + } + } else { + /* If enabled change was reported leave the removal + * to that handler, it shall ACK the change too. */ + if (!(status & USB_HUB_PORT_C_STATUS_ENABLED)) { + usb_hub_port_removed_device(port, hub); + } + } + } + + /* Enable change, ports are automatically disabled on errors. */ + if (status & USB_HUB_PORT_C_STATUS_ENABLED) { + usb_log_info("Port %zu, disabled because of errors.\n", + port->port_number); + usb_hub_port_removed_device(port, hub); + const int rc = usb_hub_port_clear_feature(port, + USB_HUB_FEATURE_C_PORT_ENABLE); + if (rc != EOK) { + usb_log_error( + "Failed to clear port %zu enable change feature: " + "%s.\n", port->port_number, str_error(rc)); + } + + } + + /* Suspend change */ + if (status & USB_HUB_PORT_C_STATUS_SUSPEND) { + usb_log_error("Port %zu went to suspend state, this should" + "NOT happen as we do not support suspend state!", + port->port_number); + const int rc = usb_hub_port_clear_feature(port, + USB_HUB_FEATURE_C_PORT_SUSPEND); + if (rc != EOK) { + usb_log_error( + "Failed to clear port %zu suspend change feature: " + "%s.\n", port->port_number, str_error(rc)); + } + } + + /* Over current */ + if (status & USB_HUB_PORT_C_STATUS_OC) { + /* According to the USB specs: + * 11.13.5 Over-current Reporting and Recovery + * Hub device is responsible for putting port in power off + * mode. USB system software is responsible for powering port + * back on when the over-current condition is gone */ + const int rc = usb_hub_port_clear_feature(port, + USB_HUB_FEATURE_C_PORT_OVER_CURRENT); + if (rc != EOK) { + usb_log_error( + "Failed to clear port %zu OC change feature: %s.\n", + port->port_number, str_error(rc)); + } + if (!(status & ~USB_HUB_PORT_STATUS_OC)) { + const int rc = usb_hub_port_set_feature( + port, USB_HUB_FEATURE_PORT_POWER); + if (rc != EOK) { + usb_log_error( + "Failed to set port %zu power after OC:" + " %s.\n", port->port_number, str_error(rc)); + } + } + } + + /* Port reset, set on port reset complete. */ + if (status & USB_HUB_PORT_C_STATUS_RESET) { + usb_hub_port_reset_completed(port, status); + } + + usb_log_debug("Port %zu status 0x%08" PRIx32 "\n", + port->port_number, status); +} + +/** + * routine called when a device on port has been removed + * + * If the device on port had default address, it releases default address. + * Otherwise does not do anything, because DDF does not allow to remove device + * from it`s device tree. + * @param hub hub representation + * @param port port number, starting from 1 + */ +static void usb_hub_port_removed_device(usb_hub_port_t *port, + usb_hub_info_t *hub) +{ + assert(port); + assert(hub); + if (port->attached_device.address >= 0) { + fibril_mutex_lock(&port->mutex); + port->attached_device.address = -1; + port->attached_device.handle = 0; + fibril_mutex_unlock(&port->mutex); + usb_log_info("Removed device on port %zu.\n", + port->port_number); + } else { + usb_log_warning( + "Device on port %zu removed before being registered.\n", + port->port_number); + + /* + * Device was removed before port reset completed. + * We will announce a failed port reset to unblock the + * port reset callback from new device wrapper. + */ + usb_hub_port_reset_fail(port); + } +} + +/** + * Process port reset change + * + * After this change port should be enabled, unless some problem occurred. + * This functions triggers second phase of enabling new device. + * @param hub + * @param port + * @param status + */ +static void usb_hub_port_reset_completed(usb_hub_port_t *port, + usb_port_status_t status) +{ + assert(port); + fibril_mutex_lock(&port->mutex); + /* Finalize device adding. */ + port->reset_completed = true; + port->reset_okay = (status & USB_HUB_PORT_STATUS_ENABLED) != 0; + + if (port->reset_okay) { + usb_log_debug("Port %zu reset complete.\n", port->port_number); + } else { + usb_log_warning( + "Port %zu reset complete but port not enabled.\n", + port->port_number); + } + fibril_condvar_broadcast(&port->reset_cv); + fibril_mutex_unlock(&port->mutex); + + /* Clear the port reset change. */ + int rc = usb_hub_port_clear_feature(port, USB_HUB_FEATURE_C_PORT_RESET); + if (rc != EOK) { + usb_log_error( + "Failed to clear port %zu reset change feature: %s.\n", + port->port_number, str_error(rc)); + } +} +/*----------------------------------------------------------------------------*/ +/** Retrieve port status. + * + * @param[in] ctrl_pipe Control pipe to use. + * @param[in] port Port number (starting at 1). + * @param[out] status Where to store the port status. + * @return Error code. + */ +static int get_port_status(usb_hub_port_t *port, usb_port_status_t *status) +{ + assert(port); + /* USB hub specific GET_PORT_STATUS request. See USB Spec 11.16.2.6 + * Generic GET_STATUS request cannot be used because of the difference + * in status data size (2B vs. 4B)*/ + const usb_device_request_setup_packet_t request = { + .request_type = USB_HUB_REQ_TYPE_GET_PORT_STATUS, + .request = USB_HUB_REQUEST_GET_STATUS, + .value = 0, + .index = port->port_number, + .length = sizeof(usb_port_status_t), + }; + size_t recv_size; + usb_port_status_t status_tmp; + + const int rc = usb_pipe_control_read(port->control_pipe, + &request, sizeof(usb_device_request_setup_packet_t), + &status_tmp, sizeof(status_tmp), &recv_size); + if (rc != EOK) { + return rc; + } + + if (recv_size != sizeof (status_tmp)) { + return ELIMIT; + } + + if (status != NULL) { + *status = status_tmp; + } + + return EOK; +} +/*----------------------------------------------------------------------------*/ +/** Callback for enabling a specific port. + * + * We wait on a CV until port is reseted. + * That is announced via change on interrupt pipe. + * + * @param port_no Port number (starting at 1). + * @param arg Custom argument, points to @c usb_hub_info_t. + * @return Error code. + */ +static int enable_port_callback(int port_no, void *arg) +{ + usb_hub_port_t *port = arg; + const int rc = + usb_hub_port_set_feature(port, USB_HUB_FEATURE_PORT_RESET); + if (rc != EOK) { + usb_log_warning("Port reset failed: %s.\n", str_error(rc)); + return rc; + } + + /* + * Wait until reset completes. + */ + fibril_mutex_lock(&port->mutex); + while (!port->reset_completed) { + fibril_condvar_wait(&port->reset_cv, &port->mutex); + } + fibril_mutex_unlock(&port->mutex); + + if (port->reset_okay) { + return EOK; + } else { + return ESTALL; + } +} + +/** Fibril for adding a new device. + * + * Separate fibril is needed because the port reset completion is announced + * via interrupt pipe and thus we cannot block here. + * + * @param arg Pointer to struct add_device_phase1. + * @return 0 Always. + */ +static int add_device_phase1_worker_fibril(void *arg) +{ + struct add_device_phase1 *data = arg; + assert(data); + + usb_address_t new_address; + devman_handle_t child_handle; + + const int rc = usb_hc_new_device_wrapper(data->hub->usb_device->ddf_dev, + &data->hub->connection, data->speed, + enable_port_callback, (int) data->port->port_number, + data->port, &new_address, &child_handle, + NULL, NULL, NULL); + + if (rc != EOK) { + usb_log_error("Failed registering device on port %zu: %s.\n", + data->port->port_number, str_error(rc)); + goto leave; + } + + fibril_mutex_lock(&data->port->mutex); + data->port->attached_device.handle = child_handle; + data->port->attached_device.address = new_address; + fibril_mutex_unlock(&data->port->mutex); + + usb_log_info("Detected new device on `%s' (port %zu), " + "address %d (handle %" PRIun ").\n", + data->hub->usb_device->ddf_dev->name, data->port->port_number, + new_address, child_handle); + +leave: + fibril_mutex_lock(&data->hub->pending_ops_mutex); + assert(data->hub->pending_ops_count > 0); + --data->hub->pending_ops_count; + fibril_condvar_signal(&data->hub->pending_ops_cv); + fibril_mutex_unlock(&data->hub->pending_ops_mutex); + + free(arg); + + return EOK; +} + +/** Start device adding when connection change is detected. + * + * This fires a new fibril to complete the device addition. + * + * @param hub Hub where the change occured. + * @param port Port index (starting at 1). + * @param speed Speed of the device. + * @return Error code. + */ +static int create_add_device_fibril(usb_hub_port_t *port, usb_hub_info_t *hub, + usb_speed_t speed) +{ + assert(hub); + assert(port); + struct add_device_phase1 *data + = malloc(sizeof (struct add_device_phase1)); + if (data == NULL) { + return ENOMEM; + } + data->hub = hub; + data->port = port; + data->speed = speed; + + fibril_mutex_lock(&port->mutex); + port->reset_completed = false; + fibril_mutex_unlock(&port->mutex); + + fid_t fibril = fibril_create(add_device_phase1_worker_fibril, data); + if (fibril == 0) { + free(data); + return ENOMEM; + } + fibril_mutex_lock(&hub->pending_ops_mutex); + ++hub->pending_ops_count; + fibril_mutex_unlock(&hub->pending_ops_mutex); + fibril_add_ready(fibril); + + return EOK; +} + +/** + * @} + */ Index: uspace/drv/bus/usb/usbhub/port.h =================================================================== --- uspace/drv/bus/usb/usbhub/port.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/bus/usb/usbhub/port.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * Copyright (c) 2011 Jan Vesely + * 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. + */ +/** @addtogroup drvusbhub + * @{ + */ +/** @file + * Hub ports related functions. + */ +#ifndef DRV_USBHUB_PORT_H +#define DRV_USBHUB_PORT_H + +#include +#include +#include + +typedef struct usb_hub_info_t usb_hub_info_t; + +/** Information about single port on a hub. */ +typedef struct { + size_t port_number; + usb_pipe_t *control_pipe; + /** Mutex needed not only by CV for checking port reset. */ + fibril_mutex_t mutex; + /** CV for waiting to port reset completion. */ + fibril_condvar_t reset_cv; + /** Whether port reset is completed. + * Guarded by @c reset_mutex. + */ + bool reset_completed; + /** Whether to announce the port reset as successful. */ + bool reset_okay; + + /** Information about attached device. */ + usb_hc_attached_device_t attached_device; +} usb_hub_port_t; + +/** Initialize hub port information. + * + * @param port Port to be initialized. + */ +static inline void usb_hub_port_init(usb_hub_port_t *port, size_t port_number, + usb_pipe_t *control_pipe) +{ + assert(port); + port->attached_device.address = -1; + port->attached_device.handle = 0; + port->port_number = port_number; + port->control_pipe = control_pipe; + fibril_mutex_initialize(&port->mutex); + fibril_condvar_initialize(&port->reset_cv); +} + +void usb_hub_port_reset_fail(usb_hub_port_t *port); +void usb_hub_port_process_interrupt(usb_hub_port_t *port, usb_hub_info_t *hub); +int usb_hub_port_clear_feature( + usb_hub_port_t *port, usb_hub_class_feature_t feature); +int usb_hub_port_set_feature( + usb_hub_port_t *port, usb_hub_class_feature_t feature); + +#endif +/** + * @} + */ Index: pace/drv/bus/usb/usbhub/port_status.h =================================================================== --- uspace/drv/bus/usb/usbhub/port_status.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,360 +1,0 @@ -/* - * Copyright (c) 2010 Matus Dekanek - * 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. - */ -/** @addtogroup drvusbhub - * @{ - */ - -#ifndef HUB_PORT_STATUS_H -#define HUB_PORT_STATUS_H - -#include -#include -#include -#include "usbhub_private.h" - -/** - * structure holding port status and changes flags. - * should not be accessed directly, use supplied getter/setter methods. - * - * For more information refer to table 11-15 in - * "Universal Serial Bus Specification Revision 1.1" - * - */ -typedef uint32_t usb_port_status_t; - -/** - * structure holding hub status and changes flags. - * should not be accessed directly, use supplied getter/setter methods. - * - * For more information refer to table 11.16.2.5 in - * "Universal Serial Bus Specification Revision 1.1" - * - */ -typedef uint32_t usb_hub_status_t; - -/** - * set values in request to be it a port status request - * @param request - * @param port - */ -static inline void usb_hub_set_port_status_request( - usb_device_request_setup_packet_t *request, uint16_t port) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_GET_PORT_STATUS; - request->request = USB_HUB_REQUEST_GET_STATUS; - request->value = 0; - request->length = 4; -} - -/** - * set values in request to be it a port status request - * @param request - * @param port - */ -static inline void usb_hub_set_hub_status_request( - usb_device_request_setup_packet_t *request) { - request->index = 0; - request->request_type = USB_HUB_REQ_TYPE_GET_HUB_STATUS; - request->request = USB_HUB_REQUEST_GET_STATUS; - request->value = 0; - request->length = 4; -} - -/** - * create request for usb hub port status - * @param port - * @return - */ -static inline usb_device_request_setup_packet_t * -usb_hub_create_port_status_request(uint16_t port) { - usb_device_request_setup_packet_t *result = - malloc(sizeof (usb_device_request_setup_packet_t)); - usb_hub_set_port_status_request(result, port); - return result; -} - -/** - * set the device request to be a port feature enable request - * @param request - * @param port - * @param feature_selector - */ -static inline void usb_hub_set_enable_port_feature_request( - usb_device_request_setup_packet_t *request, uint16_t port, - uint16_t feature_selector) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_SET_FEATURE; - request->value = feature_selector; - request->length = 0; -} - -/** - * set the device request to be a port feature clear request - * @param request - * @param port - * @param feature_selector - */ -static inline void usb_hub_set_disable_port_feature_request( - usb_device_request_setup_packet_t *request, uint16_t port, - uint16_t feature_selector - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_CLEAR_FEATURE; - request->value = feature_selector; - request->length = 0; -} - -/** - * set the device request to be a port enable request - * @param request - * @param port - */ -static inline void usb_hub_set_enable_port_request( - usb_device_request_setup_packet_t *request, uint16_t port - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_SET_FEATURE; - request->value = USB_HUB_FEATURE_C_PORT_ENABLE; - request->length = 0; -} - -/** - * enable specified port - * @param port - * @return - */ -static inline usb_device_request_setup_packet_t * -usb_hub_create_enable_port_request(uint16_t port) { - usb_device_request_setup_packet_t *result = - malloc(sizeof (usb_device_request_setup_packet_t)); - usb_hub_set_enable_port_request(result, port); - return result; -} - -/** - * set the device request to be a port disable request - * @param request - * @param port - */ -static inline void usb_hub_set_disable_port_request( - usb_device_request_setup_packet_t *request, uint16_t port - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_SET_FEATURE; - request->value = USB_HUB_FEATURE_C_PORT_SUSPEND; - request->length = 0; -} - -/** - * disable specified port - * @param port - * @return - */ -static inline usb_device_request_setup_packet_t * -usb_hub_create_disable_port_request(uint16_t port) { - usb_device_request_setup_packet_t *result = - malloc(sizeof (usb_device_request_setup_packet_t)); - usb_hub_set_disable_port_request(result, port); - return result; -} - -/** - * set the device request to be a port disable request - * @param request - * @param port - */ -static inline void usb_hub_set_reset_port_request( - usb_device_request_setup_packet_t *request, uint16_t port - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_SET_FEATURE; - request->value = USB_HUB_FEATURE_PORT_RESET; - request->length = 0; -} - -/** - * disable specified port - * @param port - * @return - */ -static inline usb_device_request_setup_packet_t * -usb_hub_create_reset_port_request(uint16_t port) { - usb_device_request_setup_packet_t *result = - malloc(sizeof (usb_device_request_setup_packet_t)); - usb_hub_set_reset_port_request(result, port); - return result; -} - -/** - * set the device request to be a port disable request - * @param request - * @param port - */ -static inline void usb_hub_set_power_port_request( - usb_device_request_setup_packet_t *request, uint16_t port - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_SET_FEATURE; - request->value = USB_HUB_FEATURE_PORT_POWER; - request->length = 0; -} - -/** - * set the device request to be a port disable request - * @param request - * @param port - */ -static inline void usb_hub_unset_power_port_request( - usb_device_request_setup_packet_t *request, uint16_t port - ) { - request->index = port; - request->request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE; - request->request = USB_HUB_REQUEST_CLEAR_FEATURE; - request->value = USB_HUB_FEATURE_PORT_POWER; - request->length = 0; -} - -/** - * get i`th bit of port status - * - * @param status - * @param idx - * @return - */ -static inline bool usb_port_is_status(usb_port_status_t status, int idx) { - return (status & (1 << idx)) != 0; -} - -/** - * set i`th bit of port status - * - * @param status - * @param idx - * @param value - */ -static inline void usb_port_status_set_bit( - usb_port_status_t * status, int idx, bool value) { - (*status) = value ? - ((*status) | (1 << (idx))) : - ((*status)&(~(1 << (idx)))); -} - -/** - * get i`th bit of hub status - * - * @param status - * @param idx - * @return - */ -static inline bool usb_hub_is_status(usb_hub_status_t status, int idx) { - return (status & (1 << idx)) != 0; -} - -/** - * set i`th bit of hub status - * - * @param status - * @param idx - * @param value - */ -static inline void usb_hub_status_set_bit( - usb_hub_status_t *status, int idx, bool value) { - (*status) = value ? - ((*status) | (1 << (idx))) : - ((*status)&(~(1 << (idx)))); -} - -/** - * low speed device on the port indicator - * - * @param status - * @return true if low speed device is attached - */ -static inline bool usb_port_low_speed(usb_port_status_t status) { - return usb_port_is_status(status, 9); -} - -/** - * set low speed device connected bit in port status - * - * @param status - * @param low_speed value of the bit - */ -static inline void usb_port_set_low_speed(usb_port_status_t *status, bool low_speed) { - usb_port_status_set_bit(status, 9, low_speed); -} - -//high speed device attached - -/** - * high speed device on the port indicator - * - * @param status - * @return true if high speed device is on port - */ -static inline bool usb_port_high_speed(usb_port_status_t status) { - return usb_port_is_status(status, 10); -} - -/** - * set high speed device bit in port status - * - * @param status - * @param high_speed value of the bit - */ -static inline void usb_port_set_high_speed(usb_port_status_t *status, bool high_speed) { - usb_port_status_set_bit(status, 10, high_speed); -} - -/** - * speed getter for port status - * - * @param status - * @return speed of usb device (for more see usb specification) - */ -static inline usb_speed_t usb_port_speed(usb_port_status_t status) { - if (usb_port_low_speed(status)) - return USB_SPEED_LOW; - if (usb_port_high_speed(status)) - return USB_SPEED_HIGH; - return USB_SPEED_FULL; -} - - - -#endif /* HUB_PORT_STATUS_H */ - -/** - * @} - */ Index: pace/drv/bus/usb/usbhub/ports.c =================================================================== --- uspace/drv/bus/usb/usbhub/ports.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,465 +1,0 @@ -/* - * Copyright (c) 2011 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. - */ - -/** @addtogroup drvusbhub - * @{ - */ -/** @file - * Hub ports functions. - */ - -#include -#include -#include -#include -#include - -#include - -#include "ports.h" -#include "usbhub.h" -#include "usbhub_private.h" -#include "port_status.h" - -/** Information for fibril for device discovery. */ -struct add_device_phase1 { - usb_hub_info_t *hub; - size_t port; - usb_speed_t speed; -}; - -/** - * count of port status changes that are not explicitly handled by - * any function here and must be cleared by hand - */ -static const unsigned int non_handled_changes_count = 2; - -/** - * port status changes that are not explicitly handled by - * any function here and must be cleared by hand - */ -static const int non_handled_changes[] = { - USB_HUB_FEATURE_C_PORT_ENABLE, - USB_HUB_FEATURE_C_PORT_SUSPEND -}; - -static void usb_hub_removed_device( - usb_hub_info_t *hub, uint16_t port); - -static void usb_hub_port_reset_completed(usb_hub_info_t *hub, - uint16_t port, uint32_t status); - -static void usb_hub_port_over_current(usb_hub_info_t *hub, - uint16_t port, uint32_t status); - -static int get_port_status(usb_pipe_t *ctrl_pipe, size_t port, - usb_port_status_t *status); - -static int enable_port_callback(int port_no, void *arg); - -static int add_device_phase1_worker_fibril(void *arg); - -static int create_add_device_fibril(usb_hub_info_t *hub, size_t port, - usb_speed_t speed); - -/** - * Process interrupts on given hub port - * - * Accepts connection, over current and port reset change. - * @param hub hub representation - * @param port port number, starting from 1 - */ -void usb_hub_process_port_interrupt(usb_hub_info_t *hub, - uint16_t port) { - usb_log_debug("Interrupt at port %zu\n", (size_t) port); - //determine type of change - //usb_pipe_t *pipe = hub->control_pipe; - - int opResult; - - usb_port_status_t status; - opResult = get_port_status(&hub->usb_device->ctrl_pipe, port, &status); - if (opResult != EOK) { - usb_log_error("Failed to get port %zu status: %s.\n", - (size_t) port, str_error(opResult)); - return; - } - //connection change - if (usb_port_is_status(status, USB_HUB_FEATURE_C_PORT_CONNECTION)) { - bool device_connected = usb_port_is_status(status, - USB_HUB_FEATURE_PORT_CONNECTION); - usb_log_debug("Connection change on port %zu: %s.\n", - (size_t) port, - device_connected ? "device attached" : "device removed"); - - if (device_connected) { - opResult = create_add_device_fibril(hub, port, - usb_port_speed(status)); - if (opResult != EOK) { - usb_log_error( - "Cannot handle change on port %zu: %s.\n", - (size_t) port, str_error(opResult)); - } - } else { - usb_hub_removed_device(hub, port); - } - } - //over current - if (usb_port_is_status(status, USB_HUB_FEATURE_C_PORT_OVER_CURRENT)) { - //check if it was not auto-resolved - usb_log_debug("Overcurrent change on port\n"); - usb_hub_port_over_current(hub, port, status); - } - //port reset - if (usb_port_is_status(status, USB_HUB_FEATURE_C_PORT_RESET)) { - usb_hub_port_reset_completed(hub, port, status); - } - usb_log_debug("Port %d status 0x%08" PRIx32 "\n", (int) port, status); - - usb_port_status_set_bit( - &status, USB_HUB_FEATURE_C_PORT_CONNECTION, false); - usb_port_status_set_bit( - &status, USB_HUB_FEATURE_C_PORT_RESET, false); - usb_port_status_set_bit( - &status, USB_HUB_FEATURE_C_PORT_OVER_CURRENT, false); - - //clearing not yet handled changes - unsigned int feature_idx; - for (feature_idx = 0; - feature_idx < non_handled_changes_count; - ++feature_idx) { - unsigned int bit_idx = non_handled_changes[feature_idx]; - if (status & (1 << bit_idx)) { - usb_log_info( - "There was not yet handled change on port %d: %d" - ";clearing it\n", - port, bit_idx); - int opResult = usb_hub_clear_port_feature( - hub->control_pipe, - port, bit_idx); - if (opResult != EOK) { - usb_log_warning( - "Could not clear port flag %d: %s\n", - bit_idx, str_error(opResult) - ); - } - usb_port_status_set_bit( - &status, bit_idx, false); - } - } - if (status >> 16) { - usb_log_info("There is still some unhandled change %X\n", - status); - } -} - -/** - * routine called when a device on port has been removed - * - * If the device on port had default address, it releases default address. - * Otherwise does not do anything, because DDF does not allow to remove device - * from it`s device tree. - * @param hub hub representation - * @param port port number, starting from 1 - */ -static void usb_hub_removed_device( - usb_hub_info_t *hub, uint16_t port) { - - int opResult = usb_hub_clear_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_C_PORT_CONNECTION); - if (opResult != EOK) { - usb_log_warning("Could not clear port-change-connection flag\n"); - } - /** \TODO remove device from device manager - not yet implemented in - * devide manager - */ - - //close address - - usb_hub_port_t *the_port = hub->ports + port; - - fibril_mutex_lock(&hub->port_mutex); - - if (the_port->attached_device.address >= 0) { - usb_log_warning("Device unplug on `%s' (port %zu): " \ - "not implemented.\n", hub->usb_device->ddf_dev->name, - (size_t) port); - the_port->attached_device.address = -1; - the_port->attached_device.handle = 0; - } else { - usb_log_warning("Device removed before being registered.\n"); - - /* - * Device was removed before port reset completed. - * We will announce a failed port reset to unblock the - * port reset callback from new device wrapper. - */ - fibril_mutex_lock(&the_port->reset_mutex); - the_port->reset_completed = true; - the_port->reset_okay = false; - fibril_condvar_broadcast(&the_port->reset_cv); - fibril_mutex_unlock(&the_port->reset_mutex); - } - - fibril_mutex_unlock(&hub->port_mutex); -} - -/** - * Process port reset change - * - * After this change port should be enabled, unless some problem occured. - * This functions triggers second phase of enabling new device. - * @param hub - * @param port - * @param status - */ -static void usb_hub_port_reset_completed(usb_hub_info_t *hub, - uint16_t port, uint32_t status) { - usb_log_debug("Port %zu reset complete.\n", (size_t) port); - if (usb_port_is_status(status, USB_HUB_FEATURE_PORT_ENABLE)) { - /* Finalize device adding. */ - usb_hub_port_t *the_port = hub->ports + port; - fibril_mutex_lock(&the_port->reset_mutex); - the_port->reset_completed = true; - the_port->reset_okay = true; - fibril_condvar_broadcast(&the_port->reset_cv); - fibril_mutex_unlock(&the_port->reset_mutex); - } else { - usb_log_warning( - "Port %zu reset complete but port not enabled.\n", - (size_t) port); - } - /* Clear the port reset change. */ - int rc = usb_hub_clear_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_C_PORT_RESET); - if (rc != EOK) { - usb_log_error("Failed to clear port %d reset feature: %s.\n", - port, str_error(rc)); - } -} - -/** - * Process over current condition on port. - * - * Turn off the power on the port. - * - * @param hub hub representation - * @param port port number, starting from 1 - */ -static void usb_hub_port_over_current(usb_hub_info_t *hub, - uint16_t port, uint32_t status) { - int opResult; - if (usb_port_is_status(status, USB_HUB_FEATURE_PORT_OVER_CURRENT)) { - opResult = usb_hub_clear_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_PORT_POWER); - if (opResult != EOK) { - usb_log_error("Cannot power off port %d; %s\n", - port, str_error(opResult)); - } - } else { - opResult = usb_hub_set_port_feature(hub->control_pipe, - port, USB_HUB_FEATURE_PORT_POWER); - if (opResult != EOK) { - usb_log_error("Cannot power on port %d; %s\n", - port, str_error(opResult)); - } - } -} - -/** Retrieve port status. - * - * @param[in] ctrl_pipe Control pipe to use. - * @param[in] port Port number (starting at 1). - * @param[out] status Where to store the port status. - * @return Error code. - */ -static int get_port_status(usb_pipe_t *ctrl_pipe, size_t port, - usb_port_status_t *status) { - size_t recv_size; - usb_device_request_setup_packet_t request; - usb_port_status_t status_tmp; - - usb_hub_set_port_status_request(&request, port); - int rc = usb_pipe_control_read(ctrl_pipe, - &request, sizeof (usb_device_request_setup_packet_t), - &status_tmp, sizeof (status_tmp), &recv_size); - if (rc != EOK) { - return rc; - } - - if (recv_size != sizeof (status_tmp)) { - return ELIMIT; - } - - if (status != NULL) { - *status = status_tmp; - } - - return EOK; -} - -/** Callback for enabling a specific port. - * - * We wait on a CV until port is reseted. - * That is announced via change on interrupt pipe. - * - * @param port_no Port number (starting at 1). - * @param arg Custom argument, points to @c usb_hub_info_t. - * @return Error code. - */ -static int enable_port_callback(int port_no, void *arg) { - usb_hub_info_t *hub = arg; - int rc; - usb_device_request_setup_packet_t request; - usb_hub_port_t *my_port = hub->ports + port_no; - - usb_hub_set_reset_port_request(&request, port_no); - rc = usb_pipe_control_write(hub->control_pipe, - &request, sizeof (request), NULL, 0); - if (rc != EOK) { - usb_log_warning("Port reset failed: %s.\n", str_error(rc)); - return rc; - } - - /* - * Wait until reset completes. - */ - fibril_mutex_lock(&my_port->reset_mutex); - while (!my_port->reset_completed) { - fibril_condvar_wait(&my_port->reset_cv, &my_port->reset_mutex); - } - fibril_mutex_unlock(&my_port->reset_mutex); - - if (my_port->reset_okay) { - return EOK; - } else { - return ESTALL; - } -} - -/** Fibril for adding a new device. - * - * Separate fibril is needed because the port reset completion is announced - * via interrupt pipe and thus we cannot block here. - * - * @param arg Pointer to struct add_device_phase1. - * @return 0 Always. - */ -static int add_device_phase1_worker_fibril(void *arg) { - struct add_device_phase1 *data - = (struct add_device_phase1 *) arg; - - usb_address_t new_address; - devman_handle_t child_handle; - - int rc = usb_hc_new_device_wrapper(data->hub->usb_device->ddf_dev, - &data->hub->connection, data->speed, - enable_port_callback, (int) data->port, data->hub, - &new_address, &child_handle, - NULL, NULL, NULL); - - if (rc != EOK) { - usb_log_error("Failed registering device on port %zu: %s.\n", - data->port, str_error(rc)); - goto leave; - } - - fibril_mutex_lock(&data->hub->port_mutex); - data->hub->ports[data->port].attached_device.handle = child_handle; - data->hub->ports[data->port].attached_device.address = new_address; - fibril_mutex_unlock(&data->hub->port_mutex); - - usb_log_info("Detected new device on `%s' (port %zu), " - "address %d (handle %" PRIun ").\n", - data->hub->usb_device->ddf_dev->name, data->port, - new_address, child_handle); - -leave: - free(arg); - - fibril_mutex_lock(&data->hub->pending_ops_mutex); - assert(data->hub->pending_ops_count > 0); - data->hub->pending_ops_count--; - fibril_condvar_signal(&data->hub->pending_ops_cv); - fibril_mutex_unlock(&data->hub->pending_ops_mutex); - - - return EOK; -} - -/** Start device adding when connection change is detected. - * - * This fires a new fibril to complete the device addition. - * - * @param hub Hub where the change occured. - * @param port Port index (starting at 1). - * @param speed Speed of the device. - * @return Error code. - */ -static int create_add_device_fibril(usb_hub_info_t *hub, size_t port, - usb_speed_t speed) { - struct add_device_phase1 *data - = malloc(sizeof (struct add_device_phase1)); - if (data == NULL) { - return ENOMEM; - } - data->hub = hub; - data->port = port; - data->speed = speed; - - usb_hub_port_t *the_port = hub->ports + port; - - fibril_mutex_lock(&the_port->reset_mutex); - the_port->reset_completed = false; - fibril_mutex_unlock(&the_port->reset_mutex); - - int rc = usb_hub_clear_port_feature(hub->control_pipe, port, - USB_HUB_FEATURE_C_PORT_CONNECTION); - if (rc != EOK) { - free(data); - usb_log_warning("Failed to clear port change flag: %s.\n", - str_error(rc)); - return rc; - } - - fid_t fibril = fibril_create(add_device_phase1_worker_fibril, data); - if (fibril == 0) { - free(data); - return ENOMEM; - } - fibril_mutex_lock(&hub->pending_ops_mutex); - hub->pending_ops_count++; - fibril_mutex_unlock(&hub->pending_ops_mutex); - fibril_add_ready(fibril); - - return EOK; -} - -/** - * @} - */ Index: pace/drv/bus/usb/usbhub/ports.h =================================================================== --- uspace/drv/bus/usb/usbhub/ports.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,80 +1,0 @@ -/* - * Copyright (c) 2011 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. - */ - -/** @addtogroup drvusbhub - * @{ - */ -/** @file - * Hub ports related functions. - */ -#ifndef DRV_USBHUB_PORTS_H -#define DRV_USBHUB_PORTS_H - -#include -#include - -typedef struct usb_hub_info_t usb_hub_info_t; - -/** Information about single port on a hub. */ -typedef struct { - /** Mutex needed by CV for checking port reset. */ - fibril_mutex_t reset_mutex; - /** CV for waiting to port reset completion. */ - fibril_condvar_t reset_cv; - /** Whether port reset is completed. - * Guarded by @c reset_mutex. - */ - bool reset_completed; - /** Whether to announce the port reset as successful. */ - bool reset_okay; - - /** Information about attached device. */ - usb_hc_attached_device_t attached_device; -} usb_hub_port_t; - -/** Initialize hub port information. - * - * @param port Port to be initialized. - */ -static inline void usb_hub_port_init(usb_hub_port_t *port) { - port->attached_device.address = -1; - port->attached_device.handle = 0; - fibril_mutex_initialize(&port->reset_mutex); - fibril_condvar_initialize(&port->reset_cv); -} - - -void usb_hub_process_port_interrupt(usb_hub_info_t *hub, - uint16_t port); - - - -#endif -/** - * @} - */ Index: uspace/drv/bus/usb/usbhub/status.h =================================================================== --- uspace/drv/bus/usb/usbhub/status.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/bus/usb/usbhub/status.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2010 Matus Dekanek + * Copyright (c) 2011 Jan Vesely + * 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. + */ +/** @addtogroup drvusbhub + * @{ + */ + +#ifndef HUB_STATUS_H +#define HUB_STATUS_H + +#include +#include +#include + +/** + * structure holding port status and changes flags. + * should not be accessed directly, use supplied getter/setter methods. + * + * For more information refer to table 11-15 in + * "Universal Serial Bus Specification Revision 1.1" + * + */ +typedef uint32_t usb_port_status_t; +#define USB_HUB_PORT_STATUS_CONNECTION \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_CONNECTION))) +#define USB_HUB_PORT_STATUS_ENABLED \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_ENABLE))) +#define USB_HUB_PORT_STATUS_SUSPEND \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_SUSPEND))) +#define USB_HUB_PORT_STATUS_OC \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_OVER_CURRENT))) +#define USB_HUB_PORT_STATUS_RESET \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_RESET))) +#define USB_HUB_PORT_STATUS_POWER \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_POWER))) +#define USB_HUB_PORT_STATUS_LOW_SPEED \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_PORT_LOW_SPEED))) +#define USB_HUB_PORT_STATUS_HIGH_SPEED \ + (uint32_usb2host(1 << 10)) + +#define USB_HUB_PORT_C_STATUS_CONNECTION \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_CONNECTION))) +#define USB_HUB_PORT_C_STATUS_ENABLED \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_ENABLE))) +#define USB_HUB_PORT_C_STATUS_SUSPEND \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_SUSPEND))) +#define USB_HUB_PORT_C_STATUS_OC \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_OVER_CURRENT))) +#define USB_HUB_PORT_C_STATUS_RESET \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_C_PORT_RESET))) + +/** + * structure holding hub status and changes flags. + * + * For more information refer to table 11.16.2.5 in + * "Universal Serial Bus Specification Revision 1.1" + * + */ +typedef uint32_t usb_hub_status_t; +#define USB_HUB_STATUS_OVER_CURRENT \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_HUB_OVER_CURRENT))) +#define USB_HUB_STATUS_LOCAL_POWER \ + (uint32_usb2host(1 << (USB_HUB_FEATURE_HUB_LOCAL_POWER))) + +#define USB_HUB_STATUS_C_OVER_CURRENT \ + (uint32_usb2host(1 << (16 + USB_HUB_FEATURE_C_HUB_OVER_CURRENT))) +#define USB_HUB_STATUS_C_LOCAL_POWER \ + (uint32_usb2host(1 << (16 + USB_HUB_FEATURE_C_HUB_LOCAL_POWER))) + + +/** + * speed getter for port status + * + * @param status + * @return speed of usb device (for more see usb specification) + */ +static inline usb_speed_t usb_port_speed(usb_port_status_t status) +{ + if ((status & USB_HUB_PORT_STATUS_LOW_SPEED) != 0) + return USB_SPEED_LOW; + if ((status & USB_HUB_PORT_STATUS_HIGH_SPEED) != 0) + return USB_SPEED_HIGH; + return USB_SPEED_FULL; +} + +#endif /* HUB_STATUS_H */ +/** + * @} + */ Index: uspace/drv/bus/usb/usbhub/usbhub.c =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/drv/bus/usb/usbhub/usbhub.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Matus Dekanek + * Copyright (c) 2011 Jan Vesely * All rights reserved. * @@ -38,6 +39,10 @@ #include #include - -#include +#include + +#include +#include +#include +#include #include #include @@ -46,72 +51,67 @@ #include #include -#include +#include #include "usbhub.h" -#include "usbhub_private.h" -#include "port_status.h" -#include -#include -#include - - +#include "status.h" + +#define HUB_FNC_NAME "hub" + +/** Standard get hub global status request */ +static const usb_device_request_setup_packet_t get_hub_status_request = { + .request_type = USB_HUB_REQ_TYPE_GET_HUB_STATUS, + .request = USB_HUB_REQUEST_GET_STATUS, + .index = 0, + .value = 0, + .length = sizeof(usb_hub_status_t), +}; + +static int usb_set_first_configuration(usb_device_t *usb_device); static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev); - static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info); - -static int usb_hub_set_configuration(usb_hub_info_t *hub_info); - -static int usb_hub_start_hub_fibril(usb_hub_info_t *hub_info); - -static int usb_process_hub_over_current(usb_hub_info_t *hub_info, +static void usb_hub_over_current(const usb_hub_info_t *hub_info, usb_hub_status_t status); - -static int usb_process_hub_local_power_change(usb_hub_info_t *hub_info, - usb_hub_status_t status); - -static void usb_hub_process_global_interrupt(usb_hub_info_t *hub_info); - +static void usb_hub_global_interrupt(const usb_hub_info_t *hub_info); static void usb_hub_polling_terminated_callback(usb_device_t *device, bool was_error, void *data); - -//********************************************* -// -// hub driver code, initialization -// -//********************************************* - /** * Initialize hub device driver fibril * - * Creates hub representation and fibril that periodically checks hub`s status. + * Creates hub representation and fibril that periodically checks hub's status. * Hub representation is passed to the fibril. * @param usb_dev generic usb device information * @return error code */ -int usb_hub_add_device(usb_device_t *usb_dev) { - if (!usb_dev) return EINVAL; +int usb_hub_add_device(usb_device_t *usb_dev) +{ + assert(usb_dev); + /* Create driver soft-state structure */ usb_hub_info_t *hub_info = usb_hub_info_create(usb_dev); - //create hc connection + if (hub_info == NULL) { + usb_log_error("Failed to create hun driver structure.\n"); + return ENOMEM; + } + + /* Create hc connection */ usb_log_debug("Initializing USB wire abstraction.\n"); int opResult = usb_hc_connection_initialize_from_device( - &hub_info->connection, - hub_info->usb_device->ddf_dev); - if (opResult != EOK) { - usb_log_error("Could not initialize connection to device, " - " %s\n", - str_error(opResult)); - free(hub_info); - return opResult; - } - - //set hub configuration - opResult = usb_hub_set_configuration(hub_info); - if (opResult != EOK) { - usb_log_error("Could not set hub configuration, %s\n", - str_error(opResult)); - free(hub_info); - return opResult; - } + &hub_info->connection, hub_info->usb_device->ddf_dev); + if (opResult != EOK) { + usb_log_error("Could not initialize connection to device: %s\n", + str_error(opResult)); + free(hub_info); + return opResult; + } + + /* Set hub's first configuration. (There should be only one) */ + opResult = usb_set_first_configuration(usb_dev); + if (opResult != EOK) { + usb_log_error("Could not set hub configuration: %s\n", + str_error(opResult)); + free(hub_info); + return opResult; + } + //get port count and create attached_devs opResult = usb_hub_process_hub_specific_info(hub_info); @@ -123,19 +123,38 @@ } - usb_log_debug("Creating 'hub' function in DDF.\n"); + usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n"); ddf_fun_t *hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev, - fun_exposed, "hub"); - assert(hub_fun != NULL); - hub_fun->ops = NULL; + fun_exposed, HUB_FNC_NAME); + if (hub_fun == NULL) { + usb_log_error("Failed to create hub function.\n"); + free(hub_info); + return ENOMEM; + } opResult = ddf_fun_bind(hub_fun); - assert(opResult == EOK); - - opResult = usb_hub_start_hub_fibril(hub_info); - if (opResult != EOK) - free(hub_info); - return opResult; -} - + if (opResult != EOK) { + usb_log_error("Failed to bind hub function: %s.\n", + str_error(opResult)); + free(hub_info); + ddf_fun_destroy(hub_fun); + return opResult; + } + + opResult = usb_device_auto_poll(hub_info->usb_device, 0, + hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1, + usb_hub_polling_terminated_callback, hub_info); + if (opResult != EOK) { + ddf_fun_destroy(hub_fun); + free(hub_info); + usb_log_error("Failed to create polling fibril: %s.\n", + str_error(opResult)); + return opResult; + } + usb_log_info("Controlling hub '%s' (%zu ports).\n", + hub_info->usb_device->ddf_dev->name, hub_info->port_count); + + return EOK; +} +/*----------------------------------------------------------------------------*/ /** Callback for polling hub for changes. * @@ -147,40 +166,32 @@ */ bool hub_port_changes_callback(usb_device_t *dev, - uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) { + uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) +{ usb_log_debug("hub_port_changes_callback\n"); - usb_hub_info_t *hub = (usb_hub_info_t *) arg; - - /* FIXME: check that we received enough bytes. */ + usb_hub_info_t *hub = arg; + assert(hub); + + /* It is an error condition if we didn't receive enough data */ if (change_bitmap_size == 0) { - goto leave; - } - - bool change; - change = ((uint8_t*) change_bitmap)[0] & 1; + return false; + } + + /* Lowest bit indicates global change */ + const bool change = change_bitmap[0] & 1; if (change) { - usb_hub_process_global_interrupt(hub); - } - - size_t port; - for (port = 1; port < hub->port_count + 1; port++) { - bool change = (change_bitmap[port / 8] >> (port % 8)) % 2; + usb_hub_global_interrupt(hub); + } + + /* N + 1 bit indicates change on port N */ + size_t port = 1; + for (; port < hub->port_count + 1; port++) { + const bool change = (change_bitmap[port / 8] >> (port % 8)) & 1; if (change) { - usb_hub_process_port_interrupt(hub, port); + usb_hub_port_process_interrupt(&hub->ports[port], hub); } } -leave: - /* FIXME: proper interval. */ - async_usleep(1000 * 250); - return true; } - - -//********************************************* -// -// support functions -// -//********************************************* - +/*----------------------------------------------------------------------------*/ /** * create usb_hub_info_t structure @@ -190,45 +201,46 @@ * @return basic usb_hub_info_t structure */ -static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev) { - usb_hub_info_t * result = malloc(sizeof (usb_hub_info_t)); - if (!result) return NULL; - result->usb_device = usb_dev; - result->status_change_pipe = usb_dev->pipes[0].pipe; - result->control_pipe = &usb_dev->ctrl_pipe; - result->is_default_address_used = false; - - result->ports = NULL; - result->port_count = (size_t) - 1; - fibril_mutex_initialize(&result->port_mutex); - - fibril_mutex_initialize(&result->pending_ops_mutex); - fibril_condvar_initialize(&result->pending_ops_cv); - result->pending_ops_count = 0; - return result; -} - +static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev) +{ + assert(usb_dev); + usb_hub_info_t *info = malloc(sizeof(usb_hub_info_t)); + if (!info) + return NULL; + + info->usb_device = usb_dev; + + info->ports = NULL; + info->port_count = -1; + fibril_mutex_initialize(&info->pending_ops_mutex); + fibril_condvar_initialize(&info->pending_ops_cv); + info->pending_ops_count = 0; + + return info; +} +/*----------------------------------------------------------------------------*/ /** * Load hub-specific information into hub_info structure and process if needed * - * Particularly read port count and initialize structure holding port - * information. If there are non-removable devices, start initializing them. + * Read port count and initialize structures holding per port information. + * If there are any non-removable devices, start initializing them. * This function is hub-specific and should be run only after the hub is - * configured using usb_hub_set_configuration function. + * configured using usb_set_first_configuration function. * @param hub_info hub representation * @return error code */ -int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info) -{ - // get hub descriptor +static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info) +{ + assert(hub_info); + + /* Get hub descriptor. */ usb_log_debug("Retrieving descriptor\n"); - uint8_t serialized_descriptor[USB_HUB_MAX_DESCRIPTOR_SIZE]; - int opResult; - + usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe; + + usb_hub_descriptor_header_t descriptor; size_t received_size; - opResult = usb_request_get_descriptor(hub_info->control_pipe, + int opResult = usb_request_get_descriptor(control_pipe, USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE, - USB_DESCTYPE_HUB, 0, 0, serialized_descriptor, - USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size); - + USB_DESCTYPE_HUB, 0, 0, &descriptor, + sizeof(usb_hub_descriptor_t), &received_size); if (opResult != EOK) { usb_log_error("Failed to receive hub descriptor: %s.\n", @@ -236,16 +248,9 @@ return opResult; } - usb_log_debug2("Parsing descriptor\n"); - usb_hub_descriptor_t descriptor; - opResult = usb_deserialize_hub_desriptor( - serialized_descriptor, received_size, &descriptor); - if (opResult != EOK) { - usb_log_error("Could not parse descriptor: %s\n", - str_error(opResult)); - return opResult; - } - usb_log_debug("Setting port count to %d.\n", descriptor.ports_count); - hub_info->port_count = descriptor.ports_count; - + + usb_log_debug("Setting port count to %d.\n", descriptor.port_count); + hub_info->port_count = descriptor.port_count; + + // TODO: +1 hack is no longer necessary hub_info->ports = malloc(sizeof(usb_hub_port_t) * (hub_info->port_count + 1)); @@ -256,19 +261,18 @@ size_t port; for (port = 0; port < hub_info->port_count + 1; ++port) { - usb_hub_port_init(&hub_info->ports[port]); + usb_hub_port_init(&hub_info->ports[port], port, control_pipe); } const bool is_power_switched = - !(descriptor.hub_characteristics & HUB_CHAR_NO_POWER_SWITCH_FLAG); + !(descriptor.characteristics & HUB_CHAR_NO_POWER_SWITCH_FLAG); if (is_power_switched) { usb_log_debug("Hub power switched\n"); - const bool per_port_power = descriptor.hub_characteristics + const bool per_port_power = descriptor.characteristics & HUB_CHAR_POWER_PER_PORT_FLAG; for (port = 1; port <= hub_info->port_count; ++port) { usb_log_debug("Powering port %zu.\n", port); - opResult = usb_hub_set_port_feature( - hub_info->control_pipe, - port, USB_HUB_FEATURE_PORT_POWER); + opResult = usb_hub_port_set_feature( + &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER); if (opResult != EOK) { usb_log_error("Cannot power on port %zu: %s.\n", @@ -283,85 +287,52 @@ } } - } else { - usb_log_debug("Power not switched, not going to be powered\n"); + usb_log_debug("Power not switched, ports always powered\n"); } return EOK; } - -/** - * Set configuration of hub +/*----------------------------------------------------------------------------*/ +/** + * Set configuration of and USB device * * Check whether there is at least one configuration and sets the first one. * This function should be run prior to running any hub-specific action. - * @param hub_info hub representation + * @param usb_device usb device representation * @return error code */ -static int usb_hub_set_configuration(usb_hub_info_t *hub_info) { - //device descriptor - usb_standard_device_descriptor_t *std_descriptor - = &hub_info->usb_device->descriptors.device; - usb_log_debug("Hub has %d configurations\n", - std_descriptor->configuration_count); - if (std_descriptor->configuration_count < 1) { +static int usb_set_first_configuration(usb_device_t *usb_device) +{ + assert(usb_device); + /* Get number of possible configurations from device descriptor */ + const size_t configuration_count = + usb_device->descriptors.device.configuration_count; + usb_log_debug("Hub has %zu configurations.\n", configuration_count); + + if (configuration_count < 1) { usb_log_error("There are no configurations available\n"); return EINVAL; } + // TODO: Make sure that there is enough data and the cast is correct usb_standard_configuration_descriptor_t *config_descriptor = (usb_standard_configuration_descriptor_t *) - hub_info->usb_device->descriptors.configuration; - - /* Set configuration. */ - int opResult = usb_request_set_configuration( - &hub_info->usb_device->ctrl_pipe, - config_descriptor->configuration_number); - + usb_device->descriptors.configuration; + + /* Set configuration. Use the configuration that was in + * usb_device->descriptors.configuration i.e. The first one. */ + const int opResult = usb_request_set_configuration( + &usb_device->ctrl_pipe, config_descriptor->configuration_number); if (opResult != EOK) { usb_log_error("Failed to set hub configuration: %s.\n", str_error(opResult)); - return opResult; - } - usb_log_debug("\tUsed configuration %d\n", - config_descriptor->configuration_number); - - return EOK; -} - -/** - * create and start fibril with hub control loop - * - * Before the fibril is started, the control pipe and host controller - * connection of the hub is open. - * - * @param hub_info hub representing structure - * @return error code - */ -static int usb_hub_start_hub_fibril(usb_hub_info_t *hub_info) { - int rc; - - rc = usb_device_auto_poll(hub_info->usb_device, 0, - hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1, - usb_hub_polling_terminated_callback, hub_info); - if (rc != EOK) { - usb_log_error("Failed to create polling fibril: %s.\n", - str_error(rc)); - free(hub_info); - return rc; - } - - usb_log_info("Controlling hub `%s' (%zu ports).\n", - hub_info->usb_device->ddf_dev->name, hub_info->port_count); - return EOK; -} - -//********************************************* -// -// change handling functions -// -//********************************************* - -/** - * process hub over current change + } else { + usb_log_debug("\tUsed configuration %d\n", + config_descriptor->configuration_number); + } + return opResult; +} +/*----------------------------------------------------------------------------*/ +/** + * Process hub over current change * * This means either to power off the hub or power it on. @@ -370,82 +341,57 @@ * @return error code */ -static int usb_process_hub_over_current(usb_hub_info_t *hub_info, - usb_hub_status_t status) { - int opResult; - if (usb_hub_is_status(status, USB_HUB_FEATURE_HUB_OVER_CURRENT)) { - //poweroff all ports - unsigned int port; +static void usb_hub_over_current(const usb_hub_info_t *hub_info, + usb_hub_status_t status) +{ + if (status & USB_HUB_STATUS_OVER_CURRENT) { + /* Hub should remove power from all ports if it detects OC */ + usb_log_warning("Detected hub over-current condition, " + "all ports should be powered off."); + } else { + /* Over-current condition is gone, it is safe to turn the + * ports on. */ + size_t port; for (port = 1; port <= hub_info->port_count; ++port) { - opResult = usb_hub_clear_port_feature( - hub_info->control_pipe, port, - USB_HUB_FEATURE_PORT_POWER); + const int opResult = usb_hub_port_set_feature( + &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER); if (opResult != EOK) { usb_log_warning( - "Cannot power off port %d; %s\n", + "HUB OVER-CURRENT GONE: Cannot power on " + "port %zu; %s\n", port, str_error(opResult)); } } - } else { - //power all ports - unsigned int port; - for (port = 1; port <= hub_info->port_count; ++port) { - opResult = usb_hub_set_port_feature( - hub_info->control_pipe, port, - USB_HUB_FEATURE_PORT_POWER); - if (opResult != EOK) { - usb_log_warning( - "Cannot power off port %d; %s\n", - port, str_error(opResult)); - } - } - } - return opResult; -} - -/** - * process hub local power change - * - * This change is ignored. + } + const int opResult = usb_request_clear_feature( + &hub_info->usb_device->ctrl_pipe, USB_REQUEST_TYPE_CLASS, + USB_REQUEST_RECIPIENT_DEVICE, + USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0); + if (opResult != EOK) { + usb_log_error( + "Failed to clear hub over-current change flag: %s.\n", + str_error(opResult)); + } +} +/*----------------------------------------------------------------------------*/ +/** + * Process hub interrupts. + * + * The change can be either in the over-current condition or local-power change. * @param hub_info hub instance - * @param status hub status bitmask - * @return error code - */ -static int usb_process_hub_local_power_change(usb_hub_info_t *hub_info, - usb_hub_status_t status) { - int opResult = EOK; - opResult = usb_hub_clear_feature(hub_info->control_pipe, - USB_HUB_FEATURE_C_HUB_LOCAL_POWER); - if (opResult != EOK) { - usb_log_error("Cannnot clear hub power change flag: " - "%s\n", - str_error(opResult)); - } - return opResult; -} - -/** - * process hub interrupts - * - * The change can be either in the over-current condition or - * local-power change. - * @param hub_info hub instance - */ -static void usb_hub_process_global_interrupt(usb_hub_info_t *hub_info) { + */ +static void usb_hub_global_interrupt(const usb_hub_info_t *hub_info) +{ + assert(hub_info); + assert(hub_info->usb_device); usb_log_debug("Global interrupt on a hub\n"); - usb_pipe_t *pipe = hub_info->control_pipe; - int opResult; - - usb_port_status_t status; + usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe; + + usb_hub_status_t status; size_t rcvd_size; - usb_device_request_setup_packet_t request; - //int opResult; - usb_hub_set_hub_status_request(&request); - //endpoint 0 - - opResult = usb_pipe_control_read( - pipe, - &request, sizeof (usb_device_request_setup_packet_t), - &status, 4, &rcvd_size - ); + /* NOTE: We can't use standard USB GET_STATUS request, because + * hubs reply is 4byte instead of 2 */ + const int opResult = usb_pipe_control_read(control_pipe, + &get_hub_status_request, sizeof(get_hub_status_request), + &status, sizeof(usb_hub_status_t), &rcvd_size); if (opResult != EOK) { usb_log_error("Could not get hub status: %s\n", @@ -453,19 +399,40 @@ return; } - if (rcvd_size != sizeof (usb_port_status_t)) { + if (rcvd_size != sizeof(usb_hub_status_t)) { usb_log_error("Received status has incorrect size\n"); return; } - //port reset - if ( - usb_hub_is_status(status, 16 + USB_HUB_FEATURE_C_HUB_OVER_CURRENT)) { - usb_process_hub_over_current(hub_info, status); - } - if ( - usb_hub_is_status(status, 16 + USB_HUB_FEATURE_C_HUB_LOCAL_POWER)) { - usb_process_hub_local_power_change(hub_info, status); - } -} - + + /* Handle status changes */ + if (status & USB_HUB_STATUS_C_OVER_CURRENT) { + usb_hub_over_current(hub_info, status); + } + + if (status & USB_HUB_STATUS_C_LOCAL_POWER) { + /* NOTE: Handling this is more complicated. + * If the transition is from bus power to local power, all + * is good and we may signal the parent hub that we don't + * need the power. + * If the transition is from local power to bus power + * the hub should turn off all the ports and devices need + * to be reinitialized taking into account the limited power + * that is now available. + * There is no support for power distribution in HelenOS, + * (or other OSes/hub devices that I've seen) so this is not + * implemented. + * Just ACK the change. + */ + const int opResult = usb_request_clear_feature( + control_pipe, USB_REQUEST_TYPE_CLASS, + USB_REQUEST_RECIPIENT_DEVICE, + USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0); + if (opResult != EOK) { + usb_log_error( + "Failed to clear hub power change flag: %s.\n", + str_error(opResult)); + } + } +} +/*----------------------------------------------------------------------------*/ /** * callback called from hub polling fibril when the fibril terminates @@ -477,6 +444,7 @@ */ static void usb_hub_polling_terminated_callback(usb_device_t *device, - bool was_error, void *data) { - usb_hub_info_t * hub = data; + bool was_error, void *data) +{ + usb_hub_info_t *hub = data; assert(hub); @@ -492,15 +460,8 @@ */ if (hub->pending_ops_count > 0) { - fibril_mutex_lock(&hub->port_mutex); size_t port; for (port = 0; port < hub->port_count; port++) { - usb_hub_port_t *the_port = hub->ports + port; - fibril_mutex_lock(&the_port->reset_mutex); - the_port->reset_completed = true; - the_port->reset_okay = false; - fibril_condvar_broadcast(&the_port->reset_cv); - fibril_mutex_unlock(&the_port->reset_mutex); + usb_hub_port_reset_fail(&hub->ports[port]); } - fibril_mutex_unlock(&hub->port_mutex); } /* And now wait for them. */ @@ -516,8 +477,4 @@ free(hub); } - - - - /** * @} Index: uspace/drv/bus/usb/usbhub/usbhub.h =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/drv/bus/usb/usbhub/usbhub.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Vojtech Horky + * Copyright (c) 2011 Vojtech Horky * All rights reserved. * @@ -26,5 +27,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /** @addtogroup drvusbhub * @{ @@ -49,5 +49,5 @@ #define NAME "usbhub" -#include "ports.h" +#include "port.h" /** Information about attached hub. */ @@ -56,37 +56,12 @@ size_t port_count; - /** attached device handles, for each port one */ + /** Attached device handles, for each port one */ usb_hub_port_t *ports; - fibril_mutex_t port_mutex; - - /** connection to hcd */ + /** Connection to hcd */ usb_hc_connection_t connection; - /** default address is used indicator - * - * If default address is requested by this device, it cannot - * be requested by the same hub again, otherwise a deadlock will occur. - */ - bool is_default_address_used; - - /** convenience pointer to status change pipe - * - * Status change pipe is initialized in usb_device structure. This is - * pointer into this structure, so that it does not have to be - * searched again and again for the 'right pipe'. - */ - usb_pipe_t * status_change_pipe; - - /** convenience pointer to control pipe - * - * Control pipe is initialized in usb_device structure. This is - * pointer into this structure, so that it does not have to be - * searched again and again for the 'right pipe'. - */ - usb_pipe_t * control_pipe; - - /** generic usb device data*/ - usb_device_t * usb_device; + /** Generic usb device data*/ + usb_device_t *usb_device; /** Number of pending operations on the mutex to prevent shooting @@ -101,5 +76,4 @@ /** Condition variable for pending_ops_count. */ fibril_condvar_t pending_ops_cv; - }; Index: pace/drv/bus/usb/usbhub/usbhub_private.h =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub_private.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,181 +1,0 @@ -/* - * Copyright (c) 2010 Matus Dekanek - * 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. - */ - -/** @addtogroup drvusbhub - * @{ - */ -/** @file - * @brief Hub driver private definitions - */ - -#ifndef USBHUB_PRIVATE_H -#define USBHUB_PRIVATE_H - -#include "usbhub.h" - -#include -#include -#include -#include - -#include -#include -#include -#include - -//************ -// -// convenience define for malloc -// -//************ - - -usb_hub_info_t * usb_create_hub_info(ddf_dev_t * device); - -/** - * Set the device request to be a get hub descriptor request. - * @warning the size is allways set to USB_HUB_MAX_DESCRIPTOR_SIZE - * @param request - * @param addr - */ -static inline void usb_hub_set_descriptor_request( - usb_device_request_setup_packet_t * request - ) { - request->index = 0; - request->request_type = USB_HUB_REQ_TYPE_GET_DESCRIPTOR; - request->request = USB_HUB_REQUEST_GET_DESCRIPTOR; - request->value_high = USB_DESCTYPE_HUB; - request->value_low = 0; - request->length = USB_HUB_MAX_DESCRIPTOR_SIZE; -} - -/** - * Clear feature on hub port. - * - * @param hc Host controller telephone - * @param address Hub address - * @param port_index Port - * @param feature Feature selector - * @return Operation result - */ -static inline int usb_hub_clear_port_feature(usb_pipe_t *pipe, - int port_index, - usb_hub_class_feature_t feature) { - - usb_device_request_setup_packet_t clear_request = { - .request_type = USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE, - .request = USB_DEVREQ_CLEAR_FEATURE, - .length = 0, - .index = port_index - }; - clear_request.value = feature; - return usb_pipe_control_write(pipe, &clear_request, - sizeof (clear_request), NULL, 0); -} - -/** - * Clear feature on hub port. - * - * @param hc Host controller telephone - * @param address Hub address - * @param port_index Port - * @param feature Feature selector - * @return Operation result - */ -static inline int usb_hub_set_port_feature(usb_pipe_t *pipe, - int port_index, - usb_hub_class_feature_t feature) { - - usb_device_request_setup_packet_t clear_request = { - .request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE, - .request = USB_DEVREQ_SET_FEATURE, - .length = 0, - .index = port_index - }; - clear_request.value = feature; - return usb_pipe_control_write(pipe, &clear_request, - sizeof (clear_request), NULL, 0); -} - -/** - * Clear feature on hub port. - * - * @param pipe pipe to hub control endpoint - * @param feature Feature selector - * @return Operation result - */ -static inline int usb_hub_clear_feature(usb_pipe_t *pipe, - usb_hub_class_feature_t feature) { - - usb_device_request_setup_packet_t clear_request = { - .request_type = USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE, - .request = USB_DEVREQ_CLEAR_FEATURE, - .length = 0, - .index = 0 - }; - clear_request.value = feature; - return usb_pipe_control_write(pipe, &clear_request, - sizeof (clear_request), NULL, 0); -} - -/** - * Clear feature on hub port. - * - * @param pipe pipe to hub control endpoint - * @param feature Feature selector - * @return Operation result - */ -static inline int usb_hub_set_feature(usb_pipe_t *pipe, - usb_hub_class_feature_t feature) { - - usb_device_request_setup_packet_t clear_request = { - .request_type = USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE, - .request = USB_DEVREQ_SET_FEATURE, - .length = 0, - .index = 0 - }; - clear_request.value = feature; - return usb_pipe_control_write(pipe, &clear_request, - sizeof (clear_request), NULL, 0); -} - - -void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t * descriptor); - -void usb_serialize_hub_descriptor(usb_hub_descriptor_t * descriptor, - void * serialized_descriptor); - -int usb_deserialize_hub_desriptor( - void *serialized_descriptor, size_t size, usb_hub_descriptor_t *descriptor); - - -#endif /* USBHUB_PRIVATE_H */ - -/** - * @} - */ Index: pace/drv/bus/usb/usbhub/utils.c =================================================================== --- uspace/drv/bus/usb/usbhub/utils.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,155 +1,0 @@ -/* - * Copyright (c) 2010 Matus Dekanek - * 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. - */ - -/** @addtogroup drvusbhub - * @{ - */ -/** @file - * @brief various utilities - */ -#include -#include -#include - -#include -#include -#include - -#include "usbhub.h" -#include "usbhub_private.h" -#include "port_status.h" - - -size_t USB_HUB_MAX_DESCRIPTOR_SIZE = 71; - -//********************************************* -// -// various utils -// -//********************************************* - -//hub descriptor utils - -/** - * create uint8_t array with serialized descriptor - * - * @param descriptor - * @return newly created serializd descriptor pointer - */ -void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t *descriptor) { - //base size - size_t size = 7; - //variable size according to port count - size_t var_size = (descriptor->ports_count + 7) / 8; - size += 2 * var_size; - uint8_t * result = malloc(size); - //size - if (result) - usb_serialize_hub_descriptor(descriptor, result); - return result; -} - -/** - * serialize descriptor into given buffer - * - * The buffer size is not checked. - * @param descriptor - * @param serialized_descriptor - */ -void usb_serialize_hub_descriptor(usb_hub_descriptor_t *descriptor, - void * serialized_descriptor) { - //base size - uint8_t * sdescriptor = serialized_descriptor; - size_t size = 7; - //variable size according to port count - size_t var_size = (descriptor->ports_count + 7) / 8; - size += 2 * var_size; - //size - sdescriptor[0] = size; - //descriptor type - sdescriptor[1] = USB_DESCTYPE_HUB; - sdescriptor[2] = descriptor->ports_count; - /// @fixme handling of endianness?? - sdescriptor[3] = descriptor->hub_characteristics / 256; - sdescriptor[4] = descriptor->hub_characteristics % 256; - sdescriptor[5] = descriptor->pwr_on_2_good_time; - sdescriptor[6] = descriptor->current_requirement; - - size_t i; - for (i = 0; i < var_size; ++i) { - sdescriptor[7 + i] = descriptor->devices_removable[i]; - } - for (i = 0; i < var_size; ++i) { - sdescriptor[7 + var_size + i] = 255; - } -} - -/*----------------------------------------------------------------------------*/ -/** - * Deserialize descriptor into given pointer - * - * @param serialized_descriptor - * @param descriptor - * @return - */ -int usb_deserialize_hub_desriptor( - void *serialized_descriptor, size_t size, usb_hub_descriptor_t *descriptor) -{ - uint8_t * sdescriptor = serialized_descriptor; - - if (sdescriptor[1] != USB_DESCTYPE_HUB) { - usb_log_error("Trying to deserialize wrong descriptor %x\n", - sdescriptor[1]); - return EINVAL; - } - if (size < 7) { - usb_log_error("Serialized descriptor too small.\n"); - return EOVERFLOW; - } - - descriptor->ports_count = sdescriptor[2]; - descriptor->hub_characteristics = sdescriptor[3] + 256 * sdescriptor[4]; - descriptor->pwr_on_2_good_time = sdescriptor[5]; - descriptor->current_requirement = sdescriptor[6]; - const size_t var_size = (descriptor->ports_count + 7) / 8; - //descriptor->devices_removable = (uint8_t*) malloc(var_size); - - if (size < (7 + var_size)) { - usb_log_error("Serialized descriptor too small.\n"); - return EOVERFLOW; - } - size_t i = 0; - for (; i < var_size; ++i) { - descriptor->devices_removable[i] = sdescriptor[7 + i]; - } - return EOK; -} -/*----------------------------------------------------------------------------*/ -/** - * @} - */ Index: uspace/drv/bus/usb/usbmast/main.c =================================================================== --- uspace/drv/bus/usb/usbmast/main.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/drv/bus/usb/usbmast/main.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -94,9 +94,8 @@ /* Allocate softstate */ - mdev = calloc(1, sizeof(usbmast_dev_t)); + mdev = ddf_dev_data_alloc(dev->ddf_dev, sizeof(usbmast_dev_t)); if (mdev == NULL) { usb_log_error("Failed allocating softstate.\n"); - rc = ENOMEM; - goto error; + return ENOMEM; } @@ -125,6 +124,4 @@ error: /* XXX Destroy functions */ - if (mdev != NULL) - free(mdev); return rc; } @@ -158,8 +155,6 @@ } - free(fun_name); - /* Allocate soft state */ - mfun = ddf_dev_data_alloc(mdev->ddf_dev, sizeof(usbmast_fun_t)); + mfun = ddf_fun_data_alloc(fun, sizeof(usbmast_fun_t)); if (mfun == NULL) { usb_log_error("Failed allocating softstate.\n"); @@ -171,9 +166,6 @@ mfun->lun = lun; - fun_name = NULL; - /* Set up a connection handler. */ fun->conn_handler = usbmast_bd_connection; - fun->driver_data = mfun; usb_log_debug("Inquire...\n"); @@ -219,4 +211,6 @@ goto error; } + + free(fun_name); return EOK; Index: uspace/drv/infrastructure/rootvirt/devices.def =================================================================== --- uspace/drv/infrastructure/rootvirt/devices.def (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/drv/infrastructure/rootvirt/devices.def (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -4,5 +4,13 @@ * Unless the list is empty, the last item shall be followed by a comma. */ + +/* Loopback network interface */ +{ + .name = "lo", + .match_id = "virtual&loopback" +}, + #ifdef CONFIG_TEST_DRIVERS + { .name = "test1", @@ -25,6 +33,9 @@ .match_id = "virtual&test3" }, + #endif + #ifdef CONFIG_RUN_VIRTUAL_USB_HC + /* Virtual USB host controller. */ { @@ -32,3 +43,4 @@ .match_id = "usb&hc=vhc" }, + #endif Index: uspace/drv/nic/lo/Makefile =================================================================== --- uspace/drv/nic/lo/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/nic/lo/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2011 Radim Vansa +# 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 $(LIBNET_PREFIX)/libnet.a $(LIBNIC_PREFIX)/libnic.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNET_PREFIX)/include -I$(LIBNIC_PREFIX)/include +BINARY = lo + +SOURCES = \ + lo.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/nic/lo/lo.c =================================================================== --- uspace/drv/nic/lo/lo.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/nic/lo/lo.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,139 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup drv_lo + * @brief Loopback virtual device driver + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +#include + +#define NAME "lo" + +static nic_address_t lo_addr = { + .address = {0, 0, 0, 0, 0, 0} +}; + +static ddf_dev_ops_t lo_dev_ops; + +static nic_device_info_t lo_info = { + .vendor_name = "HelenOS", + .model_name = "loopback", + .part_number = "N/A (virtual device)", + .serial_number = "N/A (virtual device)" +}; + +static void lo_write_packet(nic_t *nic_data, packet_t *packet) +{ + nic_report_send_ok(nic_data, 1, packet_get_data_length(packet)); + nic_received_noneth_packet(nic_data, packet); +} + +static int lo_set_address(ddf_fun_t *fun, const nic_address_t *address) +{ + printf("%s: Set loopback HW to " PRIMAC "\n", NAME, + ARGSMAC(address->address)); + return ENOTSUP; +} + +static int lo_get_device_info(ddf_fun_t *fun, nic_device_info_t *info) +{ + assert(info); + memcpy(info, &lo_info, sizeof(nic_device_info_t)); + return EOK; +} + +static int lo_add_device(ddf_dev_t *dev) +{ + nic_t *nic_data = nic_create_and_bind(dev); + if (nic_data == NULL) { + printf("%s: Failed to initialize\n", NAME); + return ENOMEM; + } + + dev->driver_data = nic_data; + nic_set_write_packet_handler(nic_data, lo_write_packet); + + int rc = nic_connect_to_services(nic_data); + if (rc != EOK) { + printf("%s: Failed to connect to services\n", NAME); + nic_unbind_and_destroy(dev); + return rc; + } + + rc = nic_register_as_ddf_fun(nic_data, &lo_dev_ops); + if (rc != EOK) { + printf("%s: Failed to register as DDF function\n", NAME); + nic_unbind_and_destroy(dev); + return rc; + } + + rc = nic_report_address(nic_data, &lo_addr); + if (rc != EOK) { + printf("%s: Failed to setup loopback address\n", NAME); + nic_unbind_and_destroy(dev); + return rc; + } + + printf("%s: Adding loopback device '%s'\n", NAME, dev->name); + return EOK; +} + +static nic_iface_t lo_nic_iface; + +static driver_ops_t lo_driver_ops = { + .add_device = lo_add_device, +}; + +static driver_t lo_driver = { + .name = NAME, + .driver_ops = &lo_driver_ops +}; + +int main(int argc, char *argv[]) +{ + nic_driver_init(NAME); + nic_driver_implement(&lo_driver_ops, &lo_dev_ops, &lo_nic_iface); + lo_nic_iface.set_address = lo_set_address; + lo_nic_iface.get_device_info = lo_get_device_info; + + return ddf_driver_main(&lo_driver); +} + +/** @} + */ Index: uspace/drv/nic/lo/lo.ma =================================================================== --- uspace/drv/nic/lo/lo.ma (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/nic/lo/lo.ma (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,1 @@ +10 virtual&loopback Index: uspace/drv/nic/ne2k/Makefile =================================================================== --- uspace/drv/nic/ne2k/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/nic/ne2k/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,38 @@ +# +# Copyright (c) 2011 Radim Vansa +# 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 $(LIBNET_PREFIX)/libnet.a $(LIBNIC_PREFIX)/libnic.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNET_PREFIX)/include -I$(LIBNIC_PREFIX)/include +BINARY = ne2k + +SOURCES = \ + dp8390.c \ + ne2k.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/nic/ne2k/dp8390.c =================================================================== --- uspace/drv/nic/ne2k/dp8390.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/nic/ne2k/dp8390.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,677 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Martin Decky + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/* + * This code is based upon the NE2000 driver for MINIX, + * distributed according to a BSD-style license. + * + * Copyright (c) 1987, 1997, 2006 Vrije Universiteit + * Copyright (c) 1992, 1994 Philip Homburg + * Copyright (c) 1996 G. Falzoni + * + */ + +/** + * @addtogroup drv_ne2k + * @{ + */ + +/** + * @file + * @brief NE2000 driver core + * + * NE2000 (based on DP8390) network interface core implementation. + * Only the basic NE2000 PIO (ISA) interface is supported, remote + * DMA is completely absent from this code for simplicity. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include "dp8390.h" + +/** Page size */ +#define DP_PAGE 256 + +/** 6 * DP_PAGE >= 1514 bytes */ +#define SQ_PAGES 6 + +/** Type definition of the receive header + * + */ +typedef struct { + /** Copy of RSR */ + uint8_t status; + + /** Pointer to next packet */ + uint8_t next; + + /** Receive Byte Count Low */ + uint8_t rbcl; + + /** Receive Byte Count High */ + uint8_t rbch; +} recv_header_t; + +/** Read a memory block word by word. + * + * @param[in] port Source address. + * @param[out] buf Destination buffer. + * @param[in] size Memory block size in bytes. + * + */ +static void pio_read_buf_16(void *port, void *buf, size_t size) +{ + size_t i; + + for (i = 0; (i << 1) < size; i++) + *((uint16_t *) buf + i) = pio_read_16((ioport16_t *) (port)); +} + +/** Write a memory block word by word. + * + * @param[in] port Destination address. + * @param[in] buf Source buffer. + * @param[in] size Memory block size in bytes. + * + */ +static void pio_write_buf_16(void *port, void *buf, size_t size) +{ + size_t i; + + for (i = 0; (i << 1) < size; i++) + pio_write_16((ioport16_t *) port, *((uint16_t *) buf + i)); +} + +static void ne2k_download(ne2k_t *ne2k, void *buf, size_t addr, size_t size) +{ + size_t esize = size & ~1; + + pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff); + pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff); + pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff); + pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff); + pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); + + if (esize != 0) { + pio_read_buf_16(ne2k->data_port, buf, esize); + size -= esize; + buf += esize; + } + + if (size) { + assert(size == 1); + + uint16_t word = pio_read_16(ne2k->data_port); + memcpy(buf, &word, 1); + } +} + +static void ne2k_upload(ne2k_t *ne2k, void *buf, size_t addr, size_t size) +{ + size_t esize = size & ~1; + + pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff); + pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff); + pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff); + pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff); + pio_write_8(ne2k->port + DP_CR, CR_DM_RW | CR_PS_P0 | CR_STA); + + if (esize != 0) { + pio_write_buf_16(ne2k->data_port, buf, esize); + size -= esize; + buf += esize; + } + + if (size) { + assert(size == 1); + + uint16_t word = 0; + + memcpy(&word, buf, 1); + pio_write_16(ne2k->data_port, word); + } +} + +static void ne2k_init(ne2k_t *ne2k) +{ + unsigned int i; + + /* Reset the ethernet card */ + uint8_t val = pio_read_8(ne2k->port + NE2K_RESET); + usleep(2000); + pio_write_8(ne2k->port + NE2K_RESET, val); + usleep(2000); + + /* Reset the DP8390 */ + pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); + for (i = 0; i < NE2K_RETRY; i++) { + if (pio_read_8(ne2k->port + DP_ISR) != 0) + break; + } +} + +/** Probe and initialize the network interface. + * + * @param[in,out] ne2k Network interface structure. + * @param[in] port Device address. + * @param[in] irq Device interrupt vector. + * + * @return EOK on success. + * @return EXDEV if the network interface was not recognized. + * + */ +int ne2k_probe(ne2k_t *ne2k) +{ + unsigned int i; + + ne2k_init(ne2k); + + /* Check if the DP8390 is really there */ + uint8_t val = pio_read_8(ne2k->port + DP_CR); + if ((val & (CR_STP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT)) + return EXDEV; + + /* Disable the receiver and init TCR and DCR */ + pio_write_8(ne2k->port + DP_RCR, RCR_MON); + pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); + pio_write_8(ne2k->port + DP_DCR, DCR_WORDWIDE | DCR_8BYTES | DCR_BMS); + + /* Setup a transfer to get the MAC address */ + pio_write_8(ne2k->port + DP_RBCR0, ETH_ADDR << 1); + pio_write_8(ne2k->port + DP_RBCR1, 0); + pio_write_8(ne2k->port + DP_RSAR0, 0); + pio_write_8(ne2k->port + DP_RSAR1, 0); + pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); + + for (i = 0; i < ETH_ADDR; i++) + ne2k->mac.address[i] = pio_read_16(ne2k->data_port); + + return EOK; +} + +void ne2k_set_physical_address(ne2k_t *ne2k, const nic_address_t *address) +{ + memcpy(&ne2k->mac, address, sizeof(nic_address_t)); + + pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STP); + + pio_write_8(ne2k->port + DP_RBCR0, ETH_ADDR << 1); + pio_write_8(ne2k->port + DP_RBCR1, 0); + pio_write_8(ne2k->port + DP_RSAR0, 0); + pio_write_8(ne2k->port + DP_RSAR1, 0); + pio_write_8(ne2k->port + DP_CR, CR_DM_RW | CR_PS_P0 | CR_STA); + + size_t i; + for (i = 0; i < ETH_ADDR; i++) + pio_write_16(ne2k->data_port, ne2k->mac.address[i]); + + //pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STA); +} + +/** Start the network interface. + * + * @param[in,out] ne2k Network interface structure. + * + * @return EOK on success. + * @return EXDEV if the network interface is disabled. + * + */ +int ne2k_up(ne2k_t *ne2k) +{ + if (!ne2k->probed) + return EXDEV; + + ne2k_init(ne2k); + + /* + * Setup send queue. Use the first + * SQ_PAGES of NE2000 memory for the send + * buffer. + */ + ne2k->sq.dirty = false; + ne2k->sq.page = NE2K_START / DP_PAGE; + fibril_mutex_initialize(&ne2k->sq_mutex); + fibril_condvar_initialize(&ne2k->sq_cv); + + /* + * Setup receive ring buffer. Use all the rest + * of the NE2000 memory (except the first SQ_PAGES + * reserved for the send buffer) for the receive + * ring buffer. + */ + ne2k->start_page = ne2k->sq.page + SQ_PAGES; + ne2k->stop_page = ne2k->sq.page + NE2K_SIZE / DP_PAGE; + + /* + * Initialization of the DP8390 following the mandatory procedure + * in reference manual ("DP8390D/NS32490D NIC Network Interface + * Controller", National Semiconductor, July 1995, Page 29). + */ + + /* Step 1: */ + pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STP | CR_DM_ABORT); + + /* Step 2: */ + pio_write_8(ne2k->port + DP_DCR, DCR_WORDWIDE | DCR_8BYTES | DCR_BMS); + + /* Step 3: */ + pio_write_8(ne2k->port + DP_RBCR0, 0); + pio_write_8(ne2k->port + DP_RBCR1, 0); + + /* Step 4: */ + pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration); + + /* Step 5: */ + pio_write_8(ne2k->port + DP_TCR, TCR_INTERNAL); + + /* Step 6: */ + pio_write_8(ne2k->port + DP_BNRY, ne2k->start_page); + pio_write_8(ne2k->port + DP_PSTART, ne2k->start_page); + pio_write_8(ne2k->port + DP_PSTOP, ne2k->stop_page); + + /* Step 7: */ + pio_write_8(ne2k->port + DP_ISR, 0xff); + + /* Step 8: */ + pio_write_8(ne2k->port + DP_IMR, + IMR_PRXE | IMR_PTXE | IMR_RXEE | IMR_TXEE | IMR_OVWE | IMR_CNTE); + + /* Step 9: */ + pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_DM_ABORT | CR_STP); + + pio_write_8(ne2k->port + DP_PAR0, ne2k->mac.address[0]); + pio_write_8(ne2k->port + DP_PAR1, ne2k->mac.address[1]); + pio_write_8(ne2k->port + DP_PAR2, ne2k->mac.address[2]); + pio_write_8(ne2k->port + DP_PAR3, ne2k->mac.address[3]); + pio_write_8(ne2k->port + DP_PAR4, ne2k->mac.address[4]); + pio_write_8(ne2k->port + DP_PAR5, ne2k->mac.address[5]); + + pio_write_8(ne2k->port + DP_MAR0, 0); + pio_write_8(ne2k->port + DP_MAR1, 0); + pio_write_8(ne2k->port + DP_MAR2, 0); + pio_write_8(ne2k->port + DP_MAR3, 0); + pio_write_8(ne2k->port + DP_MAR4, 0); + pio_write_8(ne2k->port + DP_MAR5, 0); + pio_write_8(ne2k->port + DP_MAR6, 0); + pio_write_8(ne2k->port + DP_MAR7, 0); + + pio_write_8(ne2k->port + DP_CURR, ne2k->start_page + 1); + + /* Step 10: */ + pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STA); + + /* Step 11: */ + pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); + + /* Reset counters by reading */ + pio_read_8(ne2k->port + DP_CNTR0); + pio_read_8(ne2k->port + DP_CNTR1); + pio_read_8(ne2k->port + DP_CNTR2); + + /* Finish the initialization */ + ne2k->up = true; + return EOK; +} + +/** Stop the network interface. + * + * @param[in,out] ne2k Network interface structure. + * + */ +void ne2k_down(ne2k_t *ne2k) +{ + if ((ne2k->probed) && (ne2k->up)) { + pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); + ne2k_init(ne2k); + ne2k->up = false; + } +} + +static void ne2k_reset(ne2k_t *ne2k) +{ + unsigned int i; + + fibril_mutex_lock(&ne2k->sq_mutex); + + /* Stop the chip */ + pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); + pio_write_8(ne2k->port + DP_RBCR0, 0); + pio_write_8(ne2k->port + DP_RBCR1, 0); + + for (i = 0; i < NE2K_RETRY; i++) { + if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RST) != 0) + break; + } + + pio_write_8(ne2k->port + DP_TCR, TCR_1EXTERNAL | TCR_OFST); + pio_write_8(ne2k->port + DP_CR, CR_STA | CR_DM_ABORT); + pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); + + /* Acknowledge the ISR_RDC (remote DMA) interrupt */ + for (i = 0; i < NE2K_RETRY; i++) { + if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RDC) != 0) + break; + } + + uint8_t val = pio_read_8(ne2k->port + DP_ISR); + pio_write_8(ne2k->port + DP_ISR, val & ~ISR_RDC); + + /* + * Reset the transmit ring. If we were transmitting a frame, + * we pretend that the packet is processed. Higher layers will + * retransmit if the packet wasn't actually sent. + */ + ne2k->sq.dirty = false; + + fibril_mutex_unlock(&ne2k->sq_mutex); +} + +/** Send a frame. + * + * @param[in,out] ne2k Network interface structure. + * @param[in] packet Frame to be sent. + * + */ +void ne2k_send(nic_t *nic_data, packet_t *packet) +{ + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + + assert(ne2k->probed); + assert(ne2k->up); + + fibril_mutex_lock(&ne2k->sq_mutex); + + while (ne2k->sq.dirty) { + fibril_condvar_wait(&ne2k->sq_cv, &ne2k->sq_mutex); + } + void *buf = packet_get_data(packet); + size_t size = packet_get_data_length(packet); + + if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) { + fibril_mutex_unlock(&ne2k->sq_mutex); + return; + } + + /* Upload the frame to the ethernet card */ + ne2k_upload(ne2k, buf, ne2k->sq.page * DP_PAGE, size); + ne2k->sq.dirty = true; + ne2k->sq.size = size; + + /* Initialize the transfer */ + pio_write_8(ne2k->port + DP_TPSR, ne2k->sq.page); + pio_write_8(ne2k->port + DP_TBCR0, size & 0xff); + pio_write_8(ne2k->port + DP_TBCR1, (size >> 8) & 0xff); + pio_write_8(ne2k->port + DP_CR, CR_TXP | CR_STA); + fibril_mutex_unlock(&ne2k->sq_mutex); + + /* Relase packet */ + nic_release_packet(nic_data, packet); +} + +static nic_frame_t *ne2k_receive_frame(nic_t *nic_data, uint8_t page, + size_t length) +{ + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + + nic_frame_t *frame = nic_alloc_frame(nic_data, length); + if (frame == NULL) + return NULL; + + void *buf = packet_suffix(frame->packet, length); + bzero(buf, length); + uint8_t last = page + length / DP_PAGE; + + if (last >= ne2k->stop_page) { + size_t left = (ne2k->stop_page - page) * DP_PAGE + - sizeof(recv_header_t); + ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t), + left); + ne2k_download(ne2k, buf + left, ne2k->start_page * DP_PAGE, + length - left); + } else { + ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t), + length); + } + return frame; +} + +static void ne2k_receive(nic_t *nic_data) +{ + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + /* + * Allocate memory for the list of received frames. + * If the allocation fails here we still receive the + * frames from the network, but they will be lost. + */ + nic_frame_list_t *frames = nic_alloc_frame_list(); + size_t frames_count = 0; + + /* We may block sending in this loop - after so many received frames there + * must be some interrupt pending (for the frames not yet downloaded) and + * we will continue in its handler. */ + while (frames_count < 16) { + //TODO: isn't some locking necessary here? + uint8_t boundary = pio_read_8(ne2k->port + DP_BNRY) + 1; + + if (boundary == ne2k->stop_page) + boundary = ne2k->start_page; + + pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_STA); + uint8_t current = pio_read_8(ne2k->port + DP_CURR); + pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STA); + if (current == boundary) + /* No more frames to process */ + break; + + recv_header_t header; + size_t size = sizeof(header); + size_t offset = boundary * DP_PAGE; + + /* Get the frame header */ + pio_write_8(ne2k->port + DP_RBCR0, size & 0xff); + pio_write_8(ne2k->port + DP_RBCR1, (size >> 8) & 0xff); + pio_write_8(ne2k->port + DP_RSAR0, offset & 0xff); + pio_write_8(ne2k->port + DP_RSAR1, (offset >> 8) & 0xff); + pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); + + pio_read_buf_16(ne2k->data_port, (void *) &header, size); + + size_t length = + (((size_t) header.rbcl) | (((size_t) header.rbch) << 8)) - size; + uint8_t next = header.next; + + if ((length < ETH_MIN_PACK_SIZE) + || (length > ETH_MAX_PACK_SIZE_TAGGED)) { + next = current; + } else if ((header.next < ne2k->start_page) + || (header.next > ne2k->stop_page)) { + next = current; + } else if (header.status & RSR_FO) { + /* + * This is very serious, so we issue a warning and + * reset the buffers. + */ + ne2k->overruns++; + next = current; + } else if ((header.status & RSR_PRX) && (ne2k->up)) { + if (frames != NULL) { + nic_frame_t *frame = + ne2k_receive_frame(nic_data, boundary, length); + if (frame != NULL) { + nic_frame_list_append(frames, frame); + frames_count++; + } else { + break; + } + } else + break; + } + + /* + * Update the boundary pointer + * to the value of the page + * prior to the next packet to + * be processed. + */ + if (next == ne2k->start_page) + next = ne2k->stop_page - 1; + else + next--; + pio_write_8(ne2k->port + DP_BNRY, next); + } + nic_received_frame_list(nic_data, frames); +} + +void ne2k_interrupt(nic_t *nic_data, uint8_t isr, uint8_t tsr) +{ + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + + if (isr & (ISR_PTX | ISR_TXE)) { + if (tsr & TSR_COL) { + nic_report_collisions(nic_data, + pio_read_8(ne2k->port + DP_NCR) & 15); + } + + if (tsr & TSR_PTX) { + // TODO: fix number of sent bytes (but how?) + nic_report_send_ok(nic_data, 1, 0); + } else if (tsr & TSR_ABT) { + nic_report_send_error(nic_data, NIC_SEC_ABORTED, 1); + } else if (tsr & TSR_CRS) { + nic_report_send_error(nic_data, NIC_SEC_CARRIER_LOST, 1); + } else if (tsr & TSR_FU) { + ne2k->underruns++; + // if (ne2k->underruns < NE2K_ERL) { + // } + } else if (tsr & TSR_CDH) { + nic_report_send_error(nic_data, NIC_SEC_HEARTBEAT, 1); + // if (nic_data->stats.send_heartbeat_errors < NE2K_ERL) { + // } + } else if (tsr & TSR_OWC) { + nic_report_send_error(nic_data, NIC_SEC_WINDOW_ERROR, 1); + } + + fibril_mutex_lock(&ne2k->sq_mutex); + if (ne2k->sq.dirty) { + /* Prepare the buffer for next packet */ + ne2k->sq.dirty = false; + ne2k->sq.size = 0; + + /* Signal a next frame to be sent */ + fibril_condvar_broadcast(&ne2k->sq_cv); + } else { + ne2k->misses++; + // if (ne2k->misses < NE2K_ERL) { + // } + } + fibril_mutex_unlock(&ne2k->sq_mutex); + } + + if (isr & ISR_CNT) { + unsigned int errors; + for (errors = pio_read_8(ne2k->port + DP_CNTR0); errors > 0; --errors) + nic_report_receive_error(nic_data, NIC_REC_CRC, 1); + for (errors = pio_read_8(ne2k->port + DP_CNTR1); errors > 0; --errors) + nic_report_receive_error(nic_data, NIC_REC_FRAME_ALIGNMENT, 1); + for (errors = pio_read_8(ne2k->port + DP_CNTR2); errors > 0; --errors) + nic_report_receive_error(nic_data, NIC_REC_MISSED, 1); + } + if (isr & ISR_PRX) { + ne2k_receive(nic_data); + } + if (isr & ISR_RST) { + /* + * The chip is stopped, and all arrived + * frames are delivered. + */ + ne2k_reset(ne2k); + } + + /* Unmask interrupts to be processed in the next round */ + pio_write_8(ne2k->port + DP_IMR, + IMR_PRXE | IMR_PTXE | IMR_RXEE | IMR_TXEE | IMR_OVWE | IMR_CNTE); +} + +void ne2k_set_accept_bcast(ne2k_t *ne2k, int accept) +{ + if (accept) + ne2k->receive_configuration |= RCR_AB; + else + ne2k->receive_configuration &= ~RCR_AB; + + pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration); +} + +void ne2k_set_accept_mcast(ne2k_t *ne2k, int accept) +{ + if (accept) + ne2k->receive_configuration |= RCR_AM; + else + ne2k->receive_configuration &= ~RCR_AM; + + pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration); +} + +void ne2k_set_promisc_phys(ne2k_t *ne2k, int promisc) +{ + if (promisc) + ne2k->receive_configuration |= RCR_PRO; + else + ne2k->receive_configuration &= ~RCR_PRO; + + pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration); +} + +void ne2k_set_mcast_hash(ne2k_t *ne2k, uint64_t hash) +{ + /* Select Page 1 and stop all transfers */ + pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_DM_ABORT | CR_STP); + + pio_write_8(ne2k->port + DP_MAR0, (uint8_t) hash); + pio_write_8(ne2k->port + DP_MAR1, (uint8_t) (hash >> 8)); + pio_write_8(ne2k->port + DP_MAR2, (uint8_t) (hash >> 16)); + pio_write_8(ne2k->port + DP_MAR3, (uint8_t) (hash >> 24)); + pio_write_8(ne2k->port + DP_MAR4, (uint8_t) (hash >> 32)); + pio_write_8(ne2k->port + DP_MAR5, (uint8_t) (hash >> 40)); + pio_write_8(ne2k->port + DP_MAR6, (uint8_t) (hash >> 48)); + pio_write_8(ne2k->port + DP_MAR7, (uint8_t) (hash >> 56)); + + /* Select Page 0 and resume transfers */ + pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STA); +} + +/** @} + */ Index: uspace/drv/nic/ne2k/dp8390.h =================================================================== --- uspace/drv/nic/ne2k/dp8390.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/nic/ne2k/dp8390.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,277 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Martin Decky + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/* + * This code is based upon the NE2000 driver for MINIX, + * distributed according to a BSD-style license. + * + * Copyright (c) 1987, 1997, 2006 Vrije Universiteit + * Copyright (c) 1992, 1994 Philip Homburg + * Copyright (c) 1996 G. Falzoni + * + */ + +/** @addtogroup drv_ne2k + * @{ + */ + +/** @file + * DP8390 network interface definitions. + */ + +#ifndef __NET_NETIF_DP8390_H__ +#define __NET_NETIF_DP8390_H__ + +#include +#include +#include + +/** Input/output size */ +#define NE2K_IO_SIZE 0x0020 + +/* NE2000 implementation. */ + +/** NE2000 Data Register */ +#define NE2K_DATA 0x0010 + +/** NE2000 Reset register */ +#define NE2K_RESET 0x001f + +/** NE2000 data start */ +#define NE2K_START 0x4000 + +/** NE2000 data size */ +#define NE2K_SIZE 0x4000 + +/** NE2000 retry count */ +#define NE2K_RETRY 0x1000 + +/** NE2000 error messages rate limiting */ +#define NE2K_ERL 10 + +/** Minimum Ethernet packet size in bytes */ +#define ETH_MIN_PACK_SIZE 60 + +/** Maximum Ethernet packet size in bytes */ +#define ETH_MAX_PACK_SIZE_TAGGED 1518 + +/* National Semiconductor DP8390 Network Interface Controller. */ + +/** Page 0, for reading */ +#define DP_CR 0x00 /**< Command Register */ +#define DP_CLDA0 0x01 /**< Current Local DMA Address 0 */ +#define DP_CLDA1 0x02 /**< Current Local DMA Address 1 */ +#define DP_BNRY 0x03 /**< Boundary Pointer */ +#define DP_TSR 0x04 /**< Transmit Status Register */ +#define DP_NCR 0x05 /**< Number of Collisions Register */ +#define DP_FIFO 0x06 /**< FIFO */ +#define DP_ISR 0x07 /**< Interrupt Status Register */ +#define DP_CRDA0 0x08 /**< Current Remote DMA Address 0 */ +#define DP_CRDA1 0x09 /**< Current Remote DMA Address 1 */ +#define DP_RSR 0x0c /**< Receive Status Register */ +#define DP_CNTR0 0x0d /**< Tally Counter 0 */ +#define DP_CNTR1 0x0e /**< Tally Counter 1 */ +#define DP_CNTR2 0x0f /**< Tally Counter 2 */ + +/** Page 0, for writing */ +#define DP_PSTART 0x01 /**< Page Start Register*/ +#define DP_PSTOP 0x02 /**< Page Stop Register */ +#define DP_TPSR 0x04 /**< Transmit Page Start Register */ +#define DP_TBCR0 0x05 /**< Transmit Byte Count Register 0 */ +#define DP_TBCR1 0x06 /**< Transmit Byte Count Register 1 */ +#define DP_RSAR0 0x08 /**< Remote Start Address Register 0 */ +#define DP_RSAR1 0x09 /**< Remote Start Address Register 1 */ +#define DP_RBCR0 0x0a /**< Remote Byte Count Register 0 */ +#define DP_RBCR1 0x0b /**< Remote Byte Count Register 1 */ +#define DP_RCR 0x0c /**< Receive Configuration Register */ +#define DP_TCR 0x0d /**< Transmit Configuration Register */ +#define DP_DCR 0x0e /**< Data Configuration Register */ +#define DP_IMR 0x0f /**< Interrupt Mask Register */ + +/** Page 1, read/write */ +#define DP_PAR0 0x01 /**< Physical Address Register 0 */ +#define DP_PAR1 0x02 /**< Physical Address Register 1 */ +#define DP_PAR2 0x03 /**< Physical Address Register 2 */ +#define DP_PAR3 0x04 /**< Physical Address Register 3 */ +#define DP_PAR4 0x05 /**< Physical Address Register 4 */ +#define DP_PAR5 0x06 /**< Physical Address Register 5 */ +#define DP_CURR 0x07 /**< Current Page Register */ +#define DP_MAR0 0x08 /**< Multicast Address Register 0 */ +#define DP_MAR1 0x09 /**< Multicast Address Register 1 */ +#define DP_MAR2 0x0a /**< Multicast Address Register 2 */ +#define DP_MAR3 0x0b /**< Multicast Address Register 3 */ +#define DP_MAR4 0x0c /**< Multicast Address Register 4 */ +#define DP_MAR5 0x0d /**< Multicast Address Register 5 */ +#define DP_MAR6 0x0e /**< Multicast Address Register 6 */ +#define DP_MAR7 0x0f /**< Multicast Address Register 7 */ + +/* Bits in Command Register */ +#define CR_STP 0x01 /**< Stop (software reset) */ +#define CR_STA 0x02 /**< Start (activate NIC) */ +#define CR_TXP 0x04 /**< Transmit Packet */ +#define CR_DMA 0x38 /**< Mask for DMA control */ +#define CR_DM_NOP 0x00 /**< DMA: No Operation */ +#define CR_DM_RR 0x08 /**< DMA: Remote Read */ +#define CR_DM_RW 0x10 /**< DMA: Remote Write */ +#define CR_DM_SP 0x18 /**< DMA: Send Packet */ +#define CR_DM_ABORT 0x20 /**< DMA: Abort Remote DMA Operation */ +#define CR_PS 0xc0 /**< Mask for Page Select */ +#define CR_PS_P0 0x00 /**< Register Page 0 */ +#define CR_PS_P1 0x40 /**< Register Page 1 */ +#define CR_PS_P2 0x80 /**< Register Page 2 */ +#define CR_PS_T1 0xc0 /**< Test Mode Register Map */ + +/* Bits in Interrupt State Register */ +#define ISR_PRX 0x01 /**< Packet Received with no errors */ +#define ISR_PTX 0x02 /**< Packet Transmitted with no errors */ +#define ISR_RXE 0x04 /**< Receive Error */ +#define ISR_TXE 0x08 /**< Transmit Error */ +#define ISR_OVW 0x10 /**< Overwrite Warning */ +#define ISR_CNT 0x20 /**< Counter Overflow */ +#define ISR_RDC 0x40 /**< Remote DMA Complete */ +#define ISR_RST 0x80 /**< Reset Status */ + +/* Bits in Interrupt Mask Register */ +#define IMR_PRXE 0x01 /**< Packet Received Interrupt Enable */ +#define IMR_PTXE 0x02 /**< Packet Transmitted Interrupt Enable */ +#define IMR_RXEE 0x04 /**< Receive Error Interrupt Enable */ +#define IMR_TXEE 0x08 /**< Transmit Error Interrupt Enable */ +#define IMR_OVWE 0x10 /**< Overwrite Warning Interrupt Enable */ +#define IMR_CNTE 0x20 /**< Counter Overflow Interrupt Enable */ +#define IMR_RDCE 0x40 /**< DMA Complete Interrupt Enable */ + +/* Bits in Data Configuration Register */ +#define DCR_WTS 0x01 /**< Word Transfer Select */ +#define DCR_BYTEWIDE 0x00 /**< WTS: byte wide transfers */ +#define DCR_WORDWIDE 0x01 /**< WTS: word wide transfers */ +#define DCR_BOS 0x02 /**< Byte Order Select */ +#define DCR_LTLENDIAN 0x00 /**< BOS: Little Endian */ +#define DCR_BIGENDIAN 0x02 /**< BOS: Big Endian */ +#define DCR_LAS 0x04 /**< Long Address Select */ +#define DCR_BMS 0x08 /**< Burst Mode Select */ +#define DCR_AR 0x10 /**< Autoinitialize Remote */ +#define DCR_FTS 0x60 /**< Fifo Threshold Select */ +#define DCR_2BYTES 0x00 /**< 2 bytes */ +#define DCR_4BYTES 0x40 /**< 4 bytes */ +#define DCR_8BYTES 0x20 /**< 8 bytes */ +#define DCR_12BYTES 0x60 /**< 12 bytes */ + +/* Bits in Transmit Configuration Register */ +#define TCR_CRC 0x01 /**< Inhibit CRC */ +#define TCR_ELC 0x06 /**< Encoded Loopback Control */ +#define TCR_NORMAL 0x00 /**< ELC: Normal Operation */ +#define TCR_INTERNAL 0x02 /**< ELC: Internal Loopback */ +#define TCR_0EXTERNAL 0x04 /**< ELC: External Loopback LPBK=0 */ +#define TCR_1EXTERNAL 0x06 /**< ELC: External Loopback LPBK=1 */ +#define TCR_ATD 0x08 /**< Auto Transmit Disable */ +#define TCR_OFST 0x10 /**< Collision Offset Enable (be nice) */ + +/* Bits in Interrupt Status Register */ +#define TSR_PTX 0x01 /**< Packet Transmitted (without error) */ +#define TSR_DFR 0x02 /**< Transmit Deferred (reserved) */ +#define TSR_COL 0x04 /**< Transmit Collided */ +#define TSR_ABT 0x08 /**< Transmit Aborted */ +#define TSR_CRS 0x10 /**< Carrier Sense Lost */ +#define TSR_FU 0x20 /**< FIFO Underrun */ +#define TSR_CDH 0x40 /**< CD Heartbeat */ +#define TSR_OWC 0x80 /**< Out of Window Collision */ + +/* Bits in Receive Configuration Register */ +#define RCR_SEP 0x01 /**< Save Errored Packets */ +#define RCR_AR 0x02 /**< Accept Runt Packets */ +#define RCR_AB 0x04 /**< Accept Broadcast */ +#define RCR_AM 0x08 /**< Accept Multicast */ +#define RCR_PRO 0x10 /**< Physical Promiscuous */ +#define RCR_MON 0x20 /**< Monitor Mode */ + +/* Bits in Receive Status Register */ +#define RSR_PRX 0x01 /**< Packet Received Intact */ +#define RSR_CRC 0x02 /**< CRC Error */ +#define RSR_FAE 0x04 /**< Frame Alignment Error */ +#define RSR_FO 0x08 /**< FIFO Overrun */ +#define RSR_MPA 0x10 /**< Missed Packet */ +#define RSR_PHY 0x20 /**< Multicast Address Match */ +#define RSR_DIS 0x40 /**< Receiver Disabled */ +#define RSR_DFR 0x80 /**< In later manuals: Deferring */ + +typedef struct { + /* Device configuration */ + void *base_port; /**< Port assigned from ISA configuration **/ + void *port; + void *data_port; + int irq; + nic_address_t mac; + + uint8_t start_page; /**< Ring buffer start page */ + uint8_t stop_page; /**< Ring buffer stop page */ + + /* Send queue */ + struct { + bool dirty; /**< Buffer contains a packet */ + size_t size; /**< Packet size */ + uint8_t page; /**< Starting page of the buffer */ + } sq; + fibril_mutex_t sq_mutex; + fibril_condvar_t sq_cv; + + /* Driver run-time variables */ + bool probed; + bool up; + + /* Irq code with assigned addresses for this device */ + irq_code_t code; + + /* Copy of the receive configuration register */ + uint8_t receive_configuration; + + /* Device statistics */ + // TODO: shouldn't be these directly in device.h - nic_device_stats? + uint64_t misses; /**< Receive frame misses */ + uint64_t underruns; /**< FIFO underruns */ + uint64_t overruns; /**< FIFO overruns */ +} ne2k_t; + +extern int ne2k_probe(ne2k_t *); +extern int ne2k_up(ne2k_t *); +extern void ne2k_down(ne2k_t *); +extern void ne2k_send(nic_t *, packet_t *); +extern void ne2k_interrupt(nic_t *, uint8_t, uint8_t); +extern packet_t *ne2k_alloc_packet(nic_t *, size_t); + +extern void ne2k_set_accept_mcast(ne2k_t *, int); +extern void ne2k_set_accept_bcast(ne2k_t *, int); +extern void ne2k_set_promisc_phys(ne2k_t *, int); +extern void ne2k_set_mcast_hash(ne2k_t *, uint64_t); +extern void ne2k_set_physical_address(ne2k_t *, const nic_address_t *address); + +#endif + +/** @} + */ Index: uspace/drv/nic/ne2k/ne2k.c =================================================================== --- uspace/drv/nic/ne2k/ne2k.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/nic/ne2k/ne2k.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,410 @@ +/* + * Copyright (c) 2011 Martin Decky + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup drv_ne2k + * @brief Novell NE2000 NIC driver + * @{ + */ +/** + * @file + * @brief Bridge between NICF, DDF and business logic for the NIC + */ + +#include +#include +#include +#include +#include +#include "dp8390.h" + +#define NAME "ne2k" + +/** Return the ISR from the interrupt call. + * + * @param[in] call The interrupt call. + * + */ +#define IRQ_GET_ISR(call) ((int) IPC_GET_ARG2(call)) + +/** Return the TSR from the interrupt call. + * + * @param[in] call The interrupt call. + * + */ +#define IRQ_GET_TSR(call) ((int) IPC_GET_ARG3(call)) + +#define DRIVER_DATA(dev) ((nic_t *) ((dev)->driver_data)) +#define NE2K(device) ((ne2k_t *) nic_get_specific(DRIVER_DATA(device))) + +/** NE2000 kernel interrupt command sequence. + * + */ +static irq_cmd_t ne2k_cmds_prototype[] = { + { + /* Read Interrupt Status Register */ + .cmd = CMD_PIO_READ_8, + .addr = NULL, + .dstarg = 2 + }, + { + /* Mask supported interrupt causes */ + .cmd = CMD_BTEST, + .value = (ISR_PRX | ISR_PTX | ISR_RXE | ISR_TXE | ISR_OVW | + ISR_CNT | ISR_RDC), + .srcarg = 2, + .dstarg = 3, + }, + { + /* Predicate for accepting the interrupt */ + .cmd = CMD_PREDICATE, + .value = 4, + .srcarg = 3 + }, + { + /* + * Mask future interrupts via + * Interrupt Mask Register + */ + .cmd = CMD_PIO_WRITE_8, + .addr = NULL, + .value = 0 + }, + { + /* Acknowledge the current interrupt */ + .cmd = CMD_PIO_WRITE_A_8, + .addr = NULL, + .srcarg = 3 + }, + { + /* Read Transmit Status Register */ + .cmd = CMD_PIO_READ_8, + .addr = NULL, + .dstarg = 3 + }, + { + .cmd = CMD_ACCEPT + } +}; + +static void ne2k_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid, + ipc_call_t *call); + +static int ne2k_register_interrupt(nic_t *nic_data) +{ + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + + if (ne2k->code.cmdcount == 0) { + irq_cmd_t *ne2k_cmds = malloc(sizeof(ne2k_cmds_prototype)); + if (ne2k_cmds == NULL) { + return ENOMEM; + } + memcpy(ne2k_cmds, ne2k_cmds_prototype, sizeof (ne2k_cmds_prototype)); + ne2k_cmds[0].addr = ne2k->port + DP_ISR; + ne2k_cmds[3].addr = ne2k->port + DP_IMR; + ne2k_cmds[4].addr = ne2k_cmds[0].addr; + ne2k_cmds[5].addr = ne2k->port + DP_TSR; + + ne2k->code.cmdcount = sizeof(ne2k_cmds_prototype) / sizeof(irq_cmd_t); + ne2k->code.cmds = ne2k_cmds; + } + + int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data), + ne2k->irq, ne2k_interrupt_handler, &ne2k->code); + return rc; +} + +static ddf_dev_ops_t ne2k_dev_ops; + +static void ne2k_dev_cleanup(ddf_dev_t *dev) +{ + if (dev->driver_data != NULL) { + ne2k_t *ne2k = NE2K(dev); + if (ne2k) { + free(ne2k->code.cmds); + } + nic_unbind_and_destroy(dev); + } + if (dev->parent_sess != NULL) { + async_hangup(dev->parent_sess); + dev->parent_sess = NULL; + } +} + +static int ne2k_dev_init(nic_t *nic_data) +{ + /* Get HW resources */ + hw_res_list_parsed_t hw_res_parsed; + hw_res_list_parsed_init(&hw_res_parsed); + + int rc = nic_get_resources(nic_data, &hw_res_parsed); + + if (rc != EOK) + goto failed; + + if (hw_res_parsed.irqs.count == 0) { + rc = EINVAL; + goto failed; + } + + if (hw_res_parsed.io_ranges.count == 0) { + rc = EINVAL; + goto failed; + } + + if (hw_res_parsed.io_ranges.ranges[0].size < NE2K_IO_SIZE) { + rc = EINVAL; + goto failed; + } + + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + ne2k->irq = hw_res_parsed.irqs.irqs[0]; + + ne2k->base_port = (void *) (uintptr_t) + hw_res_parsed.io_ranges.ranges[0].address; + + hw_res_list_parsed_clean(&hw_res_parsed); + + /* Enable port I/O */ + if (pio_enable(ne2k->base_port, NE2K_IO_SIZE, &ne2k->port) != EOK) + return EADDRNOTAVAIL; + + + ne2k->data_port = ne2k->port + NE2K_DATA; + ne2k->receive_configuration = RCR_AB | RCR_AM; + ne2k->probed = false; + ne2k->up = false; + + /* Find out whether the device is present. */ + if (ne2k_probe(ne2k) != EOK) + return ENOENT; + + ne2k->probed = true; + + rc = ne2k_register_interrupt(nic_data); + if (rc != EOK) + return EINVAL; + + return EOK; + +failed: + hw_res_list_parsed_clean(&hw_res_parsed); + return rc; +} + +void ne2k_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call) +{ + nic_t *nic_data = DRIVER_DATA(dev); + ne2k_interrupt(nic_data, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call)); + + async_answer_0(iid, EOK); +} + +static int ne2k_on_activating(nic_t *nic_data) +{ + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + + if (!ne2k->up) { + int rc = ne2k_up(ne2k); + if (rc != EOK) { + return rc; + } + + nic_enable_interrupt(nic_data, ne2k->irq); + } + return EOK; +} + +static int ne2k_on_stopping(nic_t *nic_data) +{ + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + + nic_disable_interrupt(nic_data, ne2k->irq); + ne2k->receive_configuration = RCR_AB | RCR_AM; + ne2k_down(ne2k); + return EOK; +} + +static int ne2k_set_address(ddf_fun_t *fun, const nic_address_t *address) +{ + nic_t *nic_data = DRIVER_DATA(fun); + int rc = nic_report_address(nic_data, address); + if (rc != EOK) { + return EINVAL; + } + /* Note: some frame with previous physical address may slip to NIL here + * (for a moment the filtering is not exact), but ethernet should be OK with + * that. Some packet may also be lost, but this is not a problem. + */ + ne2k_set_physical_address((ne2k_t *) nic_get_specific(nic_data), address); + return EOK; +} + +static int ne2k_on_unicast_mode_change(nic_t *nic_data, + nic_unicast_mode_t new_mode, + const nic_address_t *address_list, size_t address_count) +{ + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + switch (new_mode) { + case NIC_UNICAST_BLOCKED: + ne2k_set_promisc_phys(ne2k, false); + nic_report_hw_filtering(nic_data, 0, -1, -1); + return EOK; + case NIC_UNICAST_DEFAULT: + ne2k_set_promisc_phys(ne2k, false); + nic_report_hw_filtering(nic_data, 1, -1, -1); + return EOK; + case NIC_UNICAST_LIST: + ne2k_set_promisc_phys(ne2k, true); + nic_report_hw_filtering(nic_data, 0, -1, -1); + return EOK; + case NIC_UNICAST_PROMISC: + ne2k_set_promisc_phys(ne2k, true); + nic_report_hw_filtering(nic_data, 1, -1, -1); + return EOK; + default: + return ENOTSUP; + } +} + +static int ne2k_on_multicast_mode_change(nic_t *nic_data, + nic_multicast_mode_t new_mode, + const nic_address_t *address_list, size_t address_count) +{ + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + switch (new_mode) { + case NIC_MULTICAST_BLOCKED: + ne2k_set_accept_mcast(ne2k, false); + nic_report_hw_filtering(nic_data, -1, 1, -1); + return EOK; + case NIC_MULTICAST_LIST: + ne2k_set_accept_mcast(ne2k, true); + ne2k_set_mcast_hash(ne2k, + nic_mcast_hash(address_list, address_count)); + nic_report_hw_filtering(nic_data, -1, 0, -1); + return EOK; + case NIC_MULTICAST_PROMISC: + ne2k_set_accept_mcast(ne2k, true); + ne2k_set_mcast_hash(ne2k, 0xFFFFFFFFFFFFFFFFllu); + nic_report_hw_filtering(nic_data, -1, 1, -1); + return EOK; + default: + return ENOTSUP; + } +} + +static int ne2k_on_broadcast_mode_change(nic_t *nic_data, + nic_broadcast_mode_t new_mode) +{ + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); + switch (new_mode) { + case NIC_BROADCAST_BLOCKED: + ne2k_set_accept_bcast(ne2k, false); + return EOK; + case NIC_BROADCAST_ACCEPTED: + ne2k_set_accept_bcast(ne2k, true); + return EOK; + default: + return ENOTSUP; + } +} + +static int ne2k_add_device(ddf_dev_t *dev) +{ + /* Allocate driver data for the device. */ + nic_t *nic_data = nic_create_and_bind(dev); + if (nic_data == NULL) + return ENOMEM; + + nic_set_write_packet_handler(nic_data, ne2k_send); + nic_set_state_change_handlers(nic_data, + ne2k_on_activating, NULL, ne2k_on_stopping); + nic_set_filtering_change_handlers(nic_data, + ne2k_on_unicast_mode_change, ne2k_on_multicast_mode_change, + ne2k_on_broadcast_mode_change, NULL, NULL); + + ne2k_t *ne2k = malloc(sizeof(ne2k_t)); + if (NULL != ne2k) { + memset(ne2k, 0, sizeof(ne2k_t)); + nic_set_specific(nic_data, ne2k); + } else { + nic_unbind_and_destroy(dev); + return ENOMEM; + } + + int rc = ne2k_dev_init(nic_data); + if (rc != EOK) { + ne2k_dev_cleanup(dev); + return rc; + } + + rc = nic_report_address(nic_data, &ne2k->mac); + if (rc != EOK) { + ne2k_dev_cleanup(dev); + return rc; + } + + rc = nic_register_as_ddf_fun(nic_data, &ne2k_dev_ops); + if (rc != EOK) { + ne2k_dev_cleanup(dev); + return rc; + } + + rc = nic_connect_to_services(nic_data); + if (rc != EOK) { + ne2k_dev_cleanup(dev); + return rc; + } + + return EOK; +} + +static nic_iface_t ne2k_nic_iface = { + .set_address = ne2k_set_address +}; + +static driver_ops_t ne2k_driver_ops = { + .add_device = ne2k_add_device +}; + +static driver_t ne2k_driver = { + .name = NAME, + .driver_ops = &ne2k_driver_ops +}; + +int main(int argc, char *argv[]) +{ + nic_driver_init(NAME); + nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface); + + return ddf_driver_main(&ne2k_driver); +} + +/** @} + */ Index: uspace/drv/nic/ne2k/ne2k.ma =================================================================== --- uspace/drv/nic/ne2k/ne2k.ma (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/drv/nic/ne2k/ne2k.ma (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,1 @@ +10 isa/ne2k Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -67,5 +67,7 @@ generic/devman.c \ generic/device/hw_res.c \ + generic/device/hw_res_parsed.c \ generic/device/char_dev.c \ + generic/device/nic.c \ generic/elf/elf_load.c \ generic/event.c \ @@ -103,4 +105,5 @@ generic/adt/list.c \ generic/adt/hash_table.c \ + generic/adt/hash_set.c \ generic/adt/dynamic_fifo.c \ generic/adt/measured_strings.c \ Index: uspace/lib/c/generic/adt/hash_set.c =================================================================== --- uspace/lib/c/generic/adt/hash_set.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/c/generic/adt/hash_set.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,382 @@ +/* + * Copyright (c) 2008 Jakub Jermar + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include + +/** Create chained hash set + * + * @param h Hash set structure to be initialized. + * @param[in] hash Hash function + * @param[in] equals Equals function + * @param[in] init_size Initial hash set size + * + * @return True on success + * + */ +int hash_set_init(hash_set_t *h, hash_set_hash hash, hash_set_equals equals, + size_t init_size) +{ + assert(h); + assert(hash); + assert(equals); + + if (init_size < HASH_SET_MIN_SIZE) + init_size = HASH_SET_MIN_SIZE; + + h->table = malloc(init_size * sizeof(link_t)); + if (!h->table) + return false; + + for (size_t i = 0; i < init_size; i++) + list_initialize(&h->table[i]); + + h->size = init_size; + h->count = 0; + h->hash = hash; + h->equals = equals; + + return true; +} + +/** Destroy a hash table instance. + * + * @param h Hash table to be destroyed. + * + */ +void hash_set_destroy(hash_set_t *h) +{ + assert(h); + free(h->table); +} + +/** Rehash the internal table to new table + * + * @param h Original hash set + * @param new_table Memory for the new table + * @param new_size Size of the new table + */ +static void hash_set_rehash(hash_set_t *h, list_t *new_table, + size_t new_size) +{ + assert(new_size >= HASH_SET_MIN_SIZE); + + for (size_t bucket = 0; bucket < new_size; bucket++) + list_initialize(&new_table[bucket]); + + for (size_t bucket = 0; bucket < h->size; bucket++) { + link_t *cur; + link_t *next; + + for (cur = h->table[bucket].head.next; + cur != &h->table[bucket].head; + cur = next) { + next = cur->next; + list_append(cur, &new_table[h->hash(cur) % new_size]); + } + } + + list_t *old_table = h->table; + h->table = new_table; + free(old_table); + h->size = new_size; +} + +/** Insert item into the set. + * + * If the set already contains equivalent object, + * the function fails. + * + * @param h Hash table. + * @param key Array of all keys necessary to compute hash index. + * @param item Item to be inserted into the hash table. + * + * @return True if the object was inserted + * @return Ffalse if the set already contained equivalent object. + * + */ +int hash_set_insert(hash_set_t *h, link_t *item) +{ + assert(item); + assert(h); + assert(h->hash); + assert(h->equals); + + unsigned long hash = h->hash(item); + unsigned long chain = hash % h->size; + + list_foreach(h->table[chain], cur) { + if (h->equals(cur, item)) + return false; + } + + if (h->count + 1 > h->size) { + size_t new_size = h->size * 2; + list_t *temp = malloc(new_size * sizeof(list_t)); + if (temp != NULL) + hash_set_rehash(h, temp, new_size); + + /* + * If the allocation fails, just use the same + * old table and try to rehash next time. + */ + chain = hash % h->size; + } + + h->count++; + list_append(item, &h->table[chain]); + + return true; +} + +/** Search the hash set for a matching object and return it + * + * @param h Hash set + * @param item The item that should equal to the matched object + * + * @return Matching item on success, NULL if there is no such item. + * + */ +link_t *hash_set_find(hash_set_t *h, const link_t *item) +{ + assert(h); + assert(h->hash); + assert(h->equals); + + unsigned long chain = h->hash(item) % h->size; + + list_foreach(h->table[chain], cur) { + if (h->equals(cur, item)) + return cur; + } + + return NULL; +} + +/** Remove first matching object from the hash set and return it + * + * @param h Hash set. + * @param item The item that should be equal to the matched object + * + * @return The removed item or NULL if this is not found. + * + */ +link_t *hash_set_remove(hash_set_t *h, const link_t *item) +{ + assert(h); + assert(h->hash); + assert(h->equals); + + link_t *cur = hash_set_find(h, item); + if (cur) { + list_remove(cur); + + h->count--; + if (4 * h->count < h->size && h->size > HASH_SET_MIN_SIZE) { + size_t new_size = h->size / 2; + if (new_size < HASH_SET_MIN_SIZE) + /* possible e.g. if init_size == HASH_SET_MIN_SIZE + 1 */ + new_size = HASH_SET_MIN_SIZE; + + list_t *temp = malloc(new_size * sizeof (list_t)); + if (temp != NULL) + hash_set_rehash(h, temp, new_size); + } + } + + return cur; +} + +/** Remove all elements for which the function returned non-zero + * + * The function can also destroy the element. + * + * @param h Hash set. + * @param f Function to be applied. + * @param arg Argument to be passed to the function. + * + */ +void hash_set_remove_selected(hash_set_t *h, int (*f)(link_t *, void *), + void *arg) +{ + assert(h); + assert(h->table); + + for (size_t bucket = 0; bucket < h->size; bucket++) { + link_t *prev = &h->table[bucket].head; + link_t *cur; + link_t *next; + + for (cur = h->table[bucket].head.next; + cur != &h->table[bucket].head; + cur = next) { + next = cur->next; + if (f(cur, arg)) { + prev->next = next; + next->prev = prev; + h->count--; + } else + prev = cur; + } + } + + if (4 * h->count < h->size && h->size > HASH_SET_MIN_SIZE) { + size_t new_size = h->size / 2; + if (new_size < HASH_SET_MIN_SIZE) + /* possible e.g. if init_size == HASH_SET_MIN_SIZE + 1 */ + new_size = HASH_SET_MIN_SIZE; + + list_t *temp = malloc(new_size * sizeof (list_t)); + if (temp != NULL) + hash_set_rehash(h, temp, new_size); + } +} + +/** Apply function to all items in hash set + * + * @param h Hash set. + * @param f Function to be applied. + * @param arg Argument to be passed to the function. + * + */ +void hash_set_apply(hash_set_t *h, void (*f)(link_t *, void *), void *arg) +{ + assert(h); + assert(h->table); + + for (size_t bucket = 0; bucket < h->size; bucket++) { + link_t *cur; + link_t *next; + + for (cur = h->table[bucket].head.next; + cur != &h->table[bucket].head; + cur = next) { + + /* + * The next pointer must be stored prior to the functor + * call to allow using destructor as the functor (the + * free function could overwrite the cur->next pointer). + */ + next = cur->next; + f(cur, arg); + } + } +} + +/** Remove all elements from the set. + * + * The table is reallocated to the minimum size. + * + * @param h Hash set + * @param f Function (destructor?) applied to all element. Can be NULL. + * @param arg Argument to the destructor. + * + */ +void hash_set_clear(hash_set_t *h, void (*f)(link_t *, void *), void *arg) +{ + assert(h); + assert(h->table); + + for (size_t bucket = 0; bucket < h->size; bucket++) { + link_t *cur; + link_t *next; + + for (cur = h->table[bucket].head.next; + cur != &h->table[bucket].head; + cur = next) { + next = cur->next; + list_remove(cur); + if (f != NULL) + f(cur, arg); + } + } + + assert(h->size >= HASH_SET_MIN_SIZE); + list_t *new_table = + realloc(h->table, HASH_SET_MIN_SIZE * sizeof(list_t)); + + /* We are shrinking, therefore we shouldn't get NULL */ + assert(new_table); + + if (h->table != new_table) { + /* Init the lists, pointers to itself are used in them */ + for (size_t bucket = 0; bucket < HASH_SET_MIN_SIZE; ++bucket) + list_initialize(&new_table[bucket]); + + h->table = new_table; + } + + h->count = 0; + h->size = HASH_SET_MIN_SIZE; +} + +/** Get hash set size + * + * @param hHash set + * + * @return Number of elements in the set. + * + */ +size_t hash_set_count(const hash_set_t *h) +{ + assert(h); + return h->count; +} + +/** Check whether element is contained in the hash set + * + * @param h Hash set + * @param item Item that should be equal to the matched object + * + * @return True if the hash set contains equal object + * @return False otherwise + * + */ +int hash_set_contains(const hash_set_t *h, const link_t *item) +{ + /* + * The hash_set_find cannot accept constant hash set, + * because we can modify the returned element. But in + * this case we are using it safely. + */ + return hash_set_find((hash_set_t *) h, item) != NULL; +} + +/** @} + */ Index: uspace/lib/c/generic/adt/hash_table.c =================================================================== --- uspace/lib/c/generic/adt/hash_table.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/generic/adt/hash_table.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -76,4 +76,24 @@ return true; +} + +/** Remove all elements from the hash table + * + * @param h Hash table to be cleared + */ +void hash_table_clear(hash_table_t *h) +{ + for (hash_count_t chain = 0; chain < h->entries; ++chain) { + link_t *cur; + link_t *next; + + for (cur = h->entry[chain].head.next; + cur != &h->entry[chain].head; + cur = next) { + next = cur->next; + list_remove(cur); + h->op->remove_callback(cur); + } + } } @@ -198,9 +218,17 @@ */ void hash_table_apply(hash_table_t *h, void (*f)(link_t *, void *), void *arg) -{ - hash_index_t bucket; - - for (bucket = 0; bucket < h->entries; bucket++) { - list_foreach(h->entry[bucket], cur) { +{ + for (hash_index_t bucket = 0; bucket < h->entries; bucket++) { + link_t *cur; + link_t *next; + + for (cur = h->entry[bucket].head.next; cur != &h->entry[bucket].head; + cur = next) { + /* + * The next pointer must be stored prior to the functor + * call to allow using destructor as the functor (the + * free function could overwrite the cur->next pointer). + */ + next = cur->next; f(cur, arg); } Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/generic/async.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1847,8 +1847,4 @@ fibril_mutex_lock(&async_sess_mutex); - int rc = async_hangup_internal(sess->phone); - if (rc == EOK) - free(sess); - while (!list_empty(&sess->exch_list)) { exch = (async_exch_t *) @@ -1861,4 +1857,7 @@ free(exch); } + + int rc = async_hangup_internal(sess->phone); + free(sess); fibril_mutex_unlock(&async_sess_mutex); Index: uspace/lib/c/generic/device/hw_res_parsed.c =================================================================== --- uspace/lib/c/generic/device/hw_res_parsed.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/c/generic/device/hw_res_parsed.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,203 @@ +/* + * Copyright (c) 2011 Jiri Michalec + * 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. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +static void hw_res_parse_add_irq(hw_res_list_parsed_t *out, hw_resource_t *res, + int flags) +{ + assert(res && (res->type == INTERRUPT)); + + int irq = res->res.interrupt.irq; + size_t count = out->irqs.count; + int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT; + + if (!keep_duplicit) { + for (size_t i = 0; i < count; i++) { + if (out->irqs.irqs[i] == irq) + return; + } + } + + out->irqs.irqs[count] = irq; + out->irqs.count++; +} + +static void hw_res_parse_add_io_range(hw_res_list_parsed_t *out, + hw_resource_t *res, int flags) +{ + assert(res && (res->type == IO_RANGE)); + + uint64_t address = res->res.io_range.address; + endianness_t endianness = res->res.io_range.endianness; + size_t size = res->res.io_range.size; + + if ((size == 0) && (!(flags & HW_RES_KEEP_ZERO_AREA))) + return; + + int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT; + size_t count = out->io_ranges.count; + + if (!keep_duplicit) { + for (size_t i = 0; i < count; i++) { + uint64_t s_address = out->io_ranges.ranges[i].address; + size_t s_size = out->io_ranges.ranges[i].size; + + if ((address == s_address) && (size == s_size)) + return; + } + } + + out->io_ranges.ranges[count].address = address; + out->io_ranges.ranges[count].endianness = endianness; + out->io_ranges.ranges[count].size = size; + out->io_ranges.count++; +} + +static void hw_res_parse_add_mem_range(hw_res_list_parsed_t *out, + hw_resource_t *res, int flags) +{ + assert(res && (res->type == MEM_RANGE)); + + uint64_t address = res->res.mem_range.address; + endianness_t endianness = res->res.mem_range.endianness; + size_t size = res->res.mem_range.size; + + if ((size == 0) && (!(flags & HW_RES_KEEP_ZERO_AREA))) + return; + + int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT; + size_t count = out->mem_ranges.count; + + if (!keep_duplicit) { + for (size_t i = 0; i < count; ++i) { + uint64_t s_address = out->mem_ranges.ranges[i].address; + size_t s_size = out->mem_ranges.ranges[i].size; + + if ((address == s_address) && (size == s_size)) + return; + } + } + + out->mem_ranges.ranges[count].address = address; + out->mem_ranges.ranges[count].endianness = endianness; + out->mem_ranges.ranges[count].size = size; + out->mem_ranges.count++; +} + +/** Parse list of hardware resources + * + * @param hw_resources Original structure resource + * @param[out] out Output parsed resources + * @param flags Flags of the parsing. + * HW_RES_KEEP_ZERO_AREA for keeping + * zero-size areas, HW_RES_KEEP_DUPLICITIES + * for keep duplicit areas + * + * @return EOK if succeed, error code otherwise. + * + */ +int hw_res_list_parse(hw_resource_list_t *hw_resources, + hw_res_list_parsed_t *out, int flags) +{ + if ((!hw_resources) || (!out)) + return EINVAL; + + size_t res_count = hw_resources->count; + hw_res_list_parsed_clean(out); + + out->irqs.irqs = malloc(res_count * sizeof(int)); + out->io_ranges.ranges = malloc(res_count * sizeof(io_range_t)); + out->mem_ranges.ranges = malloc(res_count * sizeof(mem_range_t)); + + for (size_t i = 0; i < res_count; ++i) { + hw_resource_t *resource = &(hw_resources->resources[i]); + + switch (resource->type) { + case INTERRUPT: + hw_res_parse_add_irq(out, resource, flags); + break; + case IO_RANGE: + hw_res_parse_add_io_range(out, resource, flags); + break; + case MEM_RANGE: + hw_res_parse_add_mem_range(out, resource, flags); + break; + default: + return EINVAL; + } + } + + return EOK; +}; + +/** Get hw_resources from the parent device. + * + * The output must be inited, will be cleared + * + * @see get_hw_resources + * @see hw_resources_parse + * + * @param sess Session to the parent device + * @param hw_resources_parsed Output list + * @param flags Parsing flags + * + * @return EOK if succeed, error code otherwise + * + */ +int hw_res_get_list_parsed(async_sess_t *sess, + hw_res_list_parsed_t *hw_res_parsed, int flags) +{ + if (!hw_res_parsed) + return EBADMEM; + + hw_resource_list_t hw_resources; + hw_res_list_parsed_clean(hw_res_parsed); + bzero(&hw_resources, sizeof(hw_resource_list_t)); + + int rc = hw_res_get_resource_list(sess, &hw_resources); + if (rc != EOK) + return rc; + + rc = hw_res_list_parse(&hw_resources, hw_res_parsed, flags); + hw_res_clean_resource_list(&hw_resources); + + return rc; +}; + +/** @} + */ Index: uspace/lib/c/generic/device/nic.c =================================================================== --- uspace/lib/c/generic/device/nic.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/c/generic/device/nic.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,1271 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** @addtogroup libc + * @{ + */ +/** + * @file + * @brief Client-side RPC stubs for DDF NIC + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +/** Send a packet through the device + * + * @param[in] dev_sess + * @param[in] packet_id Id of the sent packet + * + * @return EOK If the operation was successfully completed + * + */ +int nic_send_message(async_sess_t *dev_sess, packet_id_t packet_id) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_2_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_SEND_MESSAGE, packet_id); + async_exchange_end(exch); + + return rc; +} + +/** Connect the driver to the NET and NIL services + * + * @param[in] dev_sess + * @param[in] nil_service Service identifier for the NIL service + * @param[in] device_id + * + * @return EOK If the operation was successfully completed + * + */ +int nic_connect_to_nil(async_sess_t *dev_sess, services_t nil_service, + nic_device_id_t device_id) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_3_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_CONNECT_TO_NIL, nil_service, device_id); + async_exchange_end(exch); + + return rc; +} + +/** Get the current state of the device + * + * @param[in] dev_sess + * @param[out] state Current state + * + * @return EOK If the operation was successfully completed + * + */ +int nic_get_state(async_sess_t *dev_sess, nic_device_state_t *state) +{ + assert(state); + + sysarg_t _state; + + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_GET_STATE, &_state); + async_exchange_end(exch); + + *state = (nic_device_state_t) _state; + + return rc; +} + +/** Request the device to change its state + * + * @param[in] dev_sess + * @param[in] state New state + * + * @return EOK If the operation was successfully completed + * + */ +int nic_set_state(async_sess_t *dev_sess, nic_device_state_t state) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_2_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_SET_STATE, state); + async_exchange_end(exch); + + return rc; +} + +/** Request the MAC address of the device + * + * @param[in] dev_sess + * @param[out] address Structure with buffer for the address + * + * @return EOK If the operation was successfully completed + * + */ +int nic_get_address(async_sess_t *dev_sess, nic_address_t *address) +{ + assert(address); + + async_exch_t *exch = async_exchange_begin(dev_sess); + aid_t aid = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_GET_ADDRESS, NULL); + int rc = async_data_read_start(exch, address, sizeof(nic_address_t)); + async_exchange_end(exch); + + sysarg_t res; + async_wait_for(aid, &res); + + if (rc != EOK) + return rc; + + return (int) res; +} + +/** Set the address of the device (e.g. MAC on Ethernet) + * + * @param[in] dev_sess + * @param[in] address Pointer to the address + * + * @return EOK If the operation was successfully completed + * + */ +int nic_set_address(async_sess_t *dev_sess, const nic_address_t *address) +{ + assert(address); + + async_exch_t *exch = async_exchange_begin(dev_sess); + aid_t aid = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_SET_ADDRESS, NULL); + int rc = async_data_write_start(exch, address, sizeof(nic_address_t)); + async_exchange_end(exch); + + sysarg_t res; + async_wait_for(aid, &res); + + if (rc != EOK) + return rc; + + return (int) res; +} + +/** Request statistic data about NIC operation. + * + * @param[in] dev_sess + * @param[out] stats Structure with the statistics + * + * @return EOK If the operation was successfully completed + * + */ +int nic_get_stats(async_sess_t *dev_sess, nic_device_stats_t *stats) +{ + assert(stats); + + async_exch_t *exch = async_exchange_begin(dev_sess); + + int rc = async_req_1_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_GET_STATS); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + rc = async_data_read_start(exch, stats, sizeof(nic_device_stats_t)); + + async_exchange_end(exch); + + return rc; +} + +/** Request information about the device. + * + * @see nic_device_info_t + * + * @param[in] dev_sess + * @param[out] device_info Information about the device + * + * @return EOK If the operation was successfully completed + * + */ +int nic_get_device_info(async_sess_t *dev_sess, nic_device_info_t *device_info) +{ + assert(device_info); + + async_exch_t *exch = async_exchange_begin(dev_sess); + + int rc = async_req_1_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_GET_DEVICE_INFO); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + rc = async_data_read_start(exch, device_info, sizeof(nic_device_info_t)); + + async_exchange_end(exch); + + return rc; +} + +/** Request status of the cable (plugged/unplugged) + * + * @param[in] dev_sess + * @param[out] cable_state Current cable state + * + * @return EOK If the operation was successfully completed + * + */ +int nic_get_cable_state(async_sess_t *dev_sess, nic_cable_state_t *cable_state) +{ + assert(cable_state); + + sysarg_t _cable_state; + + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_GET_CABLE_STATE, &_cable_state); + async_exchange_end(exch); + + *cable_state = (nic_cable_state_t) _cable_state; + + return rc; +} + +/** Request current operation mode. + * + * @param[in] dev_sess + * @param[out] speed Current operation speed in Mbps. Can be NULL. + * @param[out] duplex Full duplex/half duplex. Can be NULL. + * @param[out] role Master/slave/auto. Can be NULL. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_get_operation_mode(async_sess_t *dev_sess, int *speed, + nic_channel_mode_t *duplex, nic_role_t *role) +{ + sysarg_t _speed; + sysarg_t _duplex; + sysarg_t _role; + + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_3(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_GET_OPERATION_MODE, &_speed, &_duplex, &_role); + async_exchange_end(exch); + + if (speed) + *speed = (int) _speed; + + if (duplex) + *duplex = (nic_channel_mode_t) _duplex; + + if (role) + *role = (nic_role_t) _role; + + return rc; +} + +/** Set current operation mode. + * + * If the NIC has auto-negotiation enabled, this command + * disables auto-negotiation and sets the operation mode. + * + * @param[in] dev_sess + * @param[in] speed Operation speed in Mbps + * @param[in] duplex Full duplex/half duplex + * @param[in] role Master/slave/auto (e.g. in Gbit Ethernet] + * + * @return EOK If the operation was successfully completed + * + */ +int nic_set_operation_mode(async_sess_t *dev_sess, int speed, + nic_channel_mode_t duplex, nic_role_t role) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_4_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_SET_OPERATION_MODE, (sysarg_t) speed, (sysarg_t) duplex, + (sysarg_t) role); + async_exchange_end(exch); + + return rc; +} + +/** Enable auto-negotiation. + * + * The advertisement argument can only limit some modes, + * it can never force the NIC to advertise unsupported modes. + * + * The allowed modes are defined in "net/eth_phys.h" in the C library. + * + * @param[in] dev_sess + * @param[in] advertisement Allowed advertised modes. Use 0 for all modes. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_autoneg_enable(async_sess_t *dev_sess, uint32_t advertisement) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_2_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_AUTONEG_ENABLE, (sysarg_t) advertisement); + async_exchange_end(exch); + + return rc; +} + +/** Disable auto-negotiation. + * + * @param[in] dev_sess + * + * @return EOK If the operation was successfully completed + * + */ +int nic_autoneg_disable(async_sess_t *dev_sess) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_AUTONEG_DISABLE); + async_exchange_end(exch); + + return rc; +} + +/** Probe current state of auto-negotiation. + * + * Modes are defined in the "net/eth_phys.h" in the C library. + * + * @param[in] dev_sess + * @param[out] our_advertisement Modes advertised by this NIC. + * Can be NULL. + * @param[out] their_advertisement Modes advertised by the other side. + * Can be NULL. + * @param[out] result General state of auto-negotiation. + * Can be NULL. + * @param[out] their_result State of other side auto-negotiation. + * Can be NULL. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_autoneg_probe(async_sess_t *dev_sess, uint32_t *our_advertisement, + uint32_t *their_advertisement, nic_result_t *result, + nic_result_t *their_result) +{ + sysarg_t _our_advertisement; + sysarg_t _their_advertisement; + sysarg_t _result; + sysarg_t _their_result; + + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_4(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_AUTONEG_PROBE, &_our_advertisement, &_their_advertisement, + &_result, &_their_result); + async_exchange_end(exch); + + if (our_advertisement) + *our_advertisement = (uint32_t) _our_advertisement; + + if (*their_advertisement) + *their_advertisement = (uint32_t) _their_advertisement; + + if (result) + *result = (nic_result_t) _result; + + if (their_result) + *their_result = (nic_result_t) _their_result; + + return rc; +} + +/** Restart the auto-negotiation process. + * + * @param[in] dev_sess + * + * @return EOK If the operation was successfully completed + * + */ +int nic_autoneg_restart(async_sess_t *dev_sess) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_AUTONEG_RESTART); + async_exchange_end(exch); + + return rc; +} + +/** Query party's sending and reception of the PAUSE frame. + * + * @param[in] dev_sess + * @param[out] we_send This NIC sends the PAUSE frame (true/false) + * @param[out] we_receive This NIC receives the PAUSE frame (true/false) + * @param[out] pause The time set to transmitted PAUSE frames. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_get_pause(async_sess_t *dev_sess, nic_result_t *we_send, + nic_result_t *we_receive, uint16_t *pause) +{ + sysarg_t _we_send; + sysarg_t _we_receive; + sysarg_t _pause; + + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_3(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_GET_PAUSE, &_we_send, &_we_receive, &_pause); + async_exchange_end(exch); + + if (we_send) + *we_send = _we_send; + + if (we_receive) + *we_receive = _we_receive; + + if (pause) + *pause = _pause; + + return rc; +} + +/** Control sending and reception of the PAUSE frame. + * + * @param[in] dev_sess + * @param[in] allow_send Allow sending the PAUSE frame (true/false) + * @param[in] allow_receive Allow reception of the PAUSE frame (true/false) + * @param[in] pause Pause length in 512 bit units written + * to transmitted frames. The value 0 means + * auto value (the best). If the requested + * time cannot be set the driver is allowed + * to set the nearest supported value. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_set_pause(async_sess_t *dev_sess, int allow_send, int allow_receive, + uint16_t pause) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_4_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_SET_PAUSE, allow_send, allow_receive, pause); + async_exchange_end(exch); + + return rc; +} + +/** Retrieve current settings of unicast frames reception. + * + * Note: In case of mode != NIC_UNICAST_LIST the contents of + * address_list and address_count are undefined. + * + * @param[in] dev_sess + * @param[out] mode Current operation mode + * @param[in] max_count Maximal number of addresses that could + * be written into the list buffer. + * @param[out] address_list Buffer for the list (array). Can be NULL. + * @param[out] address_count Number of addresses in the list before + * possible truncation due to the max_count. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_unicast_get_mode(async_sess_t *dev_sess, nic_unicast_mode_t *mode, + size_t max_count, nic_address_t *address_list, size_t *address_count) +{ + assert(mode); + + sysarg_t _mode; + sysarg_t _address_count; + + if (!address_list) + max_count = 0; + + async_exch_t *exch = async_exchange_begin(dev_sess); + + int rc = async_req_2_2(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_UNICAST_GET_MODE, max_count, &_mode, &_address_count); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + *mode = (nic_unicast_mode_t) _mode; + if (address_count) + *address_count = (size_t) _address_count; + + if ((max_count) && (_address_count)) + rc = async_data_read_start(exch, address_list, + max_count * sizeof(nic_address_t)); + + async_exchange_end(exch); + + return rc; +} + +/** Set which unicast frames are received. + * + * @param[in] dev_sess + * @param[in] mode Current operation mode + * @param[in] address_list The list of addresses. Can be NULL. + * @param[in] address_count Number of addresses in the list. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_unicast_set_mode(async_sess_t *dev_sess, nic_unicast_mode_t mode, + const nic_address_t *address_list, size_t address_count) +{ + if (address_list == NULL) + address_count = 0; + + async_exch_t *exch = async_exchange_begin(dev_sess); + + aid_t message_id = async_send_3(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_UNICAST_SET_MODE, (sysarg_t) mode, address_count, NULL); + + int rc; + if (address_count) + rc = async_data_write_start(exch, address_list, + address_count * sizeof(nic_address_t)); + else + rc = EOK; + + async_exchange_end(exch); + + sysarg_t res; + async_wait_for(message_id, &res); + + if (rc != EOK) + return rc; + + return (int) res; +} + +/** Retrieve current settings of multicast frames reception. + * + * Note: In case of mode != NIC_MULTICAST_LIST the contents of + * address_list and address_count are undefined. + * + * @param[in] dev_sess + * @param[out] mode Current operation mode + * @param[in] max_count Maximal number of addresses that could + * be written into the list buffer. + * @param[out] address_list Buffer for the list (array). Can be NULL. + * @param[out] address_count Number of addresses in the list before + * possible truncation due to the max_count. + * Can be NULL. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_multicast_get_mode(async_sess_t *dev_sess, nic_multicast_mode_t *mode, + size_t max_count, nic_address_t *address_list, size_t *address_count) +{ + assert(mode); + + sysarg_t _mode; + + if (!address_list) + max_count = 0; + + async_exch_t *exch = async_exchange_begin(dev_sess); + + sysarg_t ac; + int rc = async_req_2_2(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_MULTICAST_GET_MODE, max_count, &_mode, &ac); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + *mode = (nic_multicast_mode_t) _mode; + if (address_count) + *address_count = (size_t) ac; + + if ((max_count) && (ac)) + rc = async_data_read_start(exch, address_list, + max_count * sizeof(nic_address_t)); + + async_exchange_end(exch); + return rc; +} + +/** Set which multicast frames are received. + * + * @param[in] dev_sess + * @param[in] mode Current operation mode + * @param[in] address_list The list of addresses. Can be NULL. + * @param[in] address_count Number of addresses in the list. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_multicast_set_mode(async_sess_t *dev_sess, nic_multicast_mode_t mode, + const nic_address_t *address_list, size_t address_count) +{ + if (address_list == NULL) + address_count = 0; + + async_exch_t *exch = async_exchange_begin(dev_sess); + + aid_t message_id = async_send_3(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_MULTICAST_SET_MODE, (sysarg_t) mode, address_count, NULL); + + int rc; + if (address_count) + rc = async_data_write_start(exch, address_list, + address_count * sizeof(nic_address_t)); + else + rc = EOK; + + async_exchange_end(exch); + + sysarg_t res; + async_wait_for(message_id, &res); + + if (rc != EOK) + return rc; + + return (int) res; +} + +/** Determine if broadcast packets are received. + * + * @param[in] dev_sess + * @param[out] mode Current operation mode + * + * @return EOK If the operation was successfully completed + * + */ +int nic_broadcast_get_mode(async_sess_t *dev_sess, nic_broadcast_mode_t *mode) +{ + assert(mode); + + sysarg_t _mode; + + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_BROADCAST_GET_MODE, &_mode); + async_exchange_end(exch); + + *mode = (nic_broadcast_mode_t) _mode; + + return rc; +} + +/** Set whether broadcast packets are received. + * + * @param[in] dev_sess + * @param[in] mode Current operation mode + * + * @return EOK If the operation was successfully completed + * + */ +int nic_broadcast_set_mode(async_sess_t *dev_sess, nic_broadcast_mode_t mode) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_2_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_BROADCAST_SET_MODE, mode); + async_exchange_end(exch); + + return rc; +} + +/** Determine if defective (erroneous) packets are received. + * + * @param[in] dev_sess + * @param[out] mode Bitmask specifying allowed errors + * + * @return EOK If the operation was successfully completed + * + */ +int nic_defective_get_mode(async_sess_t *dev_sess, uint32_t *mode) +{ + assert(mode); + + sysarg_t _mode; + + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_DEFECTIVE_GET_MODE, &_mode); + async_exchange_end(exch); + + *mode = (uint32_t) _mode; + + return rc; +} + +/** Set whether defective (erroneous) packets are received. + * + * @param[in] dev_sess + * @param[out] mode Bitmask specifying allowed errors + * + * @return EOK If the operation was successfully completed + * + */ +int nic_defective_set_mode(async_sess_t *dev_sess, uint32_t mode) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_2_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_DEFECTIVE_SET_MODE, mode); + async_exchange_end(exch); + + return rc; +} + +/** Retrieve the currently blocked source MAC addresses. + * + * @param[in] dev_sess + * @param[in] max_count Maximal number of addresses that could + * be written into the list buffer. + * @param[out] address_list Buffer for the list (array). Can be NULL. + * @param[out] address_count Number of addresses in the list before + * possible truncation due to the max_count. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_blocked_sources_get(async_sess_t *dev_sess, size_t max_count, + nic_address_t *address_list, size_t *address_count) +{ + if (!address_list) + max_count = 0; + + async_exch_t *exch = async_exchange_begin(dev_sess); + + sysarg_t ac; + int rc = async_req_2_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_BLOCKED_SOURCES_GET, max_count, &ac); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + if (address_count) + *address_count = (size_t) ac; + + if ((max_count) && (ac)) + rc = async_data_read_start(exch, address_list, + max_count * sizeof(nic_address_t)); + + async_exchange_end(exch); + return rc; +} + +/** Set which source MACs are blocked + * + * @param[in] dev_sess + * @param[in] address_list The list of addresses. Can be NULL. + * @param[in] address_count Number of addresses in the list. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_blocked_sources_set(async_sess_t *dev_sess, + const nic_address_t *address_list, size_t address_count) +{ + if (address_list == NULL) + address_count = 0; + + async_exch_t *exch = async_exchange_begin(dev_sess); + + aid_t message_id = async_send_2(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_BLOCKED_SOURCES_SET, address_count, NULL); + + int rc; + if (address_count) + rc = async_data_write_start(exch, address_list, + address_count * sizeof(nic_address_t)); + else + rc = EOK; + + async_exchange_end(exch); + + sysarg_t res; + async_wait_for(message_id, &res); + + if (rc != EOK) + return rc; + + return (int) res; +} + +/** Request current VLAN filtering mask. + * + * @param[in] dev_sess + * @param[out] stats Structure with the statistics + * + * @return EOK If the operation was successfully completed + * + */ +int nic_vlan_get_mask(async_sess_t *dev_sess, nic_vlan_mask_t *mask) +{ + assert(mask); + + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_VLAN_GET_MASK); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + rc = async_data_read_start(exch, mask, sizeof(nic_vlan_mask_t)); + async_exchange_end(exch); + + return rc; +} + +/** Set the mask used for VLAN filtering. + * + * If NULL, VLAN filtering is disabled. + * + * @param[in] dev_sess + * @param[in] mask Pointer to mask structure or NULL to disable. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_vlan_set_mask(async_sess_t *dev_sess, const nic_vlan_mask_t *mask) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + + aid_t message_id = async_send_2(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_VLAN_SET_MASK, mask != NULL, NULL); + + int rc; + if (mask != NULL) + rc = async_data_write_start(exch, mask, sizeof(nic_vlan_mask_t)); + else + rc = EOK; + + async_exchange_end(exch); + + sysarg_t res; + async_wait_for(message_id, &res); + + if (rc != EOK) + return rc; + + return (int) res; +} + +/** Set VLAN (802.1q) tag. + * + * Set whether the tag is to be signaled in offload info and + * if the tag should be stripped from received frames and added + * to sent frames automatically. Not every combination of add + * and strip must be supported. + * + * @param[in] dev_sess + * @param[in] tag VLAN priority (top 3 bits) and + * the VLAN tag (bottom 12 bits) + * @param[in] add Add the VLAN tag automatically (boolean) + * @param[in] strip Strip the VLAN tag automatically (boolean) + * + * @return EOK If the operation was successfully completed + * + */ +int nic_vlan_set_tag(async_sess_t *dev_sess, uint16_t tag, int add, int strip) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_4_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_VLAN_SET_TAG, (sysarg_t) tag, (sysarg_t) add, (sysarg_t) strip); + async_exchange_end(exch); + + return rc; +} + +/** Add new Wake-On-LAN virtue. + * + * @param[in] dev_sess + * @param[in] type Type of the virtue + * @param[in] data Data required for this virtue + * (depends on type) + * @param[in] length Length of the data + * @param[out] id Identifier of the new virtue + * + * @return EOK If the operation was successfully completed + * + */ +int nic_wol_virtue_add(async_sess_t *dev_sess, nic_wv_type_t type, + const void *data, size_t length, nic_wv_id_t *id) +{ + assert(id); + + bool send_data = ((data != NULL) && (length != 0)); + async_exch_t *exch = async_exchange_begin(dev_sess); + + ipc_call_t result; + aid_t message_id = async_send_3(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_WOL_VIRTUE_ADD, (sysarg_t) type, send_data, &result); + + sysarg_t res; + if (send_data) { + int rc = async_data_write_start(exch, data, length); + if (rc != EOK) { + async_exchange_end(exch); + async_wait_for(message_id, &res); + return rc; + } + } + + async_exchange_end(exch); + async_wait_for(message_id, &res); + + *id = IPC_GET_ARG1(result); + return (int) res; +} + +/** Remove Wake-On-LAN virtue. + * + * @param[in] dev_sess + * @param[in] id Virtue identifier + * + * @return EOK If the operation was successfully completed + * + */ +int nic_wol_virtue_remove(async_sess_t *dev_sess, nic_wv_id_t id) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_2_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_WOL_VIRTUE_REMOVE, (sysarg_t) id); + async_exchange_end(exch); + + return rc; +} + +/** Get information about virtue. + * + * @param[in] dev_sess + * @param[in] id Virtue identifier + * @param[out] type Type of the filter. Can be NULL. + * @param[out] max_length Size of the data buffer. + * @param[out] data Buffer for data used when the + * virtue was created. Can be NULL. + * @param[out] length Length of the data. Can be NULL. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_wol_virtue_probe(async_sess_t *dev_sess, nic_wv_id_t id, + nic_wv_type_t *type, size_t max_length, void *data, size_t *length) +{ + sysarg_t _type; + sysarg_t _length; + + if (data == NULL) + max_length = 0; + + async_exch_t *exch = async_exchange_begin(dev_sess); + + int rc = async_req_3_2(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_WOL_VIRTUE_PROBE, (sysarg_t) id, max_length, + &_type, &_length); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + if (type) + *type = _type; + + if (length) + *length = _length; + + if ((max_length) && (_length != 0)) + rc = async_data_read_start(exch, data, max_length); + + async_exchange_end(exch); + return rc; +} + +/** Get a list of all virtues of the specified type. + * + * When NIC_WV_NONE is specified as the virtue type the function + * lists virtues of all types. + * + * @param[in] dev_sess + * @param[in] type Type of the virtues + * @param[in] max_count Maximum number of ids that can be + * written into the list buffer. + * @param[out] id_list Buffer for to the list of virtue ids. + * Can be NULL. + * @param[out] id_count Number of virtue identifiers in the list + * before possible truncation due to the + * max_count. Can be NULL. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_wol_virtue_list(async_sess_t *dev_sess, nic_wv_type_t type, + size_t max_count, nic_wv_id_t *id_list, size_t *id_count) +{ + if (id_list == NULL) + max_count = 0; + + async_exch_t *exch = async_exchange_begin(dev_sess); + + sysarg_t count; + int rc = async_req_3_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_WOL_VIRTUE_LIST, (sysarg_t) type, max_count, &count); + + if (id_count) + *id_count = (size_t) count; + + if ((rc != EOK) || (!max_count)) { + async_exchange_end(exch); + return rc; + } + + rc = async_data_read_start(exch, id_list, + max_count * sizeof(nic_wv_id_t)); + + async_exchange_end(exch); + return rc; +} + +/** Get number of virtues that can be enabled yet. + * + * Count: < 0 => Virtue of this type can be never used + * = 0 => No more virtues can be enabled + * > 0 => #count virtues can be enabled yet + * + * @param[in] dev_sess + * @param[in] type Virtue type + * @param[out] count Number of virtues + * + * @return EOK If the operation was successfully completed + * + */ +int nic_wol_virtue_get_caps(async_sess_t *dev_sess, nic_wv_type_t type, + int *count) +{ + assert(count); + + sysarg_t _count; + + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_2_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_WOL_VIRTUE_GET_CAPS, (sysarg_t) type, &_count); + async_exchange_end(exch); + + *count = (int) _count; + return rc; +} + +/** Load the frame that issued the wakeup. + * + * The NIC can support only matched_type, only part of the frame + * can be available or not at all. Sometimes even the type can be + * uncertain -- in this case the matched_type contains NIC_WV_NONE. + * + * Frame_length can be greater than max_length, but at most max_length + * bytes will be copied into the frame buffer. + * + * Note: Only the type of the filter can be detected, not the concrete + * filter, because the driver is probably not running when the wakeup + * is issued. + * + * @param[in] dev_sess + * @param[out] matched_type Type of the filter that issued wakeup. + * @param[in] max_length Size of the buffer + * @param[out] frame Buffer for the frame. Can be NULL. + * @param[out] frame_length Length of the stored frame. Can be NULL. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_wol_load_info(async_sess_t *dev_sess, nic_wv_type_t *matched_type, + size_t max_length, uint8_t *frame, size_t *frame_length) +{ + assert(matched_type); + + sysarg_t _matched_type; + sysarg_t _frame_length; + + if (frame == NULL) + max_length = 0; + + async_exch_t *exch = async_exchange_begin(dev_sess); + + int rc = async_req_2_2(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_WOL_LOAD_INFO, max_length, &_matched_type, &_frame_length); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + *matched_type = (nic_wv_type_t) _matched_type; + if (frame_length) + *frame_length = (size_t) _frame_length; + + if ((max_length != 0) && (_frame_length != 0)) + rc = async_data_read_start(exch, frame, max_length); + + async_exchange_end(exch); + return rc; +} + +/** Probe supported options and current setting of offload computations + * + * @param[in] dev_sess + * @param[out] supported Supported offload options + * @param[out] active Currently active offload options + * + * @return EOK If the operation was successfully completed + * + */ +int nic_offload_probe(async_sess_t *dev_sess, uint32_t *supported, + uint32_t *active) +{ + assert(supported); + assert(active); + + sysarg_t _supported; + sysarg_t _active; + + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_2(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_OFFLOAD_PROBE, &_supported, &_active); + async_exchange_end(exch); + + *supported = (uint32_t) _supported; + *active = (uint32_t) _active; + return rc; +} + +/** Set which offload computations can be performed on the NIC. + * + * @param[in] dev_sess + * @param[in] mask Mask for the options (only those set here will be set) + * @param[in] active Which options should be enabled and which disabled + * + * @return EOK If the operation was successfully completed + * + */ +int nic_offload_set(async_sess_t *dev_sess, uint32_t mask, uint32_t active) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_3_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_AUTONEG_RESTART, (sysarg_t) mask, (sysarg_t) active); + async_exchange_end(exch); + + return rc; +} + +/** Query the current interrupt/poll mode of the NIC + * + * @param[in] dev_sess + * @param[out] mode Current poll mode + * @param[out] period Period used in periodic polling. + * Can be NULL. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_poll_get_mode(async_sess_t *dev_sess, nic_poll_mode_t *mode, + struct timeval *period) +{ + assert(mode); + + sysarg_t _mode; + + async_exch_t *exch = async_exchange_begin(dev_sess); + + int rc = async_req_2_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_POLL_GET_MODE, period != NULL, &_mode); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + *mode = (nic_poll_mode_t) _mode; + + if (period != NULL) + rc = async_data_read_start(exch, period, sizeof(struct timeval)); + + async_exchange_end(exch); + return rc; +} + +/** Set the interrupt/poll mode of the NIC. + * + * @param[in] dev_sess + * @param[in] mode New poll mode + * @param[in] period Period used in periodic polling. Can be NULL. + * + * @return EOK If the operation was successfully completed + * + */ +int nic_poll_set_mode(async_sess_t *dev_sess, nic_poll_mode_t mode, + const struct timeval *period) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + + aid_t message_id = async_send_3(exch, DEV_IFACE_ID(NIC_DEV_IFACE), + NIC_POLL_SET_MODE, (sysarg_t) mode, period != NULL, NULL); + + int rc; + if (period) + rc = async_data_write_start(exch, period, sizeof(struct timeval)); + else + rc = EOK; + + async_exchange_end(exch); + + sysarg_t res; + async_wait_for(message_id, &res); + + if (rc != EOK) + return rc; + + return (int) res; +} + +/** Request the driver to poll the NIC. + * + * @param[in] dev_sess + * + * @return EOK If the operation was successfully completed + * + */ +int nic_poll_now(async_sess_t *dev_sess) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + int rc = async_req_1_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), NIC_POLL_NOW); + async_exchange_end(exch); + + return rc; +} + +/** @} + */ Index: uspace/lib/c/generic/net/packet.c =================================================================== --- uspace/lib/c/generic/net/packet.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/generic/net/packet.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -36,4 +36,5 @@ */ +#include #include #include @@ -44,29 +45,10 @@ #include -#include +#include #include #include -/** Packet map page size. */ -#define PACKET_MAP_SIZE 100 - -/** Returns the packet map page index. - * @param[in] packet_id The packet identifier. - */ -#define PACKET_MAP_PAGE(packet_id) (((packet_id) - 1) / PACKET_MAP_SIZE) - -/** Returns the packet index in the corresponding packet map page. - * @param[in] packet_id The packet identifier. - */ -#define PACKET_MAP_INDEX(packet_id) (((packet_id) - 1) % PACKET_MAP_SIZE) - -/** Type definition of the packet map page. */ -typedef packet_t *packet_map_t[PACKET_MAP_SIZE]; - -/** Packet map. - * Maps packet identifiers to the packet references. - * @see generic_field.h - */ -GENERIC_FIELD_DECLARE(gpm, packet_map_t); +/** Packet hash table size. */ +#define PACKET_HASH_TABLE_SIZE 128 /** Packet map global data. */ @@ -75,8 +57,49 @@ fibril_rwlock_t lock; /** Packet map. */ - gpm_t packet_map; + hash_table_t packet_map; + /** Packet map operations */ + hash_table_operations_t operations; } pm_globals; -GENERIC_FIELD_IMPLEMENT(gpm, packet_map_t); +typedef struct { + link_t link; + packet_t *packet; +} pm_entry_t; + +/** + * Hash function for the packet mapping hash table + */ +static hash_index_t pm_hash(unsigned long key[]) +{ + return (hash_index_t) key[0] % PACKET_HASH_TABLE_SIZE; +} + +/** + * Key compare function for the packet mapping hash table + */ +static int pm_compare(unsigned long key[], hash_count_t keys, link_t *link) +{ + pm_entry_t *entry = list_get_instance(link, pm_entry_t, link); + return entry->packet->packet_id == key[0]; +} + +/** + * Remove callback for the packet mapping hash table + */ +static void pm_remove_callback(link_t *link) +{ + pm_entry_t *entry = list_get_instance(link, pm_entry_t, link); + free(entry); +} + +/** + * Wrapper used when destroying the whole table + */ +static void pm_free_wrapper(link_t *link, void *ignored) +{ + pm_entry_t *entry = list_get_instance(link, pm_entry_t, link); + free(entry); +} + /** Initializes the packet map. @@ -87,10 +110,18 @@ int pm_init(void) { - int rc; + int rc = EOK; fibril_rwlock_initialize(&pm_globals.lock); fibril_rwlock_write_lock(&pm_globals.lock); - rc = gpm_initialize(&pm_globals.packet_map); + + pm_globals.operations.hash = pm_hash; + pm_globals.operations.compare = pm_compare; + pm_globals.operations.remove_callback = pm_remove_callback; + + if (!hash_table_create(&pm_globals.packet_map, PACKET_HASH_TABLE_SIZE, 1, + &pm_globals.operations)) + rc = ENOMEM; + fibril_rwlock_write_unlock(&pm_globals.lock); @@ -100,27 +131,28 @@ /** Finds the packet mapping. * - * @param[in] packet_id The packet identifier to be found. - * @return The found packet reference. - * @return NULL if the mapping does not exist. + * @param[in] packet_id Packet identifier to be found. + * + * @return The found packet reference. + * @return NULL if the mapping does not exist. + * */ packet_t *pm_find(packet_id_t packet_id) { - packet_map_t *map; - packet_t *packet; - if (!packet_id) return NULL; - + fibril_rwlock_read_lock(&pm_globals.lock); - if (packet_id > PACKET_MAP_SIZE * gpm_count(&pm_globals.packet_map)) { - fibril_rwlock_read_unlock(&pm_globals.lock); - return NULL; - } - map = gpm_get_index(&pm_globals.packet_map, PACKET_MAP_PAGE(packet_id)); - if (!map) { - fibril_rwlock_read_unlock(&pm_globals.lock); - return NULL; - } - packet = (*map) [PACKET_MAP_INDEX(packet_id)]; + + unsigned long key = packet_id; + link_t *link = hash_table_find(&pm_globals.packet_map, &key); + + packet_t *packet; + if (link != NULL) { + pm_entry_t *entry = + hash_table_get_instance(link, pm_entry_t, link); + packet = entry->packet; + } else + packet = NULL; + fibril_rwlock_read_unlock(&pm_globals.lock); return packet; @@ -129,67 +161,58 @@ /** Adds the packet mapping. * - * @param[in] packet The packet to be remembered. - * @return EOK on success. - * @return EINVAL if the packet is not valid. - * @return EINVAL if the packet map is not initialized. - * @return ENOMEM if there is not enough memory left. + * @param[in] packet Packet to be remembered. + * + * @return EOK on success. + * @return EINVAL if the packet is not valid. + * @return ENOMEM if there is not enough memory left. + * */ int pm_add(packet_t *packet) { - packet_map_t *map; - int rc; - if (!packet_is_valid(packet)) return EINVAL; - + fibril_rwlock_write_lock(&pm_globals.lock); - - if (PACKET_MAP_PAGE(packet->packet_id) < - gpm_count(&pm_globals.packet_map)) { - map = gpm_get_index(&pm_globals.packet_map, - PACKET_MAP_PAGE(packet->packet_id)); - } else { - do { - map = (packet_map_t *) malloc(sizeof(packet_map_t)); - if (!map) { - fibril_rwlock_write_unlock(&pm_globals.lock); - return ENOMEM; - } - bzero(map, sizeof(packet_map_t)); - rc = gpm_add(&pm_globals.packet_map, map); - if (rc < 0) { - fibril_rwlock_write_unlock(&pm_globals.lock); - free(map); - return rc; - } - } while (PACKET_MAP_PAGE(packet->packet_id) >= - gpm_count(&pm_globals.packet_map)); + + pm_entry_t *entry = malloc(sizeof(pm_entry_t)); + if (entry == NULL) { + fibril_rwlock_write_unlock(&pm_globals.lock); + return ENOMEM; } - - (*map) [PACKET_MAP_INDEX(packet->packet_id)] = packet; + + entry->packet = packet; + + unsigned long key = packet->packet_id; + hash_table_insert(&pm_globals.packet_map, &key, &entry->link); + fibril_rwlock_write_unlock(&pm_globals.lock); + return EOK; } -/** Releases the packet map. */ +/** Remove the packet mapping + * + * @param[in] packet The packet to be removed + * + */ +void pm_remove(packet_t *packet) +{ + assert(packet_is_valid(packet)); + + fibril_rwlock_write_lock(&pm_globals.lock); + + unsigned long key = packet->packet_id; + hash_table_remove(&pm_globals.packet_map, &key, 1); + + fibril_rwlock_write_unlock(&pm_globals.lock); +} + +/** Release the packet map. */ void pm_destroy(void) { - int count; - int index; - packet_map_t *map; - packet_t *packet; - fibril_rwlock_write_lock(&pm_globals.lock); - count = gpm_count(&pm_globals.packet_map); - while (count > 0) { - map = gpm_get_index(&pm_globals.packet_map, count - 1); - for (index = PACKET_MAP_SIZE - 1; index >= 0; --index) { - packet = (*map)[index]; - if (packet_is_valid(packet)) - munmap(packet, packet->length); - } - } - gpm_destroy(&pm_globals.packet_map, free); - /* leave locked */ + hash_table_apply(&pm_globals.packet_map, pm_free_wrapper, NULL); + hash_table_destroy(&pm_globals.packet_map); + /* Leave locked */ } @@ -199,46 +222,52 @@ * The packet is inserted right before the packets of the same order value. * - * @param[in,out] first The first packet of the queue. Sets the first packet of - * the queue. The original first packet may be shifted by - * the new packet. - * @param[in] packet The packet to be added. - * @param[in] order The packet order value. - * @param[in] metric The metric value of the packet. - * @return EOK on success. - * @return EINVAL if the first parameter is NULL. - * @return EINVAL if the packet is not valid. + * @param[in,out] first First packet of the queue. Sets the first + * packet of the queue. The original first packet + * may be shifted by the new packet. + * @param[in] packet Packet to be added. + * @param[in] order Packet order value. + * @param[in] metric Metric value of the packet. + * + * @return EOK on success. + * @return EINVAL if the first parameter is NULL. + * @return EINVAL if the packet is not valid. + * */ int pq_add(packet_t **first, packet_t *packet, size_t order, size_t metric) { - packet_t *item; - - if (!first || !packet_is_valid(packet)) + if ((!first) || (!packet_is_valid(packet))) return EINVAL; - + pq_set_order(packet, order, metric); if (packet_is_valid(*first)) { - item = * first; + packet_t *cur = *first; + do { - if (item->order < order) { - if (item->next) { - item = pm_find(item->next); - } else { - item->next = packet->packet_id; - packet->previous = item->packet_id; + if (cur->order < order) { + if (cur->next) + cur = pm_find(cur->next); + else { + cur->next = packet->packet_id; + packet->previous = cur->packet_id; + return EOK; } } else { - packet->previous = item->previous; - packet->next = item->packet_id; - item->previous = packet->packet_id; - item = pm_find(packet->previous); - if (item) - item->next = packet->packet_id; + packet->previous = cur->previous; + packet->next = cur->packet_id; + + cur->previous = packet->packet_id; + cur = pm_find(packet->previous); + + if (cur) + cur->next = packet->packet_id; else *first = packet; + return EOK; } - } while (packet_is_valid(item)); + } while (packet_is_valid(cur)); } + *first = packet; return EOK; @@ -312,10 +341,11 @@ next = pm_find(packet->next); - if (next) { + if (next) next->previous = packet->previous; - previous = pm_find(next->previous); - if (previous) - previous->next = next->packet_id; - } + + previous = pm_find(packet->previous); + if (previous) + previous->next = packet->next ; + packet->previous = 0; packet->next = 0; Index: uspace/lib/c/generic/ns.c =================================================================== --- uspace/lib/c/generic/ns.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/generic/ns.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -54,8 +54,9 @@ if (!exch) return NULL; + async_sess_t *sess = async_connect_me_to(mgmt, exch, service, arg2, arg3); async_exchange_end(exch); - + if (!sess) return NULL; @@ -75,7 +76,12 @@ { async_exch_t *exch = async_exchange_begin(session_ns); + if (!exch) + return NULL; async_sess_t *sess = async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3); async_exchange_end(exch); + + if (!sess) + return NULL; /* Index: uspace/lib/c/include/adt/hash_set.h =================================================================== --- uspace/lib/c/include/adt/hash_set.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/c/include/adt/hash_set.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2006 Jakub Jermar + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_HASH_SET_H_ +#define LIBC_HASH_SET_H_ + +#include +#include + +#define HASH_SET_MIN_SIZE 8 + +typedef unsigned long (*hash_set_hash)(const link_t *); +typedef int (*hash_set_equals)(const link_t *, const link_t *); + +/** Hash table structure. */ +typedef struct { + list_t *table; + + /** Current table size */ + size_t size; + + /** + * Current number of entries. If count > size, + * the table is rehashed into table with double + * size. If (4 * count < size) && (size > min_size), + * the table is rehashed into table with half the size. + */ + size_t count; + + /** Hash function */ + hash_set_hash hash; + + /** Hash table item equals function */ + hash_set_equals equals; +} hash_set_t; + +extern int hash_set_init(hash_set_t *, hash_set_hash, hash_set_equals, size_t); +extern int hash_set_insert(hash_set_t *, link_t *); +extern link_t *hash_set_find(hash_set_t *, const link_t *); +extern int hash_set_contains(const hash_set_t *, const link_t *); +extern size_t hash_set_count(const hash_set_t *); +extern link_t *hash_set_remove(hash_set_t *, const link_t *); +extern void hash_set_remove_selected(hash_set_t *, + int (*)(link_t *, void *), void *); +extern void hash_set_destroy(hash_set_t *); +extern void hash_set_apply(hash_set_t *, void (*)(link_t *, void *), void *); +extern void hash_set_clear(hash_set_t *, void (*)(link_t *, void *), void *); + +#endif + +/** @} + */ Index: uspace/lib/c/include/adt/hash_table.h =================================================================== --- uspace/lib/c/include/adt/hash_table.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/adt/hash_table.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -86,4 +86,5 @@ extern bool hash_table_create(hash_table_t *, hash_count_t, hash_count_t, hash_table_operations_t *); +extern void hash_table_clear(hash_table_t *); extern void hash_table_insert(hash_table_t *, unsigned long [], link_t *); extern link_t *hash_table_find(hash_table_t *, unsigned long []); Index: uspace/lib/c/include/device/hw_res_parsed.h =================================================================== --- uspace/lib/c/include/device/hw_res_parsed.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/c/include/device/hw_res_parsed.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,134 @@ +/* + * Copyright (c) 2011 Jiri Michalec + * 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. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DEVICE_HW_RES_PARSED_H_ +#define LIBC_DEVICE_HW_RES_PARSED_H_ + +#include +#include + +/** Keep areas of the zero size in the list */ +#define HW_RES_KEEP_ZERO_AREA 0x1 + +/** Keep duplicit entries */ +#define HW_RES_KEEP_DUPLICIT 0x2 + +/** Address range structure */ +typedef struct addr_range { + /** Start address */ + uint64_t address; + + /** Endianness */ + endianness_t endianness; + + /** Area size */ + size_t size; +} addr_range_t; + +/** IO range type */ +typedef addr_range_t io_range_t; + +/** Memory range type */ +typedef addr_range_t mem_range_t; + +/** List of IRQs */ +typedef struct irq_list { + /** Irq count */ + size_t count; + + /** Array of IRQs */ + int *irqs; +} irq_list_t; + +/** List of memory areas */ +typedef struct addr_range_list { + /** Areas count */ + size_t count; + + /** Array of areas */ + addr_range_t *ranges; +} addr_range_list_t; + +/** List of IO mapped areas */ +typedef addr_range_list_t io_range_list_t; + +/** Memory range type */ +typedef addr_range_list_t mem_range_list_t; + +/** HW resources parsed according to resource type */ +typedef struct hw_resource_list_parsed { + /** List of IRQs */ + irq_list_t irqs; + + /** List of memory areas */ + mem_range_list_t mem_ranges; + + /** List of IO areas */ + io_range_list_t io_ranges; +} hw_res_list_parsed_t; + +/** Clean hw_resource_list_parsed_t structure + * + * All allocated memory will be released, data amd pointers set to 0. + * + * @param list The structure to clear + */ +static inline void hw_res_list_parsed_clean(hw_res_list_parsed_t *list) +{ + if (list == NULL) + return; + + free(list->irqs.irqs); + free(list->io_ranges.ranges); + free(list->mem_ranges.ranges); + + bzero(list, sizeof(hw_res_list_parsed_t)); +} + +/** Initialize the hw_resource_list_parsed_t structure + * + * @param list The structure to initialize + */ +static inline void hw_res_list_parsed_init(hw_res_list_parsed_t *list) +{ + bzero(list, sizeof(hw_res_list_parsed_t)); +} + +extern int hw_res_list_parse(hw_resource_list_t *, hw_res_list_parsed_t *, int); +extern int hw_res_get_list_parsed(async_sess_t *, hw_res_list_parsed_t *, int); + +#endif + +/** @} + */ Index: uspace/lib/c/include/device/nic.h =================================================================== --- uspace/lib/c/include/device/nic.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/c/include/device/nic.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2010 Radim Vansa + * 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. + */ + + /** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DEVICE_NIC_H_ +#define LIBC_DEVICE_NIC_H_ + +#include +#include +#include +#include + +typedef enum { + NIC_SEND_MESSAGE = 0, + NIC_CONNECT_TO_NIL, + NIC_GET_STATE, + NIC_SET_STATE, + NIC_GET_ADDRESS, + NIC_SET_ADDRESS, + NIC_GET_STATS, + NIC_GET_DEVICE_INFO, + NIC_GET_CABLE_STATE, + NIC_GET_OPERATION_MODE, + NIC_SET_OPERATION_MODE, + NIC_AUTONEG_ENABLE, + NIC_AUTONEG_DISABLE, + NIC_AUTONEG_PROBE, + NIC_AUTONEG_RESTART, + NIC_GET_PAUSE, + NIC_SET_PAUSE, + NIC_UNICAST_GET_MODE, + NIC_UNICAST_SET_MODE, + NIC_MULTICAST_GET_MODE, + NIC_MULTICAST_SET_MODE, + NIC_BROADCAST_GET_MODE, + NIC_BROADCAST_SET_MODE, + NIC_DEFECTIVE_GET_MODE, + NIC_DEFECTIVE_SET_MODE, + NIC_BLOCKED_SOURCES_GET, + NIC_BLOCKED_SOURCES_SET, + NIC_VLAN_GET_MASK, + NIC_VLAN_SET_MASK, + NIC_VLAN_SET_TAG, + NIC_WOL_VIRTUE_ADD, + NIC_WOL_VIRTUE_REMOVE, + NIC_WOL_VIRTUE_PROBE, + NIC_WOL_VIRTUE_LIST, + NIC_WOL_VIRTUE_GET_CAPS, + NIC_WOL_LOAD_INFO, + NIC_OFFLOAD_PROBE, + NIC_OFFLOAD_SET, + NIC_POLL_GET_MODE, + NIC_POLL_SET_MODE, + NIC_POLL_NOW +} nic_funcs_t; + +extern int nic_send_message(async_sess_t *, packet_id_t); +extern int nic_connect_to_nil(async_sess_t *, services_t, nic_device_id_t); +extern int nic_get_state(async_sess_t *, nic_device_state_t *); +extern int nic_set_state(async_sess_t *, nic_device_state_t); +extern int nic_get_address(async_sess_t *, nic_address_t *); +extern int nic_set_address(async_sess_t *, const nic_address_t *); +extern int nic_get_stats(async_sess_t *, nic_device_stats_t *); +extern int nic_get_device_info(async_sess_t *, nic_device_info_t *); +extern int nic_get_cable_state(async_sess_t *, nic_cable_state_t *); + +extern int nic_get_operation_mode(async_sess_t *, int *, nic_channel_mode_t *, + nic_role_t *); +extern int nic_set_operation_mode(async_sess_t *, int, nic_channel_mode_t, + nic_role_t); +extern int nic_autoneg_enable(async_sess_t *, uint32_t); +extern int nic_autoneg_disable(async_sess_t *); +extern int nic_autoneg_probe(async_sess_t *, uint32_t *, uint32_t *, + nic_result_t *, nic_result_t *); +extern int nic_autoneg_restart(async_sess_t *); +extern int nic_get_pause(async_sess_t *, nic_result_t *, nic_result_t *, + uint16_t *); +extern int nic_set_pause(async_sess_t *, int, int, uint16_t); + +extern int nic_unicast_get_mode(async_sess_t *, nic_unicast_mode_t *, size_t, + nic_address_t *, size_t *); +extern int nic_unicast_set_mode(async_sess_t *, nic_unicast_mode_t, + const nic_address_t *, size_t); +extern int nic_multicast_get_mode(async_sess_t *, nic_multicast_mode_t *, + size_t, nic_address_t *, size_t *); +extern int nic_multicast_set_mode(async_sess_t *, nic_multicast_mode_t, + const nic_address_t *, size_t); +extern int nic_broadcast_get_mode(async_sess_t *, nic_broadcast_mode_t *); +extern int nic_broadcast_set_mode(async_sess_t *, nic_broadcast_mode_t); +extern int nic_defective_get_mode(async_sess_t *, uint32_t *); +extern int nic_defective_set_mode(async_sess_t *, uint32_t); +extern int nic_blocked_sources_get(async_sess_t *, size_t, nic_address_t *, + size_t *); +extern int nic_blocked_sources_set(async_sess_t *, const nic_address_t *, + size_t); + +extern int nic_vlan_get_mask(async_sess_t *, nic_vlan_mask_t *); +extern int nic_vlan_set_mask(async_sess_t *, const nic_vlan_mask_t *); +extern int nic_vlan_set_tag(async_sess_t *, uint16_t, int, int); + +extern int nic_wol_virtue_add(async_sess_t *, nic_wv_type_t, const void *, + size_t, nic_wv_id_t *); +extern int nic_wol_virtue_remove(async_sess_t *, nic_wv_id_t); +extern int nic_wol_virtue_probe(async_sess_t *, nic_wv_id_t, nic_wv_type_t *, + size_t, void *, size_t *); +extern int nic_wol_virtue_list(async_sess_t *, nic_wv_type_t, size_t, + nic_wv_id_t *, size_t *); +extern int nic_wol_virtue_get_caps(async_sess_t *, nic_wv_type_t, int *); +extern int nic_wol_load_info(async_sess_t *, nic_wv_type_t *, size_t, uint8_t *, + size_t *); + +extern int nic_offload_probe(async_sess_t *, uint32_t *, uint32_t *); +extern int nic_offload_set(async_sess_t *, uint32_t, uint32_t); + +extern int nic_poll_get_mode(async_sess_t *, nic_poll_mode_t *, + struct timeval *); +extern int nic_poll_set_mode(async_sess_t *, nic_poll_mode_t, + const struct timeval *); +extern int nic_poll_now(async_sess_t *); + +#endif + +/** @} + */ Index: uspace/lib/c/include/ipc/dev_iface.h =================================================================== --- uspace/lib/c/include/ipc/dev_iface.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/ipc/dev_iface.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -36,6 +36,10 @@ typedef enum { HW_RES_DEV_IFACE = 0, + /** Character device interface */ CHAR_DEV_IFACE, - + + /** Network interface controller interface */ + NIC_DEV_IFACE, + /** Interface provided by any PCI device. */ PCI_DEV_IFACE, Index: uspace/lib/c/include/ipc/devman.h =================================================================== --- uspace/lib/c/include/ipc/devman.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/ipc/devman.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -146,4 +146,5 @@ typedef enum { DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD, + DRIVER_DEV_ADDED, DRIVER_DEV_REMOVE, DRIVER_DEV_GONE, Index: uspace/lib/c/include/ipc/il.h =================================================================== --- uspace/lib/c/include/ipc/il.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/ipc/il.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -54,4 +54,10 @@ NET_IL_MTU_CHANGED, + /** + * Device address changed message + * @see il_addr_changed_msg() + */ + NET_IL_ADDR_CHANGED, + /** Packet received message. * @see il_received_msg() Index: uspace/lib/c/include/ipc/net.h =================================================================== --- uspace/lib/c/include/ipc/net.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/ipc/net.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -277,5 +277,5 @@ * */ -#define IPC_GET_DEVICE(call) ((device_id_t) IPC_GET_ARG1(call)) +#define IPC_GET_DEVICE(call) ((nic_device_id_t) IPC_GET_ARG1(call)) /** Return the packet identifier message argument. @@ -298,5 +298,33 @@ * */ -#define IPC_GET_STATE(call) ((device_state_t) IPC_GET_ARG2(call)) +#define IPC_GET_STATE(call) ((nic_device_state_t) IPC_GET_ARG2(call)) + +/** Return the device handle argument + * + * @param[in] call Message call structure + * + */ +#define IPC_GET_DEVICE_HANDLE(call) ((devman_handle_t) IPC_GET_ARG2(call)) + +/** Return the device driver service message argument. + * + * @param[in] call Message call structure. + * + */ +#define IPC_GET_SERVICE(call) ((services_t) IPC_GET_ARG3(call)) + +/** Return the target service message argument. + * + * @param[in] call Message call structure. + * + */ +#define IPC_GET_TARGET(call) ((services_t) IPC_GET_ARG3(call)) + +/** Return the sender service message argument. + * + * @param[in] call Message call structure. + * + */ +#define IPC_GET_SENDER(call) ((services_t) IPC_GET_ARG3(call)) /** Return the maximum transmission unit message argument. @@ -305,26 +333,5 @@ * */ -#define IPC_GET_MTU(call) ((size_t) IPC_GET_ARG2(call)) - -/** Return the device driver service message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_SERVICE(call) ((services_t) IPC_GET_ARG3(call)) - -/** Return the target service message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_TARGET(call) ((services_t) IPC_GET_ARG3(call)) - -/** Return the sender service message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_SENDER(call) ((services_t) IPC_GET_ARG3(call)) +#define IPC_GET_MTU(call) ((size_t) IPC_GET_ARG3(call)) /** Return the error service message argument. Index: uspace/lib/c/include/ipc/net_net.h =================================================================== --- uspace/lib/c/include/ipc/net_net.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/ipc/net_net.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -43,14 +43,18 @@ /** Networking subsystem central module messages. */ typedef enum { - /** Returns the general configuration + /** Return general configuration * @see net_get_conf_req() */ NET_NET_GET_CONF = NET_FIRST, - /** Returns the device specific configuration + /** Return device specific configuration * @see net_get_device_conf_req() */ NET_NET_GET_DEVICE_CONF, - /** Starts the networking stack. */ - NET_NET_STARTUP, + /** Return number of mastered devices */ + NET_NET_GET_DEVICES_COUNT, + /** Return names and device IDs of all devices */ + NET_NET_GET_DEVICES, + /** Notify the networking service about a ready device */ + NET_NET_DRIVER_READY } net_messages; Index: uspace/lib/c/include/ipc/nil.h =================================================================== --- uspace/lib/c/include/ipc/nil.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/ipc/nil.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -70,4 +70,8 @@ */ NET_NIL_BROADCAST_ADDR, + /** Device has changed address + * @see nil_addr_changed_msg() + */ + NET_NIL_ADDR_CHANGED } nil_messages; Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/ipc/services.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -49,6 +49,4 @@ SERVICE_CLIPBOARD = FOURCC('c', 'l', 'i', 'p'), SERVICE_NETWORKING = FOURCC('n', 'e', 't', ' '), - SERVICE_LO = FOURCC('l', 'o', ' ', ' '), - SERVICE_NE2000 = FOURCC('n', 'e', '2', 'k'), SERVICE_ETHERNET = FOURCC('e', 't', 'h', ' '), SERVICE_NILDUMMY = FOURCC('n', 'i', 'l', 'd'), Index: uspace/lib/c/include/net/device.h =================================================================== --- uspace/lib/c/include/net/device.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/net/device.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Radim Vansa * All rights reserved. * @@ -39,44 +40,134 @@ #include +#include +#include + +/** Ethernet address length. */ +#define ETH_ADDR 6 + +/** MAC printing format */ +#define PRIMAC "%02x:%02x:%02x:%02x:%02x:%02x" + +/** MAC arguments */ +#define ARGSMAC(__a) \ + (__a)[0], (__a)[1], (__a)[2], (__a)[3], (__a)[4], (__a)[5] + +/* Compare MAC address with specific value */ +#define MAC_EQUALS_VALUE(__a, __a0, __a1, __a2, __a3, __a4, __a5) \ + ((__a)[0] == (__a0) && (__a)[1] == (__a1) && (__a)[2] == (__a2) \ + && (__a)[3] == (__a3) && (__a)[4] == (__a4) && (__a)[5] == (__a5)) + +#define MAC_IS_ZERO(__x) \ + MAC_EQUALS_VALUE(__x, 0, 0, 0, 0, 0, 0) /** Device identifier to generic type map declaration. */ -#define DEVICE_MAP_DECLARE INT_MAP_DECLARE +#define DEVICE_MAP_DECLARE INT_MAP_DECLARE /** Device identifier to generic type map implementation. */ -#define DEVICE_MAP_IMPLEMENT INT_MAP_IMPLEMENT +#define DEVICE_MAP_IMPLEMENT INT_MAP_IMPLEMENT + +/** Max length of any hw nic address (currently only eth) */ +#define NIC_MAX_ADDRESS_LENGTH 16 /** Invalid device identifier. */ -#define DEVICE_INVALID_ID (-1) +#define NIC_DEVICE_INVALID_ID (-1) + +#define NIC_VENDOR_MAX_LENGTH 64 +#define NIC_MODEL_MAX_LENGTH 64 +#define NIC_PART_NUMBER_MAX_LENGTH 64 +#define NIC_SERIAL_NUMBER_MAX_LENGTH 64 + +/** + * The bitmap uses single bit for each of the 2^12 = 4096 possible VLAN tags. + * This means its size is 4096/8 = 512 bytes. + */ +#define NIC_VLAN_BITMAP_SIZE 512 + +#define NIC_DEVICE_PRINT_FMT "%x" /** Device identifier type. */ -typedef int device_id_t; - -/** Device state type. */ -typedef enum device_state device_state_t; - -/** Type definition of the device usage statistics. - * @see device_stats - */ -typedef struct device_stats device_stats_t; +typedef int nic_device_id_t; + +/** + * Structure covering the MAC address. + */ +typedef struct nic_address { + uint8_t address[ETH_ADDR]; +} nic_address_t; /** Device state. */ -enum device_state { - /** Device not present or not initialized. */ - NETIF_NULL = 0, - /** Device present and stopped. */ - NETIF_STOPPED, - /** Device present and active. */ - NETIF_ACTIVE, - /** Device present but unable to transmit. */ - NETIF_CARRIER_LOST -}; +typedef enum nic_device_state { + /** + * Device present and stopped. Moving device to this state means to discard + * all settings and WOL virtues, rebooting the NIC to state as if the + * computer just booted (or the NIC was just inserted in case of removable + * NIC). + */ + NIC_STATE_STOPPED, + /** + * If the NIC is in this state no packets (frames) are transmitted nor + * received. However, the settings are not restarted. You can use this state + * to temporarily disable transmition/reception or atomically (with respect + * to incoming/outcoming packets) change frames acceptance etc. + */ + NIC_STATE_DOWN, + /** Device is normally operating. */ + NIC_STATE_ACTIVE, + /** Just a constant to limit the state numbers */ + NIC_STATE_MAX, +} nic_device_state_t; + +/** + * Channel operating mode used on the medium. + */ +typedef enum { + NIC_CM_UNKNOWN, + NIC_CM_FULL_DUPLEX, + NIC_CM_HALF_DUPLEX, + NIC_CM_SIMPLEX +} nic_channel_mode_t; + +/** + * Role for the device (used e.g. for 1000Gb ethernet) + */ +typedef enum { + NIC_ROLE_UNKNOWN, + NIC_ROLE_AUTO, + NIC_ROLE_MASTER, + NIC_ROLE_SLAVE +} nic_role_t; + +/** + * Current state of the cable in the device + */ +typedef enum { + NIC_CS_UNKNOWN, + NIC_CS_PLUGGED, + NIC_CS_UNPLUGGED +} nic_cable_state_t; + +/** + * Result of the requested operation + */ +typedef enum { + /** Successfully disabled */ + NIC_RESULT_DISABLED, + /** Successfully enabled */ + NIC_RESULT_ENABLED, + /** Not supported at all */ + NIC_RESULT_NOT_SUPPORTED, + /** Temporarily not available */ + NIC_RESULT_NOT_AVAILABLE, + /** Result extensions */ + NIC_RESULT_FIRST_EXTENSION +} nic_result_t; /** Device usage statistics. */ -struct device_stats { - /** Total packets received. */ +typedef struct nic_device_stats { + /** Total packets received (accepted). */ unsigned long receive_packets; /** Total packets transmitted. */ unsigned long send_packets; - /** Total bytes received. */ + /** Total bytes received (accepted). */ unsigned long receive_bytes; /** Total bytes transmitted. */ @@ -86,12 +177,20 @@ /** Packet transmition problems counter. */ unsigned long send_errors; - /** No space in buffers counter. */ + /** Number of frames dropped due to insufficient space in RX buffers */ unsigned long receive_dropped; - /** No space available counter. */ + /** Number of frames dropped due to insufficient space in TX buffers */ unsigned long send_dropped; - /** Total multicast packets received. */ - unsigned long multicast; + /** Total multicast packets received (accepted). */ + unsigned long receive_multicast; + /** Total broadcast packets received (accepted). */ + unsigned long receive_broadcast; /** The number of collisions due to congestion on the medium. */ unsigned long collisions; + /** Unicast packets received but not accepted (filtered) */ + unsigned long receive_filtered_unicast; + /** Multicast packets received but not accepted (filtered) */ + unsigned long receive_filtered_multicast; + /** Broadcast packets received but not accepted (filtered) */ + unsigned long receive_filtered_broadcast; /* detailed receive_errors */ @@ -129,5 +228,250 @@ /** Total compressed packet transmitted. */ unsigned long send_compressed; -}; +} nic_device_stats_t; + +/** Errors corresponding to those in the nic_device_stats_t */ +typedef enum { + NIC_SEC_BUFFER_FULL, + NIC_SEC_ABORTED, + NIC_SEC_CARRIER_LOST, + NIC_SEC_FIFO_OVERRUN, + NIC_SEC_HEARTBEAT, + NIC_SEC_WINDOW_ERROR, + /* Error encountered during TX but with other type of error */ + NIC_SEC_OTHER +} nic_send_error_cause_t; + +/** Errors corresponding to those in the nic_device_stats_t */ +typedef enum { + NIC_REC_BUFFER_FULL, + NIC_REC_LENGTH, + NIC_REC_BUFFER_OVERFLOW, + NIC_REC_CRC, + NIC_REC_FRAME_ALIGNMENT, + NIC_REC_FIFO_OVERRUN, + NIC_REC_MISSED, + /* Error encountered during RX but with other type of error */ + NIC_REC_OTHER +} nic_receive_error_cause_t; + +/** + * Information about the NIC that never changes - name, vendor, model, + * capabilites and so on. + */ +typedef struct nic_device_info { + /* Device identification */ + char vendor_name[NIC_VENDOR_MAX_LENGTH]; + char model_name[NIC_MODEL_MAX_LENGTH]; + char part_number[NIC_PART_NUMBER_MAX_LENGTH]; + char serial_number[NIC_SERIAL_NUMBER_MAX_LENGTH]; + uint16_t vendor_id; + uint16_t device_id; + uint16_t subsystem_vendor_id; + uint16_t subsystem_id; + /* Device capabilities */ + uint16_t ethernet_support[ETH_PHYS_LAYERS]; + + /** The mask of all modes which the device can advertise + * + * see ETH_AUTONEG_ macros in net/eth_phys.h of libc + */ + uint32_t autoneg_support; +} nic_device_info_t; + +/** + * Type of the ethernet frame + */ +typedef enum nic_frame_type { + NIC_FRAME_UNICAST, + NIC_FRAME_MULTICAST, + NIC_FRAME_BROADCAST +} nic_frame_type_t; + +/** + * Specifies which unicast frames is the NIC receiving. + */ +typedef enum nic_unicast_mode { + NIC_UNICAST_UNKNOWN, + /** No unicast frames are received */ + NIC_UNICAST_BLOCKED, + /** Only the frames with this NIC's MAC as destination are received */ + NIC_UNICAST_DEFAULT, + /** + * Both frames with this NIC's MAC and those specified in the list are + * received + */ + NIC_UNICAST_LIST, + /** All unicast frames are received */ + NIC_UNICAST_PROMISC +} nic_unicast_mode_t; + +typedef enum nic_multicast_mode { + NIC_MULTICAST_UNKNOWN, + /** No multicast frames are received */ + NIC_MULTICAST_BLOCKED, + /** Frames with multicast addresses specified in this list are received */ + NIC_MULTICAST_LIST, + /** All multicast frames are received */ + NIC_MULTICAST_PROMISC +} nic_multicast_mode_t; + +typedef enum nic_broadcast_mode { + NIC_BROADCAST_UNKNOWN, + /** Broadcast frames are dropped */ + NIC_BROADCAST_BLOCKED, + /** Broadcast frames are received */ + NIC_BROADCAST_ACCEPTED +} nic_broadcast_mode_t; + +/** + * Structure covering the bitmap with VLAN tags. + */ +typedef struct nic_vlan_mask { + uint8_t bitmap[NIC_VLAN_BITMAP_SIZE]; +} nic_vlan_mask_t; + +/* WOL virtue identifier */ +typedef unsigned int nic_wv_id_t; + +/** + * Structure passed as argument for virtue NIC_WV_MAGIC_PACKET. + */ +typedef struct nic_wv_magic_packet_data { + uint8_t password[6]; +} nic_wv_magic_packet_data_t; + +/** + * Structure passed as argument for virtue NIC_WV_DIRECTED_IPV4 + */ +typedef struct nic_wv_ipv4_data { + uint8_t address[4]; +} nic_wv_ipv4_data_t; + +/** + * Structure passed as argument for virtue NIC_WV_DIRECTED_IPV6 + */ +typedef struct nic_wv_ipv6_data { + uint8_t address[16]; +} nic_wv_ipv6_data_t; + +/** + * WOL virtue types defining the interpretation of data passed to the virtue. + * Those tagged with S can have only single virtue active at one moment, those + * tagged with M can have multiple ones. + */ +typedef enum nic_wv_type { + /** + * Used for deletion of the virtue - in this case the mask, data and length + * arguments are ignored. + */ + NIC_WV_NONE, + /** S + * Enabled <=> wakeup upon link change + */ + NIC_WV_LINK_CHANGE, + /** S + * If this virtue is set up, wakeup can be issued by a magic packet frame. + * If the data argument is not NULL, it must contain + * nic_wv_magic_packet_data structure with the SecureOn password. + */ + NIC_WV_MAGIC_PACKET, + /** M + * If the virtue is set up, wakeup can be issued by a frame targeted to + * device with MAC address specified in data. The data must contain + * nic_address_t structure. + */ + NIC_WV_DESTINATION, + /** S + * Enabled <=> wakeup upon receiving broadcast frame + */ + NIC_WV_BROADCAST, + /** S + * Enabled <=> wakeup upon receiving ARP Request + */ + NIC_WV_ARP_REQUEST, + /** M + * If enabled, the wakeup is issued upon receiving frame with an IPv4 packet + * with IPv4 address specified in data. The data must contain + * nic_wv_ipv4_data structure. + */ + NIC_WV_DIRECTED_IPV4, + /** M + * If enabled, the wakeup is issued upon receiving frame with an IPv4 packet + * with IPv6 address specified in data. The data must contain + * nic_wv_ipv6_data structure. + */ + NIC_WV_DIRECTED_IPV6, + /** M + * First length/2 bytes in the argument are interpreted as mask, second + * length/2 bytes are interpreted as content. + * If enabled, the wakeup is issued upon receiving frame where the bytes + * with non-zero value in the mask equal to those in the content. + */ + NIC_WV_FULL_MATCH, + /** + * Dummy value, do not use. + */ + NIC_WV_MAX +} nic_wv_type_t; + +/** + * Specifies the interrupt/polling mode used by the driver and NIC + */ +typedef enum nic_poll_mode { + /** + * NIC issues interrupts upon events. + */ + NIC_POLL_IMMEDIATE, + /** + * Some uspace app calls nic_poll_now(...) in order to check the NIC state + * - no interrupts are received from the NIC. + */ + NIC_POLL_ON_DEMAND, + /** + * The driver itself issues a poll request in a periodic manner. It is + * allowed to use hardware timer if the NIC supports it. + */ + NIC_POLL_PERIODIC, + /** + * The driver itself issued a poll request in a periodic manner. The driver + * must create software timer, internal hardware timer of NIC must not be + * used even if the NIC supports it. + */ + NIC_POLL_SOFTWARE_PERIODIC +} nic_poll_mode_t; + +/** + * Says if this virtue type is a multi-virtue (there can be multiple virtues of + * this type at once). + * + * @param type + * + * @return true or false + */ +static inline int nic_wv_is_multi(nic_wv_type_t type) { + switch (type) { + case NIC_WV_FULL_MATCH: + case NIC_WV_DESTINATION: + case NIC_WV_DIRECTED_IPV4: + case NIC_WV_DIRECTED_IPV6: + return true; + default: + return false; + } +} + +static inline const char *nic_device_state_to_string(nic_device_state_t state) +{ + switch (state) { + case NIC_STATE_STOPPED: + return "stopped"; + case NIC_STATE_DOWN: + return "down"; + case NIC_STATE_ACTIVE: + return "active"; + default: + return "undefined"; + } +} #endif Index: uspace/lib/c/include/net/eth_phys.h =================================================================== --- uspace/lib/c/include/net/eth_phys.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/c/include/net/eth_phys.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,142 @@ +/* + * Copyright (c) 2011 Radim Vansa + * Copyright (c) 2011 Jiri Michalec + * 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. + */ + +#ifndef LIBC_NET_ETH_PHYS_H_ +#define LIBC_NET_ETH_PHYS_H_ + +#include + +/*****************************************************/ +/* Definitions of possible supported physical layers */ +/*****************************************************/ + +/* Ethernet physical layers */ +#define ETH_OLD 0 +#define ETH_10M 1 +#define ETH_100M 2 +#define ETH_1000M 3 +#define ETH_10G 4 +#define ETH_40G_100G 5 +/* 6, 7 reserved for future use */ +#define ETH_PHYS_LAYERS 8 + +/* < 10Mbs ethernets */ +#define ETH_EXPERIMENTAL 0x0001 +#define ETH_1BASE5 0x0002 +/* 10Mbs ethernets */ +#define ETH_10BASE5 0x0001 +#define ETH_10BASE2 0x0002 +#define ETH_10BROAD36 0x0004 +#define ETH_STARLAN_10 0x0008 +#define ETH_LATTISNET 0x0010 +#define ETH_10BASE_T 0x0020 +#define ETH_FOIRL 0x0040 +#define ETH_10BASE_FL 0x0080 +#define ETH_10BASE_FB 0x0100 +#define ETH_10BASE_FP 0x0200 +/* 100Mbs (fast) ethernets */ +#define ETH_100BASE_TX 0x0001 +#define ETH_100BASE_T4 0x0002 +#define ETH_100BASE_T2 0x0004 +#define ETH_100BASE_FX 0x0008 +#define ETH_100BASE_SX 0x0010 +#define ETH_100BASE_BX10 0x0020 +#define ETH_100BASE_LX10 0x0040 +#define ETH_100BASE_VG 0x0080 +/* 1000Mbs (gigabit) ethernets */ +#define ETH_1000BASE_T 0x0001 +#define ETH_1000BASE_TX 0x0002 +#define ETH_1000BASE_SX 0x0004 +#define ETH_1000BASE_LX 0x0008 +#define ETH_1000BASE_LH 0x0010 +#define ETH_1000BASE_CX 0x0020 +#define ETH_1000BASE_BX10 0x0040 +#define ETH_1000BASE_LX10 0x0080 +#define ETH_1000BASE_PX10_D 0x0100 +#define ETH_1000BASE_PX10_U 0x0200 +#define ETH_1000BASE_PX20_D 0x0400 +#define ETH_1000BASE_PX20_U 0x0800 +#define ETH_1000BASE_ZX 0x1000 +#define ETH_1000BASE_KX 0x2000 +/* 10Gbs ethernets */ +#define ETH_10GBASE_SR 0x0001 +#define ETH_10GBASE_LX4 0x0002 +#define ETH_10GBASE_LR 0x0004 +#define ETH_10GBASE_ER 0x0008 +#define ETH_10GBASE_SW 0x0010 +#define ETH_10GBASE_LW 0x0020 +#define ETH_10GBASE_EW 0x0040 +#define ETH_10GBASE_CX4 0x0080 +#define ETH_10GBASE_T 0x0100 +#define ETH_10GBASE_LRM 0x0200 +#define ETH_10GBASE_KX4 0x0400 +#define ETH_10GBASE_KR 0x0800 +/* 40Gbs and 100Gbs ethernets */ +#define ETH_40GBASE_SR4 0x0001 +#define ETH_40GBASE_LR4 0x0002 +#define ETH_40GBASE_CR4 0x0004 +#define ETH_40GBASE_KR4 0x0008 +#define ETH_100GBASE_SR10 0x0010 +#define ETH_100GBASE_LR4 0x0020 +#define ETH_100GBASE_ER4 0x0040 +#define ETH_100GBASE_CR10 0x0080 + +/******************************************/ +/* Auto-negotiation advertisement options */ +/******************************************/ + +#define ETH_AUTONEG_10BASE_T_HALF UINT32_C(0x00000001) +#define ETH_AUTONEG_10BASE_T_FULL UINT32_C(0x00000002) +#define ETH_AUTONEG_100BASE_TX_HALF UINT32_C(0x00000004) +#define ETH_AUTONEG_100BASE_T4_HALF UINT32_C(0x00000008) +#define ETH_AUTONEG_100BASE_T2_HALF UINT32_C(0x00000010) +#define ETH_AUTONEG_100BASE_TX_FULL UINT32_C(0x00000020) +#define ETH_AUTONEG_100BASE_T2_FULL UINT32_C(0x00000040) +#define ETH_AUTONEG_1000BASE_T_HALF UINT32_C(0x00000080) +#define ETH_AUTONEG_1000BASE_T_FULL UINT32_C(0x00000100) + +/** Symetric pause packet (802.3x standard) */ +#define ETH_AUTONEG_PAUSE_SYMETRIC UINT32_C(0x10000000) +/** Asymetric pause packet (802.3z standard, gigabit ethernet) */ +#define ETH_AUTONEG_PAUSE_ASYMETRIC UINT32_C(0x20000000) + +#define ETH_AUTONEG_MODE_MASK UINT32_C(0x0FFFFFFF) +#define ETH_AUTONEG_FEATURES_MASK UINT32_C(~(ETH_AUTONEG_MODE_MASK)) + +#define ETH_AUTONEG_MODES 9 + +struct eth_autoneg_map { + uint32_t value; + const char *name; +}; + +extern const char *ethernet_names[8][17]; +extern const struct eth_autoneg_map ethernet_autoneg_mapping[ETH_AUTONEG_MODES]; + +#endif Index: uspace/lib/c/include/net/packet.h =================================================================== --- uspace/lib/c/include/net/packet.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/net/packet.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -38,8 +38,10 @@ #define LIBC_PACKET_H_ +#include + /** Packet identifier type. * Value zero is used as an invalid identifier. */ -typedef int packet_id_t; +typedef sysarg_t packet_id_t; /** Type definition of the packet. @@ -51,5 +53,5 @@ * @see packet_dimension */ -typedef struct packet_dimension packet_dimension_t; +typedef struct packet_dimension packet_dimension_t; /** Packet dimension. */ @@ -71,4 +73,5 @@ extern packet_t *pm_find(packet_id_t); extern int pm_add(packet_t *); +extern void pm_remove(packet_t *); extern int pm_init(void); extern void pm_destroy(void); Index: uspace/lib/c/include/net/packet_header.h =================================================================== --- uspace/lib/c/include/net/packet_header.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/c/include/net/packet_header.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -61,4 +61,7 @@ #define PACKET_MAGIC_VALUE 0x11227788 +/** Maximum total length of the packet */ +#define PACKET_MAX_LENGTH 65536 + /** Packet header. */ struct packet { @@ -85,4 +88,10 @@ */ size_t length; + + /** Offload info provided by the NIC */ + uint32_t offload_info; + + /** Mask which bits in offload info are valid */ + uint32_t offload_mask; /** Stored source and destination addresses length. */ Index: uspace/lib/drv/Makefile =================================================================== --- uspace/lib/drv/Makefile (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/drv/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -39,4 +39,5 @@ generic/remote_hw_res.c \ generic/remote_char_dev.c \ + generic/remote_nic.c \ generic/remote_usb.c \ generic/remote_pci.c \ Index: uspace/lib/drv/generic/dev_iface.c =================================================================== --- uspace/lib/drv/generic/dev_iface.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/drv/generic/dev_iface.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -41,4 +41,5 @@ #include "remote_hw_res.h" #include "remote_char_dev.h" +#include "remote_nic.h" #include "remote_usb.h" #include "remote_usbhc.h" @@ -50,4 +51,5 @@ &remote_hw_res_iface, &remote_char_dev_iface, + &remote_nic_iface, &remote_pci_iface, &remote_usb_iface, Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/drv/generic/driver.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -303,4 +303,14 @@ } +static void driver_dev_added(ipc_callid_t iid, ipc_call_t *icall) +{ + fibril_mutex_lock(&devices_mutex); + ddf_dev_t *dev = driver_get_device(IPC_GET_ARG1(*icall)); + fibril_mutex_unlock(&devices_mutex); + + if (dev != NULL && driver->driver_ops->device_added != NULL) + driver->driver_ops->device_added(dev); +} + static void driver_dev_remove(ipc_callid_t iid, ipc_call_t *icall) { @@ -450,4 +460,8 @@ case DRIVER_DEV_ADD: driver_dev_add(callid, &call); + break; + case DRIVER_DEV_ADDED: + async_answer_0(callid, EOK); + driver_dev_added(callid, &call); break; case DRIVER_DEV_REMOVE: Index: uspace/lib/drv/generic/remote_nic.c =================================================================== --- uspace/lib/drv/generic/remote_nic.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/drv/generic/remote_nic.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,1253 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** @addtogroup libdrv + * @{ + */ +/** + * @file + * @brief Driver-side RPC skeletons for DDF NIC interface + */ + +#include +#include +#include +#include +#include +#include +#include "ops/nic.h" + +static void remote_nic_send_message(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + assert(nic_iface->send_message); + + packet_id_t packet_id = (packet_id_t) IPC_GET_ARG2(*call); + + int rc = nic_iface->send_message(dev, packet_id); + async_answer_0(callid, rc); +} + +static void remote_nic_connect_to_nil(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + assert(nic_iface->connect_to_nil); + + services_t nil_service = (services_t) IPC_GET_ARG2(*call); + nic_device_id_t device_id = (nic_device_id_t) IPC_GET_ARG3(*call); + + int rc = nic_iface->connect_to_nil(dev, nil_service, device_id); + async_answer_0(callid, rc); +} + +static void remote_nic_get_state(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + assert(nic_iface->get_state); + + nic_device_state_t state = NIC_STATE_MAX; + + int rc = nic_iface->get_state(dev, &state); + async_answer_1(callid, rc, state); +} + +static void remote_nic_set_state(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + assert(nic_iface->set_state); + + nic_device_state_t state = (nic_device_state_t) IPC_GET_ARG2(*call); + + int rc = nic_iface->set_state(dev, state); + async_answer_0(callid, rc); +} + +static void remote_nic_get_address(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + assert(nic_iface->get_address); + + nic_address_t address; + bzero(&address, sizeof(nic_address_t)); + + int rc = nic_iface->get_address(dev, &address); + if (rc == EOK) { + size_t max_len; + ipc_callid_t data_callid; + + /* All errors will be translated into EPARTY anyway */ + if (!async_data_read_receive(&data_callid, &max_len)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (max_len != sizeof(nic_address_t)) { + async_answer_0(data_callid, ELIMIT); + async_answer_0(callid, ELIMIT); + return; + } + + async_data_read_finalize(data_callid, &address, + sizeof(nic_address_t)); + } + + async_answer_0(callid, rc); +} + +static void remote_nic_set_address(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + + size_t length; + ipc_callid_t data_callid; + if (!async_data_write_receive(&data_callid, &length)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (length > sizeof(nic_address_t)) { + async_answer_0(data_callid, ELIMIT); + async_answer_0(callid, ELIMIT); + return; + } + + nic_address_t address; + if (async_data_write_finalize(data_callid, &address, length) != EOK) { + async_answer_0(callid, EINVAL); + return; + } + + if (nic_iface->set_address != NULL) { + int rc = nic_iface->set_address(dev, &address); + async_answer_0(callid, rc); + } else + async_answer_0(callid, ENOTSUP); +} + +static void remote_nic_get_stats(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->get_stats == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_device_stats_t stats; + bzero(&stats, sizeof(nic_device_stats_t)); + + int rc = nic_iface->get_stats(dev, &stats); + if (rc == EOK) { + ipc_callid_t data_callid; + size_t max_len; + if (!async_data_read_receive(&data_callid, &max_len)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (max_len < sizeof(nic_device_stats_t)) { + async_answer_0(data_callid, ELIMIT); + async_answer_0(callid, ELIMIT); + return; + } + + async_data_read_finalize(data_callid, &stats, + sizeof(nic_device_stats_t)); + } + + async_answer_0(callid, rc); +} + +static void remote_nic_get_device_info(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->get_device_info == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_device_info_t info; + bzero(&info, sizeof(nic_device_info_t)); + + int rc = nic_iface->get_device_info(dev, &info); + if (rc == EOK) { + ipc_callid_t data_callid; + size_t max_len; + if (!async_data_read_receive(&data_callid, &max_len)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (max_len < sizeof (nic_device_info_t)) { + async_answer_0(data_callid, ELIMIT); + async_answer_0(callid, ELIMIT); + return; + } + + async_data_read_finalize(data_callid, &info, + sizeof(nic_device_info_t)); + } + + async_answer_0(callid, rc); +} + +static void remote_nic_get_cable_state(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->get_cable_state == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_cable_state_t cs = NIC_CS_UNKNOWN; + + int rc = nic_iface->get_cable_state(dev, &cs); + async_answer_1(callid, rc, (sysarg_t) cs); +} + +static void remote_nic_get_operation_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->get_operation_mode == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + int speed = 0; + nic_channel_mode_t duplex = NIC_CM_UNKNOWN; + nic_role_t role = NIC_ROLE_UNKNOWN; + + int rc = nic_iface->get_operation_mode(dev, &speed, &duplex, &role); + async_answer_3(callid, rc, (sysarg_t) speed, (sysarg_t) duplex, + (sysarg_t) role); +} + +static void remote_nic_set_operation_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->set_operation_mode == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + int speed = (int) IPC_GET_ARG2(*call); + nic_channel_mode_t duplex = (nic_channel_mode_t) IPC_GET_ARG3(*call); + nic_role_t role = (nic_role_t) IPC_GET_ARG4(*call); + + int rc = nic_iface->set_operation_mode(dev, speed, duplex, role); + async_answer_0(callid, rc); +} + +static void remote_nic_autoneg_enable(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->autoneg_enable == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + uint32_t advertisement = (uint32_t) IPC_GET_ARG2(*call); + + int rc = nic_iface->autoneg_enable(dev, advertisement); + async_answer_0(callid, rc); +} + +static void remote_nic_autoneg_disable(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->autoneg_disable == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + int rc = nic_iface->autoneg_disable(dev); + async_answer_0(callid, rc); +} + +static void remote_nic_autoneg_probe(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->autoneg_probe == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + uint32_t our_adv = 0; + uint32_t their_adv = 0; + nic_result_t result = NIC_RESULT_NOT_AVAILABLE; + nic_result_t their_result = NIC_RESULT_NOT_AVAILABLE; + + int rc = nic_iface->autoneg_probe(dev, &our_adv, &their_adv, &result, + &their_result); + async_answer_4(callid, rc, our_adv, their_adv, (sysarg_t) result, + (sysarg_t) their_result); +} + +static void remote_nic_autoneg_restart(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->autoneg_restart == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + int rc = nic_iface->autoneg_restart(dev); + async_answer_0(callid, rc); +} + +static void remote_nic_get_pause(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->get_pause == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_result_t we_send; + nic_result_t we_receive; + uint16_t pause; + + int rc = nic_iface->get_pause(dev, &we_send, &we_receive, &pause); + async_answer_3(callid, rc, we_send, we_receive, pause); +} + +static void remote_nic_set_pause(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->set_pause == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + int allow_send = (int) IPC_GET_ARG2(*call); + int allow_receive = (int) IPC_GET_ARG3(*call); + uint16_t pause = (uint16_t) IPC_GET_ARG4(*call); + + int rc = nic_iface->set_pause(dev, allow_send, allow_receive, + pause); + async_answer_0(callid, rc); +} + +static void remote_nic_unicast_get_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->unicast_get_mode == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + size_t max_count = IPC_GET_ARG2(*call); + nic_address_t *address_list = NULL; + + if (max_count != 0) { + address_list = malloc(max_count * sizeof (nic_address_t)); + if (!address_list) { + async_answer_0(callid, ENOMEM); + return; + } + } + + bzero(address_list, max_count * sizeof(nic_address_t)); + nic_unicast_mode_t mode = NIC_UNICAST_DEFAULT; + size_t address_count = 0; + + int rc = nic_iface->unicast_get_mode(dev, &mode, max_count, address_list, + &address_count); + + if ((rc != EOK) || (max_count == 0) || (address_count == 0)) { + free(address_list); + async_answer_2(callid, rc, mode, address_count); + return; + } + + ipc_callid_t data_callid; + size_t max_len; + if (!async_data_read_receive(&data_callid, &max_len)) { + async_answer_0(data_callid, EINVAL); + async_answer_2(callid, rc, mode, address_count); + free(address_list); + return; + } + + if (max_len > address_count * sizeof(nic_address_t)) + max_len = address_count * sizeof(nic_address_t); + + if (max_len > max_count * sizeof(nic_address_t)) + max_len = max_count * sizeof(nic_address_t); + + async_data_read_finalize(data_callid, address_list, max_len); + async_answer_0(data_callid, EINVAL); + + free(address_list); + async_answer_2(callid, rc, mode, address_count); +} + +static void remote_nic_unicast_set_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + + size_t length; + nic_unicast_mode_t mode = IPC_GET_ARG2(*call); + size_t address_count = IPC_GET_ARG3(*call); + nic_address_t *address_list = NULL; + + if (address_count) { + ipc_callid_t data_callid; + if (!async_data_write_receive(&data_callid, &length)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (length != address_count * sizeof(nic_address_t)) { + async_answer_0(data_callid, ELIMIT); + async_answer_0(callid, ELIMIT); + return; + } + + address_list = malloc(length); + if (address_list == NULL) { + async_answer_0(data_callid, ENOMEM); + async_answer_0(callid, ENOMEM); + return; + } + + if (async_data_write_finalize(data_callid, address_list, + length) != EOK) { + async_answer_0(callid, EINVAL); + free(address_list); + return; + } + } + + if (nic_iface->unicast_set_mode != NULL) { + int rc = nic_iface->unicast_set_mode(dev, mode, address_list, + address_count); + async_answer_0(callid, rc); + } else + async_answer_0(callid, ENOTSUP); + + free(address_list); +} + +static void remote_nic_multicast_get_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->multicast_get_mode == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + size_t max_count = IPC_GET_ARG2(*call); + nic_address_t *address_list = NULL; + + if (max_count != 0) { + address_list = malloc(max_count * sizeof(nic_address_t)); + if (!address_list) { + async_answer_0(callid, ENOMEM); + return; + } + } + + bzero(address_list, max_count * sizeof(nic_address_t)); + nic_multicast_mode_t mode = NIC_MULTICAST_BLOCKED; + size_t address_count = 0; + + int rc = nic_iface->multicast_get_mode(dev, &mode, max_count, address_list, + &address_count); + + + if ((rc != EOK) || (max_count == 0) || (address_count == 0)) { + free(address_list); + async_answer_2(callid, rc, mode, address_count); + return; + } + + ipc_callid_t data_callid; + size_t max_len; + if (!async_data_read_receive(&data_callid, &max_len)) { + async_answer_0(data_callid, EINVAL); + async_answer_2(callid, rc, mode, address_count); + free(address_list); + return; + } + + if (max_len > address_count * sizeof(nic_address_t)) + max_len = address_count * sizeof(nic_address_t); + + if (max_len > max_count * sizeof(nic_address_t)) + max_len = max_count * sizeof(nic_address_t); + + async_data_read_finalize(data_callid, address_list, max_len); + + free(address_list); + async_answer_2(callid, rc, mode, address_count); +} + +static void remote_nic_multicast_set_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + + nic_multicast_mode_t mode = IPC_GET_ARG2(*call); + size_t address_count = IPC_GET_ARG3(*call); + nic_address_t *address_list = NULL; + + if (address_count) { + ipc_callid_t data_callid; + size_t length; + if (!async_data_write_receive(&data_callid, &length)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (length != address_count * sizeof (nic_address_t)) { + async_answer_0(data_callid, ELIMIT); + async_answer_0(callid, ELIMIT); + return; + } + + address_list = malloc(length); + if (address_list == NULL) { + async_answer_0(data_callid, ENOMEM); + async_answer_0(callid, ENOMEM); + return; + } + + if (async_data_write_finalize(data_callid, address_list, + length) != EOK) { + async_answer_0(callid, EINVAL); + free(address_list); + return; + } + } + + if (nic_iface->multicast_set_mode != NULL) { + int rc = nic_iface->multicast_set_mode(dev, mode, address_list, + address_count); + async_answer_0(callid, rc); + } else + async_answer_0(callid, ENOTSUP); + + free(address_list); +} + +static void remote_nic_broadcast_get_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->broadcast_get_mode == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_broadcast_mode_t mode = NIC_BROADCAST_ACCEPTED; + + int rc = nic_iface->broadcast_get_mode(dev, &mode); + async_answer_1(callid, rc, mode); +} + +static void remote_nic_broadcast_set_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->broadcast_set_mode == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_broadcast_mode_t mode = IPC_GET_ARG2(*call); + + int rc = nic_iface->broadcast_set_mode(dev, mode); + async_answer_0(callid, rc); +} + +static void remote_nic_defective_get_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->defective_get_mode == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + uint32_t mode = 0; + + int rc = nic_iface->defective_get_mode(dev, &mode); + async_answer_1(callid, rc, mode); +} + +static void remote_nic_defective_set_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->defective_set_mode == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + uint32_t mode = IPC_GET_ARG2(*call); + + int rc = nic_iface->defective_set_mode(dev, mode); + async_answer_0(callid, rc); +} + +static void remote_nic_blocked_sources_get(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->blocked_sources_get == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + size_t max_count = IPC_GET_ARG2(*call); + nic_address_t *address_list = NULL; + + if (max_count != 0) { + address_list = malloc(max_count * sizeof(nic_address_t)); + if (!address_list) { + async_answer_0(callid, ENOMEM); + return; + } + } + + bzero(address_list, max_count * sizeof(nic_address_t)); + size_t address_count = 0; + + int rc = nic_iface->blocked_sources_get(dev, max_count, address_list, + &address_count); + + if ((rc != EOK) || (max_count == 0) || (address_count == 0)) { + async_answer_1(callid, rc, address_count); + free(address_list); + return; + } + + ipc_callid_t data_callid; + size_t max_len; + if (!async_data_read_receive(&data_callid, &max_len)) { + async_answer_0(data_callid, EINVAL); + async_answer_1(callid, rc, address_count); + free(address_list); + return; + } + + if (max_len > address_count * sizeof(nic_address_t)) + max_len = address_count * sizeof(nic_address_t); + + if (max_len > max_count * sizeof(nic_address_t)) + max_len = max_count * sizeof(nic_address_t); + + async_data_read_finalize(data_callid, address_list, max_len); + async_answer_0(data_callid, EINVAL); + + free(address_list); + async_answer_1(callid, rc, address_count); +} + +static void remote_nic_blocked_sources_set(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + + size_t length; + size_t address_count = IPC_GET_ARG2(*call); + nic_address_t *address_list = NULL; + + if (address_count) { + ipc_callid_t data_callid; + if (!async_data_write_receive(&data_callid, &length)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (length != address_count * sizeof(nic_address_t)) { + async_answer_0(data_callid, ELIMIT); + async_answer_0(callid, ELIMIT); + return; + } + + address_list = malloc(length); + if (address_list == NULL) { + async_answer_0(data_callid, ENOMEM); + async_answer_0(callid, ENOMEM); + return; + } + + if (async_data_write_finalize(data_callid, address_list, + length) != EOK) { + async_answer_0(callid, EINVAL); + free(address_list); + return; + } + } + + if (nic_iface->blocked_sources_set != NULL) { + int rc = nic_iface->blocked_sources_set(dev, address_list, + address_count); + async_answer_0(callid, rc); + } else + async_answer_0(callid, ENOTSUP); + + free(address_list); +} + +static void remote_nic_vlan_get_mask(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->vlan_get_mask == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_vlan_mask_t vlan_mask; + bzero(&vlan_mask, sizeof(nic_vlan_mask_t)); + + int rc = nic_iface->vlan_get_mask(dev, &vlan_mask); + if (rc == EOK) { + ipc_callid_t data_callid; + size_t max_len; + if (!async_data_read_receive(&data_callid, &max_len)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (max_len != sizeof(nic_vlan_mask_t)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + async_data_read_finalize(data_callid, &vlan_mask, max_len); + } + + async_answer_0(callid, rc); +} + +static void remote_nic_vlan_set_mask(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + + nic_vlan_mask_t vlan_mask; + nic_vlan_mask_t *vlan_mask_pointer = NULL; + bool vlan_mask_set = (bool) IPC_GET_ARG2(*call); + + if (vlan_mask_set) { + ipc_callid_t data_callid; + size_t length; + if (!async_data_write_receive(&data_callid, &length)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (length != sizeof(nic_vlan_mask_t)) { + async_answer_0(data_callid, ELIMIT); + async_answer_0(callid, ELIMIT); + return; + } + + if (async_data_write_finalize(data_callid, &vlan_mask, + length) != EOK) { + async_answer_0(callid, EINVAL); + return; + } + + vlan_mask_pointer = &vlan_mask; + } + + if (nic_iface->vlan_set_mask != NULL) { + int rc = nic_iface->vlan_set_mask(dev, vlan_mask_pointer); + async_answer_0(callid, rc); + } else + async_answer_0(callid, ENOTSUP); +} + +static void remote_nic_vlan_set_tag(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + + if (nic_iface->vlan_set_tag == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + uint16_t tag = (uint16_t) IPC_GET_ARG2(*call); + int add = (int) IPC_GET_ARG3(*call); + int strip = (int) IPC_GET_ARG4(*call); + + int rc = nic_iface->vlan_set_tag(dev, tag, add, strip); + async_answer_0(callid, rc); +} + +static void remote_nic_wol_virtue_add(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + + int send_data = (int) IPC_GET_ARG3(*call); + ipc_callid_t data_callid; + + if (nic_iface->wol_virtue_add == NULL) { + if (send_data) { + async_data_write_receive(&data_callid, NULL); + async_answer_0(data_callid, ENOTSUP); + } + + async_answer_0(callid, ENOTSUP); + } + + size_t length = 0; + void *data = NULL; + + if (send_data) { + if (!async_data_write_receive(&data_callid, &length)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + data = malloc(length); + if (data == NULL) { + async_answer_0(data_callid, ENOMEM); + async_answer_0(callid, ENOMEM); + return; + } + + if (async_data_write_finalize(data_callid, data, + length) != EOK) { + async_answer_0(callid, EINVAL); + free(data); + return; + } + } + + nic_wv_id_t id = 0; + nic_wv_type_t type = (nic_wv_type_t) IPC_GET_ARG2(*call); + + int rc = nic_iface->wol_virtue_add(dev, type, data, length, &id); + async_answer_1(callid, rc, (sysarg_t) id); + free(data); +} + +static void remote_nic_wol_virtue_remove(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + + if (nic_iface->wol_virtue_remove == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_wv_id_t id = (nic_wv_id_t) IPC_GET_ARG2(*call); + + int rc = nic_iface->wol_virtue_remove(dev, id); + async_answer_0(callid, rc); +} + +static void remote_nic_wol_virtue_probe(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + + if (nic_iface->wol_virtue_probe == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_wv_id_t id = (nic_wv_id_t) IPC_GET_ARG2(*call); + size_t max_length = IPC_GET_ARG3(*call); + nic_wv_type_t type = NIC_WV_NONE; + size_t length = 0; + ipc_callid_t data_callid; + void *data = NULL; + + if (max_length != 0) { + data = malloc(max_length); + if (data == NULL) { + async_answer_0(callid, ENOMEM); + return; + } + } + + bzero(data, max_length); + + int rc = nic_iface->wol_virtue_probe(dev, id, &type, max_length, + data, &length); + + if ((max_length != 0) && (length != 0)) { + size_t req_length; + if (!async_data_read_receive(&data_callid, &req_length)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + free(data); + return; + } + + if (req_length > length) + req_length = length; + + if (req_length > max_length) + req_length = max_length; + + async_data_read_finalize(data_callid, data, req_length); + } + + async_answer_2(callid, rc, (sysarg_t) type, (sysarg_t) length); + free(data); +} + +static void remote_nic_wol_virtue_list(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->wol_virtue_list == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_wv_type_t type = (nic_wv_type_t) IPC_GET_ARG2(*call); + size_t max_count = IPC_GET_ARG3(*call); + size_t count = 0; + nic_wv_id_t *id_list = NULL; + ipc_callid_t data_callid; + + if (max_count != 0) { + id_list = malloc(max_count * sizeof(nic_wv_id_t)); + if (id_list == NULL) { + async_answer_0(callid, ENOMEM); + return; + } + } + + bzero(id_list, max_count * sizeof (nic_wv_id_t)); + + int rc = nic_iface->wol_virtue_list(dev, type, max_count, id_list, + &count); + + if ((max_count != 0) && (count != 0)) { + size_t req_length; + if (!async_data_read_receive(&data_callid, &req_length)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + free(id_list); + return; + } + + if (req_length > count * sizeof(nic_wv_id_t)) + req_length = count * sizeof(nic_wv_id_t); + + if (req_length > max_count * sizeof(nic_wv_id_t)) + req_length = max_count * sizeof(nic_wv_id_t); + + rc = async_data_read_finalize(data_callid, id_list, req_length); + } + + async_answer_1(callid, rc, (sysarg_t) count); + free(id_list); +} + +static void remote_nic_wol_virtue_get_caps(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->wol_virtue_get_caps == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + int count = -1; + nic_wv_type_t type = (nic_wv_type_t) IPC_GET_ARG2(*call); + + int rc = nic_iface->wol_virtue_get_caps(dev, type, &count); + async_answer_1(callid, rc, (sysarg_t) count); +} + +static void remote_nic_wol_load_info(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->wol_load_info == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + size_t max_length = (size_t) IPC_GET_ARG2(*call); + size_t frame_length = 0; + nic_wv_type_t type = NIC_WV_NONE; + uint8_t *data = NULL; + + if (max_length != 0) { + data = malloc(max_length); + if (data == NULL) { + async_answer_0(callid, ENOMEM); + return; + } + } + + bzero(data, max_length); + + int rc = nic_iface->wol_load_info(dev, &type, max_length, data, + &frame_length); + if (rc == EOK) { + ipc_callid_t data_callid; + size_t req_length; + if (!async_data_read_receive(&data_callid, &req_length)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + free(data); + return; + } + + req_length = req_length > max_length ? max_length : req_length; + req_length = req_length > frame_length ? frame_length : req_length; + async_data_read_finalize(data_callid, data, req_length); + } + + async_answer_2(callid, rc, (sysarg_t) type, (sysarg_t) frame_length); + free(data); +} + +static void remote_nic_offload_probe(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->offload_probe == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + uint32_t supported = 0; + uint32_t active = 0; + + int rc = nic_iface->offload_probe(dev, &supported, &active); + async_answer_2(callid, rc, supported, active); +} + +static void remote_nic_offload_set(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->offload_set == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + uint32_t mask = (uint32_t) IPC_GET_ARG2(*call); + uint32_t active = (uint32_t) IPC_GET_ARG3(*call); + + int rc = nic_iface->offload_set(dev, mask, active); + async_answer_0(callid, rc); +} + +static void remote_nic_poll_get_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->poll_get_mode == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + nic_poll_mode_t mode = NIC_POLL_IMMEDIATE; + int request_data = IPC_GET_ARG2(*call); + struct timeval period = { + .tv_sec = 0, + .tv_usec = 0 + }; + + int rc = nic_iface->poll_get_mode(dev, &mode, &period); + if ((rc == EOK) && (request_data)) { + size_t max_len; + ipc_callid_t data_callid; + + if (!async_data_read_receive(&data_callid, &max_len)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (max_len != sizeof(struct timeval)) { + async_answer_0(data_callid, ELIMIT); + async_answer_0(callid, ELIMIT); + return; + } + + async_data_read_finalize(data_callid, &period, + sizeof(struct timeval)); + } + + async_answer_1(callid, rc, (sysarg_t) mode); +} + +static void remote_nic_poll_set_mode(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + + nic_poll_mode_t mode = IPC_GET_ARG2(*call); + int has_period = IPC_GET_ARG3(*call); + struct timeval period_buf; + struct timeval *period = NULL; + size_t length; + + if (has_period) { + ipc_callid_t data_callid; + if (!async_data_write_receive(&data_callid, &length)) { + async_answer_0(data_callid, EINVAL); + async_answer_0(callid, EINVAL); + return; + } + + if (length != sizeof(struct timeval)) { + async_answer_0(data_callid, ELIMIT); + async_answer_0(callid, ELIMIT); + return; + } + + period = &period_buf; + if (async_data_write_finalize(data_callid, period, + length) != EOK) { + async_answer_0(callid, EINVAL); + return; + } + } + + if (nic_iface->poll_set_mode != NULL) { + int rc = nic_iface->poll_set_mode(dev, mode, period); + async_answer_0(callid, rc); + } else + async_answer_0(callid, ENOTSUP); +} + +static void remote_nic_poll_now(ddf_fun_t *dev, void *iface, + ipc_callid_t callid, ipc_call_t *call) +{ + nic_iface_t *nic_iface = (nic_iface_t *) iface; + if (nic_iface->poll_now == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + int rc = nic_iface->poll_now(dev); + async_answer_0(callid, rc); +} + +/** Remote NIC interface operations. + * + */ +static remote_iface_func_ptr_t remote_nic_iface_ops[] = { + &remote_nic_send_message, + &remote_nic_connect_to_nil, + &remote_nic_get_state, + &remote_nic_set_state, + &remote_nic_get_address, + &remote_nic_set_address, + &remote_nic_get_stats, + &remote_nic_get_device_info, + &remote_nic_get_cable_state, + &remote_nic_get_operation_mode, + &remote_nic_set_operation_mode, + &remote_nic_autoneg_enable, + &remote_nic_autoneg_disable, + &remote_nic_autoneg_probe, + &remote_nic_autoneg_restart, + &remote_nic_get_pause, + &remote_nic_set_pause, + &remote_nic_unicast_get_mode, + &remote_nic_unicast_set_mode, + &remote_nic_multicast_get_mode, + &remote_nic_multicast_set_mode, + &remote_nic_broadcast_get_mode, + &remote_nic_broadcast_set_mode, + &remote_nic_defective_get_mode, + &remote_nic_defective_set_mode, + &remote_nic_blocked_sources_get, + &remote_nic_blocked_sources_set, + &remote_nic_vlan_get_mask, + &remote_nic_vlan_set_mask, + &remote_nic_vlan_set_tag, + &remote_nic_wol_virtue_add, + &remote_nic_wol_virtue_remove, + &remote_nic_wol_virtue_probe, + &remote_nic_wol_virtue_list, + &remote_nic_wol_virtue_get_caps, + &remote_nic_wol_load_info, + &remote_nic_offload_probe, + &remote_nic_offload_set, + &remote_nic_poll_get_mode, + &remote_nic_poll_set_mode, + &remote_nic_poll_now +}; + +/** Remote NIC interface structure. + * + * Interface for processing request from remote + * clients addressed to the NIC interface. + * + */ +remote_iface_t remote_nic_iface = { + .method_count = sizeof(remote_nic_iface_ops) / + sizeof(remote_iface_func_ptr_t), + .methods = remote_nic_iface_ops +}; + +/** + * @} + */ Index: uspace/lib/drv/include/ddf/driver.h =================================================================== --- uspace/lib/drv/include/ddf/driver.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/drv/include/ddf/driver.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -137,4 +137,10 @@ /** Callback method for passing a new device to the device driver */ int (*add_device)(ddf_dev_t *); + /** + * Notification that the device was succesfully added. + * The driver can do any blocking operation without + * blocking the device manager. + */ + void (*device_added)(ddf_dev_t *dev); /** Ask driver to remove a device */ int (*dev_remove)(ddf_dev_t *); Index: uspace/lib/drv/include/ops/nic.h =================================================================== --- uspace/lib/drv/include/ops/nic.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/drv/include/ops/nic.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + * @brief DDF NIC interface definition + */ + +#ifndef LIBDRV_OPS_NIC_H_ +#define LIBDRV_OPS_NIC_H_ + +#include +#include +#include +#include + +#include "../ddf/driver.h" + +typedef struct nic_iface { + /** Mandatory methods */ + int (*send_message)(ddf_fun_t *, packet_id_t); + int (*connect_to_nil)(ddf_fun_t *, services_t, nic_device_id_t); + int (*get_state)(ddf_fun_t *, nic_device_state_t *); + int (*set_state)(ddf_fun_t *, nic_device_state_t); + int (*get_address)(ddf_fun_t *, nic_address_t *); + + /** Optional methods */ + int (*set_address)(ddf_fun_t *, const nic_address_t *); + int (*get_stats)(ddf_fun_t *, nic_device_stats_t *); + int (*get_device_info)(ddf_fun_t *, nic_device_info_t *); + int (*get_cable_state)(ddf_fun_t *, nic_cable_state_t *); + + int (*get_operation_mode)(ddf_fun_t *, int *, nic_channel_mode_t *, + nic_role_t *); + int (*set_operation_mode)(ddf_fun_t *, int, nic_channel_mode_t, + nic_role_t); + int (*autoneg_enable)(ddf_fun_t *, uint32_t); + int (*autoneg_disable)(ddf_fun_t *); + int (*autoneg_probe)(ddf_fun_t *, uint32_t *, uint32_t *, + nic_result_t *, nic_result_t *); + int (*autoneg_restart)(ddf_fun_t *); + int (*get_pause)(ddf_fun_t *, nic_result_t *, nic_result_t *, + uint16_t *); + int (*set_pause)(ddf_fun_t *, int, int, uint16_t); + + int (*unicast_get_mode)(ddf_fun_t *, nic_unicast_mode_t *, size_t, + nic_address_t *, size_t *); + int (*unicast_set_mode)(ddf_fun_t *, nic_unicast_mode_t, + const nic_address_t *, size_t); + int (*multicast_get_mode)(ddf_fun_t *, nic_multicast_mode_t *, size_t, + nic_address_t *, size_t *); + int (*multicast_set_mode)(ddf_fun_t *, nic_multicast_mode_t, + const nic_address_t *, size_t); + int (*broadcast_get_mode)(ddf_fun_t *, nic_broadcast_mode_t *); + int (*broadcast_set_mode)(ddf_fun_t *, nic_broadcast_mode_t); + int (*defective_get_mode)(ddf_fun_t *, uint32_t *); + int (*defective_set_mode)(ddf_fun_t *, uint32_t); + int (*blocked_sources_get)(ddf_fun_t *, size_t, nic_address_t *, + size_t *); + int (*blocked_sources_set)(ddf_fun_t *, const nic_address_t *, size_t); + + int (*vlan_get_mask)(ddf_fun_t *, nic_vlan_mask_t *); + int (*vlan_set_mask)(ddf_fun_t *, const nic_vlan_mask_t *); + int (*vlan_set_tag)(ddf_fun_t *, uint16_t, int, int); + + int (*wol_virtue_add)(ddf_fun_t *, nic_wv_type_t, const void *, + size_t, nic_wv_id_t *); + int (*wol_virtue_remove)(ddf_fun_t *, nic_wv_id_t); + int (*wol_virtue_probe)(ddf_fun_t *, nic_wv_id_t, nic_wv_type_t *, + size_t, void *, size_t *); + int (*wol_virtue_list)(ddf_fun_t *, nic_wv_type_t, size_t, + nic_wv_id_t *, size_t *); + int (*wol_virtue_get_caps)(ddf_fun_t *, nic_wv_type_t, int *); + int (*wol_load_info)(ddf_fun_t *, nic_wv_type_t *, size_t, + uint8_t *, size_t *); + + int (*offload_probe)(ddf_fun_t *, uint32_t *, uint32_t *); + int (*offload_set)(ddf_fun_t *, uint32_t, uint32_t); + + int (*poll_get_mode)(ddf_fun_t *, nic_poll_mode_t *, + struct timeval *); + int (*poll_set_mode)(ddf_fun_t *, nic_poll_mode_t, + const struct timeval *); + int (*poll_now)(ddf_fun_t *); +} nic_iface_t; + +#endif + +/** + * @} + */ Index: uspace/lib/drv/include/remote_nic.h =================================================================== --- uspace/lib/drv/include/remote_nic.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/drv/include/remote_nic.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** @addtogroup libdrv + * @{ + */ +/** @file + */ + +#ifndef LIBDRV_REMOTE_NIC_H_ +#define LIBDRV_REMOTE_NIC_H_ + +extern remote_iface_t remote_nic_iface; + +#endif + +/** + * @} + */ Index: uspace/lib/net/Makefile =================================================================== --- uspace/lib/net/Makefile (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -40,6 +40,4 @@ generic/protocol_map.c \ adt/module_map.c \ - netif/netif_remote.c \ - netif/netif_skel.c \ nil/nil_remote.c \ nil/nil_skel.c \ Index: uspace/lib/net/generic/generic.c =================================================================== --- uspace/lib/net/generic/generic.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/generic/generic.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -54,5 +54,5 @@ */ int generic_device_state_msg_remote(async_sess_t *sess, sysarg_t message, - device_id_t device_id, sysarg_t state, services_t target) + nic_device_id_t device_id, sysarg_t state, services_t target) { async_exch_t *exch = async_exchange_begin(sess); @@ -68,5 +68,4 @@ * @param[in] message Service specific message. * @param[in] device_id Device identifier. - * @param[in] arg2 Second argument of the message. * @param[in] service Device module service. * @@ -77,9 +76,9 @@ */ int generic_device_req_remote(async_sess_t *sess, sysarg_t message, - device_id_t device_id, sysarg_t arg2, services_t service) -{ - async_exch_t *exch = async_exchange_begin(sess); - int rc = async_req_3_0(exch, message, (sysarg_t) device_id, - arg2, (sysarg_t) service); + nic_device_id_t device_id, services_t service) +{ + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_3_0(exch, message, (sysarg_t) device_id, 0, + (sysarg_t) service); async_exchange_end(exch); @@ -103,25 +102,21 @@ */ int generic_get_addr_req(async_sess_t *sess, sysarg_t message, - device_id_t device_id, measured_string_t **address, uint8_t **data) -{ - if ((!address) || (!data)) + nic_device_id_t device_id, uint8_t *address, size_t max_len) +{ + if (!address) return EBADMEM; /* Request the address */ async_exch_t *exch = async_exchange_begin(sess); - aid_t message_id = async_send_1(exch, message, (sysarg_t) device_id, + aid_t aid = async_send_1(exch, message, (sysarg_t) device_id, NULL); - int rc = measured_strings_return(exch, address, data, 1); + int rc = async_data_read_start(exch, address, max_len); async_exchange_end(exch); sysarg_t result; - async_wait_for(message_id, &result); - - /* If not successful */ - if ((rc == EOK) && (result != EOK)) { - /* Clear the data */ - free(*address); - free(*data); - } + async_wait_for(aid, &result); + + if (rc != EOK) + return rc; return (int) result; @@ -142,5 +137,5 @@ */ int generic_packet_size_req_remote(async_sess_t *sess, sysarg_t message, - device_id_t device_id, packet_dimension_t *packet_dimension) + nic_device_id_t device_id, packet_dimension_t *packet_dimension) { if (!packet_dimension) @@ -179,5 +174,5 @@ */ int generic_received_msg_remote(async_sess_t *sess, sysarg_t message, - device_id_t device_id, packet_id_t packet_id, services_t target, + nic_device_id_t device_id, packet_id_t packet_id, services_t target, services_t error) { @@ -210,5 +205,5 @@ */ int generic_send_msg_remote(async_sess_t *sess, sysarg_t message, - device_id_t device_id, packet_id_t packet_id, services_t sender, + nic_device_id_t device_id, packet_id_t packet_id, services_t sender, services_t error) { @@ -251,5 +246,5 @@ */ int generic_translate_req(async_sess_t *sess, sysarg_t message, - device_id_t device_id, services_t service, + nic_device_id_t device_id, services_t service, measured_string_t *configuration, size_t count, measured_string_t **translation, uint8_t **data) Index: uspace/lib/net/generic/net_checksum.c =================================================================== --- uspace/lib/net/generic/net_checksum.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/generic/net_checksum.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -40,8 +40,11 @@ /** Big-endian encoding CRC divider. */ -#define CRC_DIVIDER_BE 0x04c11db7 +#define CRC_DIVIDER_BE 0x04c11db7 /** Little-endian encoding CRC divider. */ -#define CRC_DIVIDER_LE 0xedb88320 +#define CRC_DIVIDER_LE 0xedb88320 + +/** Polynomial used in multicast address hashing */ +#define CRC_MCAST_POLYNOMIAL 0x04c11db6 /** Compacts the computed checksum to the 16 bit number adding the carries. @@ -203,5 +206,5 @@ } -/** Computes the ip header checksum. +/** Compute the IP header checksum. * * To compute the checksum of a new packet, the checksum header field must be @@ -221,4 +224,39 @@ } +/** Compute the standard hash from MAC + * + * Hashing MAC into 64 possible values and using the value as index to + * 64bit number. + * + * The code is copied from qemu-0.13's implementation of ne2000 and rt8139 + * drivers, but according to documentation there it originates in FreeBSD. + * + * @param[in] addr The 6-byte MAC address to be hashed + * + * @return 64-bit number with only single bit set to 1 + * + */ +uint64_t multicast_hash(const uint8_t addr[6]) +{ + uint32_t crc; + int carry, i, j; + uint8_t b; + + crc = 0xffffffff; + for (i = 0; i < 6; i++) { + b = addr[i]; + for (j = 0; j < 8; j++) { + carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01); + crc <<= 1; + b >>= 1; + if (carry) + crc = ((crc ^ CRC_MCAST_POLYNOMIAL) | carry); + } + } + + uint64_t one64 = 1; + return one64 << (crc >> 26); +} + /** @} */ Index: uspace/lib/net/generic/net_remote.c =================================================================== --- uspace/lib/net/generic/net_remote.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/generic/net_remote.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -38,7 +38,7 @@ #include #include - #include - +#include +#include #include #include @@ -98,5 +98,5 @@ size_t count, uint8_t **data) { - return generic_translate_req(sess, NET_NET_GET_DEVICE_CONF, 0, 0, + return generic_translate_req(sess, NET_NET_GET_CONF, 0, 0, *configuration, count, configuration, data); } @@ -124,5 +124,5 @@ * */ -int net_get_device_conf_req(async_sess_t *sess, device_id_t device_id, +int net_get_device_conf_req(async_sess_t *sess, nic_device_id_t device_id, measured_string_t **configuration, size_t count, uint8_t **data) { @@ -131,4 +131,49 @@ } +int net_get_devices_req(async_sess_t *sess, measured_string_t **devices, + size_t *count, uint8_t **data) +{ + if ((!devices) || (!count)) + return EBADMEM; + + async_exch_t *exch = async_exchange_begin(sess); + + int rc = async_req_0_1(exch, NET_NET_GET_DEVICES_COUNT, count); + if (rc != EOK) { + async_exchange_end(exch); + return rc; + } + + if (*count == 0) { + async_exchange_end(exch); + *data = NULL; + return EOK; + } + + aid_t message_id = async_send_0(exch, NET_NET_GET_DEVICES, NULL); + rc = measured_strings_return(exch, devices, data, *count); + + async_exchange_end(exch); + + sysarg_t result; + async_wait_for(message_id, &result); + + if ((rc == EOK) && (result != EOK)) { + free(*devices); + free(*data); + } + + return (int) result; +} + +int net_driver_ready(async_sess_t *sess, devman_handle_t handle) +{ + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_1_0(exch, NET_NET_DRIVER_READY, handle); + async_exchange_end(exch); + + return rc; +} + /** @} */ Index: uspace/lib/net/generic/packet_remote.c =================================================================== --- uspace/lib/net/generic/packet_remote.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/generic/packet_remote.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -115,5 +115,5 @@ *packet = pm_find(packet_id); - if (!*packet) { + if (*packet == NULL) { async_exch_t *exch = async_exchange_begin(sess); sysarg_t size; @@ -130,5 +130,5 @@ } - if ((*packet)->next) { + if ((*packet != NULL) && ((*packet)->next)) { packet_t *next; return packet_translate_remote(sess, &next, (*packet)->next); Index: uspace/lib/net/generic/protocol_map.c =================================================================== --- uspace/lib/net/generic/protocol_map.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/generic/protocol_map.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -50,5 +50,5 @@ switch (nil) { case SERVICE_ETHERNET: - case SERVICE_NE2000: + case SERVICE_NILDUMMY: switch (il) { case SERVICE_IP: @@ -76,5 +76,5 @@ switch (nil) { case SERVICE_ETHERNET: - case SERVICE_NE2000: + case SERVICE_NILDUMMY: switch (protocol) { case ETH_P_IP: @@ -139,5 +139,4 @@ switch (nil) { case SERVICE_ETHERNET: - case SERVICE_NE2000: return HW_ETHER; default: Index: uspace/lib/net/il/arp_remote.c =================================================================== --- uspace/lib/net/il/arp_remote.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/il/arp_remote.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -84,5 +84,5 @@ * */ -int arp_clear_address_req(async_sess_t *sess, device_id_t device_id, +int arp_clear_address_req(async_sess_t *sess, nic_device_id_t device_id, services_t protocol, measured_string_t *address) { @@ -108,5 +108,5 @@ * */ -int arp_clear_device_req(async_sess_t *sess, device_id_t device_id) +int arp_clear_device_req(async_sess_t *sess, nic_device_id_t device_id) { async_exch_t *exch = async_exchange_begin(sess); @@ -143,5 +143,5 @@ * */ -int arp_device_req(async_sess_t *sess, device_id_t device_id, +int arp_device_req(async_sess_t *sess, nic_device_id_t device_id, services_t protocol, services_t netif, measured_string_t *address) { @@ -177,5 +177,5 @@ * */ -int arp_translate_req(async_sess_t *sess, device_id_t device_id, +int arp_translate_req(async_sess_t *sess, nic_device_id_t device_id, services_t protocol, measured_string_t *address, measured_string_t **translation, uint8_t **data) Index: uspace/lib/net/il/il_remote.c =================================================================== --- uspace/lib/net/il/il_remote.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/il/il_remote.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -55,6 +55,6 @@ * */ -int il_device_state_msg(async_sess_t *sess, device_id_t device_id, - device_state_t state, services_t target) +int il_device_state_msg(async_sess_t *sess, nic_device_id_t device_id, + nic_device_state_t state, services_t target) { return generic_device_state_msg_remote(sess, NET_IL_DEVICE_STATE, @@ -73,6 +73,6 @@ * */ -int il_received_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, - services_t target) +int il_received_msg(async_sess_t *sess, nic_device_id_t device_id, + packet_t *packet, services_t target) { return generic_received_msg_remote(sess, NET_IL_RECEIVED, device_id, @@ -91,5 +91,5 @@ * */ -int il_mtu_changed_msg(async_sess_t *sess, device_id_t device_id, size_t mtu, +int il_mtu_changed_msg(async_sess_t *sess, nic_device_id_t device_id, size_t mtu, services_t target) { @@ -98,4 +98,26 @@ } +/** Notify IL layer modules about address change (implemented by ARP) + * + */ +int il_addr_changed_msg(async_sess_t *sess, nic_device_id_t device_id, + size_t addr_len, const uint8_t *address) +{ + async_exch_t *exch = async_exchange_begin(sess); + + aid_t message_id = async_send_1(exch, NET_IL_ADDR_CHANGED, + (sysarg_t) device_id, NULL); + int rc = async_data_write_start(exch, address, addr_len); + + async_exchange_end(exch); + + sysarg_t res; + async_wait_for(message_id, &res); + if (rc != EOK) + return rc; + + return (int) res; +} + /** @} */ Index: uspace/lib/net/il/ip_remote.c =================================================================== --- uspace/lib/net/il/ip_remote.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/il/ip_remote.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -62,5 +62,5 @@ * */ -int ip_add_route_req_remote(async_sess_t *sess, device_id_t device_id, +int ip_add_route_req_remote(async_sess_t *sess, nic_device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway) { @@ -123,8 +123,8 @@ * */ -int ip_device_req_remote(async_sess_t *sess, device_id_t device_id, +int ip_device_req(async_sess_t *sess, nic_device_id_t device_id, services_t service) { - return generic_device_req_remote(sess, NET_IP_DEVICE, device_id, 0, + return generic_device_req_remote(sess, NET_IP_DEVICE, device_id, service); } @@ -144,5 +144,5 @@ int ip_get_route_req_remote(async_sess_t *sess, ip_protocol_t protocol, const struct sockaddr *destination, socklen_t addrlen, - device_id_t *device_id, void **header, size_t *headerlen) + nic_device_id_t *device_id, void **header, size_t *headerlen) { if ((!destination) || (addrlen == 0)) @@ -196,5 +196,5 @@ * */ -int ip_packet_size_req_remote(async_sess_t *sess, device_id_t device_id, +int ip_packet_size_req_remote(async_sess_t *sess, nic_device_id_t device_id, packet_dimension_t *packet_dimension) { @@ -216,5 +216,5 @@ * */ -int ip_received_error_msg_remote(async_sess_t *sess, device_id_t device_id, +int ip_received_error_msg_remote(async_sess_t *sess, nic_device_id_t device_id, packet_t *packet, services_t target, services_t error) { @@ -240,5 +240,5 @@ * */ -int ip_send_msg_remote(async_sess_t *sess, device_id_t device_id, +int ip_send_msg_remote(async_sess_t *sess, nic_device_id_t device_id, packet_t *packet, services_t sender, services_t error) { @@ -256,5 +256,5 @@ * */ -int ip_set_gateway_req_remote(async_sess_t *sess, device_id_t device_id, +int ip_set_gateway_req_remote(async_sess_t *sess, nic_device_id_t device_id, in_addr_t gateway) { Index: uspace/lib/net/include/arp_interface.h =================================================================== --- uspace/lib/net/include/arp_interface.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/arp_interface.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -46,10 +46,10 @@ /*@{*/ -extern int arp_device_req(async_sess_t *, device_id_t, services_t, services_t, +extern int arp_device_req(async_sess_t *, nic_device_id_t, services_t, services_t, measured_string_t *); -extern int arp_translate_req(async_sess_t *, device_id_t, services_t, +extern int arp_translate_req(async_sess_t *, nic_device_id_t, services_t, measured_string_t *, measured_string_t **, uint8_t **); -extern int arp_clear_device_req(async_sess_t *, device_id_t); -extern int arp_clear_address_req(async_sess_t *, device_id_t, services_t, +extern int arp_clear_device_req(async_sess_t *, nic_device_id_t); +extern int arp_clear_address_req(async_sess_t *, nic_device_id_t, services_t, measured_string_t *); extern int arp_clean_cache_req(async_sess_t *); Index: uspace/lib/net/include/generic.h =================================================================== --- uspace/lib/net/include/generic.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/generic.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -45,16 +45,16 @@ extern int generic_device_state_msg_remote(async_sess_t *, sysarg_t, - device_id_t, sysarg_t, services_t); -extern int generic_device_req_remote(async_sess_t *, sysarg_t, device_id_t, - sysarg_t, services_t); -extern int generic_get_addr_req(async_sess_t *, sysarg_t, device_id_t, - measured_string_t **, uint8_t **); -extern int generic_packet_size_req_remote(async_sess_t *, sysarg_t, device_id_t, - packet_dimension_t *); -extern int generic_received_msg_remote(async_sess_t *, sysarg_t, device_id_t, + nic_device_id_t, sysarg_t, services_t); +extern int generic_device_req_remote(async_sess_t *, sysarg_t, nic_device_id_t, + services_t); +extern int generic_get_addr_req(async_sess_t *, sysarg_t, nic_device_id_t, + uint8_t *address, size_t max_length); +extern int generic_packet_size_req_remote(async_sess_t *, sysarg_t, + nic_device_id_t, packet_dimension_t *); +extern int generic_received_msg_remote(async_sess_t *, sysarg_t, + nic_device_id_t, packet_id_t, services_t, services_t); +extern int generic_send_msg_remote(async_sess_t *, sysarg_t, nic_device_id_t, packet_id_t, services_t, services_t); -extern int generic_send_msg_remote(async_sess_t *, sysarg_t, device_id_t, - packet_id_t, services_t, services_t); -extern int generic_translate_req(async_sess_t *, sysarg_t, device_id_t, +extern int generic_translate_req(async_sess_t *, sysarg_t, nic_device_id_t, services_t, measured_string_t *, size_t, measured_string_t **, uint8_t **); Index: uspace/lib/net/include/il_remote.h =================================================================== --- uspace/lib/net/include/il_remote.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/il_remote.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -50,8 +50,12 @@ /*@{*/ -extern int il_device_state_msg(async_sess_t *, device_id_t, device_state_t, +extern int il_device_state_msg(async_sess_t *, nic_device_id_t, + nic_device_state_t, services_t); +extern int il_received_msg(async_sess_t *, nic_device_id_t, packet_t *, services_t); -extern int il_received_msg(async_sess_t *, device_id_t, packet_t *, services_t); -extern int il_mtu_changed_msg(async_sess_t *, device_id_t, size_t, services_t); +extern int il_mtu_changed_msg(async_sess_t *, nic_device_id_t, size_t, + services_t); +extern int il_addr_changed_msg(async_sess_t *, nic_device_id_t, size_t, + const uint8_t *); /*@}*/ Index: uspace/lib/net/include/ip_interface.h =================================================================== --- uspace/lib/net/include/ip_interface.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/ip_interface.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -46,5 +46,4 @@ #define ip_set_gateway_req ip_set_gateway_req_remote #define ip_packet_size_req ip_packet_size_req_remote -#define ip_device_req ip_device_req_remote #define ip_add_route_req ip_add_route_req_remote #define ip_send_msg ip_send_msg_remote @@ -69,5 +68,5 @@ * */ -typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t *packet, +typedef int (*tl_received_msg_t)(nic_device_id_t device_id, packet_t *packet, services_t receiver, services_t error); Index: uspace/lib/net/include/ip_remote.h =================================================================== --- uspace/lib/net/include/ip_remote.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/ip_remote.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -43,16 +43,16 @@ #include -extern int ip_set_gateway_req_remote(async_sess_t *, device_id_t, in_addr_t); -extern int ip_packet_size_req_remote(async_sess_t *, device_id_t, +extern int ip_set_gateway_req_remote(async_sess_t *, nic_device_id_t, in_addr_t); +extern int ip_packet_size_req_remote(async_sess_t *, nic_device_id_t, packet_dimension_t *); -extern int ip_received_error_msg_remote(async_sess_t *, device_id_t, packet_t *, +extern int ip_received_error_msg_remote(async_sess_t *, nic_device_id_t, packet_t *, services_t, services_t); -extern int ip_device_req_remote(async_sess_t *, device_id_t, services_t); -extern int ip_add_route_req_remote(async_sess_t *, device_id_t, in_addr_t, +extern int ip_device_req(async_sess_t *, nic_device_id_t, services_t); +extern int ip_add_route_req_remote(async_sess_t *, nic_device_id_t, in_addr_t, in_addr_t, in_addr_t); -extern int ip_send_msg_remote(async_sess_t *, device_id_t, packet_t *, +extern int ip_send_msg_remote(async_sess_t *, nic_device_id_t, packet_t *, services_t, services_t); extern int ip_get_route_req_remote(async_sess_t *, ip_protocol_t, - const struct sockaddr *, socklen_t, device_id_t *, void **, size_t *); + const struct sockaddr *, socklen_t, nic_device_id_t *, void **, size_t *); #endif Index: uspace/lib/net/include/net_checksum.h =================================================================== --- uspace/lib/net/include/net_checksum.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/net_checksum.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -30,5 +30,4 @@ * @{ */ - /** @file * General CRC and checksum computation. @@ -42,14 +41,22 @@ /** IP checksum value for computed zero checksum. + * * Zero is returned as 0xFFFF (not flipped) + * */ -#define IP_CHECKSUM_ZERO 0xffffU +#define IP_CHECKSUM_ZERO 0xffffU -#ifdef ARCH_IS_BIG_ENDIAN +#ifdef __BE__ + #define compute_crc32(seed, data, length) \ compute_crc32_be(seed, (uint8_t *) data, length) -#else + +#endif + +#ifdef __LE__ + #define compute_crc32(seed, data, length) \ compute_crc32_le(seed, (uint8_t *) data, length) + #endif @@ -60,4 +67,5 @@ extern uint16_t flip_checksum(uint16_t); extern uint16_t ip_checksum(uint8_t *, size_t); +extern uint64_t multicast_hash(const uint8_t addr[6]); #endif Index: uspace/lib/net/include/net_interface.h =================================================================== --- uspace/lib/net/include/net_interface.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/net_interface.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -35,8 +35,8 @@ #include - #include #include #include +#include /** @name Networking module interface @@ -45,9 +45,12 @@ /*@{*/ -extern int net_get_device_conf_req(async_sess_t *, device_id_t, +extern int net_get_device_conf_req(async_sess_t *, nic_device_id_t, measured_string_t **, size_t, uint8_t **); extern int net_get_conf_req(async_sess_t *, measured_string_t **, size_t, uint8_t **); extern void net_free_settings(measured_string_t *, uint8_t *); +extern int net_get_devices_req(async_sess_t *, measured_string_t **, size_t *, + uint8_t **); +extern int net_driver_ready(async_sess_t *, devman_handle_t); extern async_sess_t *net_connect_module(void); Index: pace/lib/net/include/netif_remote.h =================================================================== --- uspace/lib/net/include/netif_remote.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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. - */ - -/** @addtogroup libnet - * @{ - */ - -#ifndef LIBNET_NETIF_REMOTE_H_ -#define LIBNET_NETIF_REMOTE_H_ - -#include -#include -#include -#include -#include - -extern int netif_get_addr_req(async_sess_t *, device_id_t, measured_string_t **, - uint8_t **); -extern int netif_probe_req(async_sess_t *, device_id_t, int, void *); -extern int netif_send_msg(async_sess_t *, device_id_t, packet_t *, services_t); -extern int netif_start_req(async_sess_t *, device_id_t); -extern int netif_stop_req(async_sess_t *, device_id_t); -extern int netif_stats_req(async_sess_t *, device_id_t, device_stats_t *); -extern async_sess_t *netif_bind_service(services_t, device_id_t, services_t, - async_client_conn_t); - -#endif - -/** @} - */ Index: pace/lib/net/include/netif_skel.h =================================================================== --- uspace/lib/net/include/netif_skel.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,212 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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. - */ - -/** @addtogroup libnet - * @{ - */ - -/** @file - * Network interface module skeleton. - * The skeleton has to be part of each network interface module. - */ - -#ifndef NET_NETIF_SKEL_H_ -#define NET_NETIF_SKEL_H_ - -#include -#include -#include -#include -#include -#include - -/** Network interface device specific data. */ -typedef struct { - device_id_t device_id; /**< Device identifier. */ - device_state_t state; /**< Actual device state. */ - void *specific; /**< Driver specific data. */ -} netif_device_t; - -/** Device map. - * - * Maps device identifiers to the network interface device specific data. - * @see device.h - * - */ -DEVICE_MAP_DECLARE(netif_device_map, netif_device_t); - -/** Network interface module skeleton global data. */ -typedef struct { - async_sess_t *sess; /**< Networking module session. */ - async_sess_t *nil_sess; /**< Network interface layer session. */ - netif_device_map_t device_map; /**< Device map. */ - fibril_rwlock_t lock; /**< Safety lock. */ -} netif_globals_t; - -extern netif_globals_t netif_globals; - -/** Initialize the specific module. - * - * This function has to be implemented in user code. - * - */ -extern int netif_initialize(void); - -/** Probe the existence of the device. - * - * This has to be implemented in user code. - * - * @param[in] device_id Device identifier. - * @param[in] irq Device interrupt number. - * @param[in] io Device input/output address. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - * - */ -extern int netif_probe_message(device_id_t device_id, int irq, void *io); - -/** Send the packet queue. - * - * This has to be implemented in user code. - * - * @param[in] device_id Device identifier. - * @param[in] packet Packet queue. - * @param[in] sender Sending module service. - * - * @return EOK on success. - * @return EFORWARD if the device is not active (in the - * NETIF_ACTIVE state). - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - * - */ -extern int netif_send_message(device_id_t device_id, packet_t *packet, - services_t sender); - -/** Start the device. - * - * This has to be implemented in user code. - * - * @param[in] device Device structure. - * - * @return New network interface state (non-negative values). - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - * - */ -extern int netif_start_message(netif_device_t *device); - -/** Stop the device. - * - * This has to be implemented in user code. - * - * @param[in] device Device structure. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - * - */ -extern int netif_stop_message(netif_device_t *device); - -/** Return the device local hardware address. - * - * This has to be implemented in user code. - * - * @param[in] device_id Device identifier. - * @param[out] address Device local hardware address. - * - * @return EOK on success. - * @return EBADMEM if the address parameter is NULL. - * @return ENOENT if there no such device. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - * - */ -extern int netif_get_addr_message(device_id_t device_id, - measured_string_t *address); - -/** Process the netif driver specific message. - * - * This function is called for uncommon messages received by the netif - * skeleton. This has to be implemented in user code. - * - * @param[in] callid Message identifier. - * @param[in] call Message. - * @param[out] answer Answer. - * @param[out] count Number of answer arguments. - * - * @return EOK on success. - * @return ENOTSUP if the message is not known. - * @return Other error codes as defined for the specific module - * message implementation. - * - */ -extern int netif_specific_message(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, size_t *count); - -/** Return the device usage statistics. - * - * This has to be implemented in user code. - * - * @param[in] device_id Device identifier. - * @param[out] stats Device usage statistics. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - * - */ -extern int netif_get_device_stats(device_id_t device_id, - device_stats_t *stats); - -extern int find_device(device_id_t, netif_device_t **); -extern void null_device_stats(device_stats_t *); -extern void netif_pq_release(packet_id_t); -extern packet_t *netif_packet_get_1(size_t); - -extern int netif_module_start(void); - -#endif - -/** @} - */ Index: uspace/lib/net/include/nil_remote.h =================================================================== --- uspace/lib/net/include/nil_remote.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/nil_remote.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -34,7 +34,7 @@ #define __NET_NIL_REMOTE_H__ -#include #include #include +#include #include #include @@ -58,11 +58,10 @@ packet_get_id(packet), sender, 0) -#define nil_device_req(sess, device_id, mtu, netif_service) \ - generic_device_req_remote(sess, NET_NIL_DEVICE, device_id, mtu, \ - netif_service) - -extern int nil_device_state_msg(async_sess_t *, device_id_t, sysarg_t); -extern int nil_received_msg(async_sess_t *, device_id_t, packet_t *, - services_t); +extern int nil_device_req(async_sess_t *, nic_device_id_t, devman_handle_t, + size_t); +extern int nil_device_state_msg(async_sess_t *, nic_device_id_t, sysarg_t); +extern int nil_received_msg(async_sess_t *, nic_device_id_t, packet_id_t); +extern int nil_addr_changed_msg(async_sess_t *, nic_device_id_t, + const nic_address_t *); #endif Index: uspace/lib/net/include/nil_skel.h =================================================================== --- uspace/lib/net/include/nil_skel.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/nil_skel.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -70,5 +70,5 @@ * */ -extern int nil_device_state_msg_local(device_id_t device_id, sysarg_t state); +extern int nil_device_state_msg_local(nic_device_id_t device_id, sysarg_t state); /** Pass the packet queue to the network interface layer. @@ -81,5 +81,4 @@ * @param[in] device_id Source device identifier. * @param[in] packet Received packet or the received packet queue. - * @param[in] target Target service. Ignored parameter. * * @return EOK on success. @@ -88,6 +87,5 @@ * */ -extern int nil_received_msg_local(device_id_t device_id, packet_t *packet, - services_t target); +extern int nil_received_msg_local(nic_device_id_t device_id, packet_t *packet); /** Message processing function. Index: uspace/lib/net/include/tl_common.h =================================================================== --- uspace/lib/net/include/tl_common.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/tl_common.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -52,7 +52,7 @@ extern int tl_get_ip_packet_dimension(async_sess_t *, packet_dimensions_t *, - device_id_t, packet_dimension_t **); + nic_device_id_t, packet_dimension_t **); extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *); -extern int tl_update_ip_packet_dimension(packet_dimensions_t *, device_id_t, +extern int tl_update_ip_packet_dimension(packet_dimensions_t *, nic_device_id_t, size_t); extern int tl_set_address_port(struct sockaddr *, int, uint16_t); Index: uspace/lib/net/include/tl_remote.h =================================================================== --- uspace/lib/net/include/tl_remote.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/include/tl_remote.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -51,6 +51,6 @@ /*@{*/ -extern int tl_received_msg(async_sess_t *, device_id_t, packet_t *, services_t, - services_t); +extern int tl_received_msg(async_sess_t *, nic_device_id_t, packet_t *, + services_t, services_t); /*@}*/ Index: pace/lib/net/netif/netif_remote.c =================================================================== --- uspace/lib/net/netif/netif_remote.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,199 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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. - */ - -/** @addtogroup libnet - * @{ - */ - -/** @file - * Network interface module interface implementation for remote modules. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** Return the device local hardware address. - * - * @param[in] sess Network interface session. - * @param[in] device_id Device identifier. - * @param[out] address Device local hardware address. - * @param[out] data Address data. - * - * @return EOK on success. - * @return EBADMEM if the address parameter is NULL. - * @return ENOENT if there no such device. - * @return Other error codes as defined for the - * netif_get_addr_message() function. - * - */ -int netif_get_addr_req(async_sess_t *sess, device_id_t device_id, - measured_string_t **address, uint8_t **data) -{ - return generic_get_addr_req(sess, NET_NETIF_GET_ADDR, device_id, - address, data); -} - -/** Probe the existence of the device. - * - * @param[in] sess Network interface session. - * @param[in] device_id Device identifier. - * @param[in] irq Device interrupt number. - * @param[in] io Device input/output address. - * - * @return EOK on success. - * @return Other error codes as defined for the - * netif_probe_message(). - * - */ -int netif_probe_req(async_sess_t *sess, device_id_t device_id, int irq, void *io) -{ - async_exch_t *exch = async_exchange_begin(sess); - int rc = async_req_3_0(exch, NET_NETIF_PROBE, device_id, (sysarg_t) irq, - (sysarg_t) io); - async_exchange_end(exch); - - return rc; -} - -/** Send the packet queue. - * - * @param[in] sess Network interface session. - * @param[in] device_id Device identifier. - * @param[in] packet Packet queue. - * @param[in] sender Sending module service. - * - * @return EOK on success. - * @return Other error codes as defined for the generic_send_msg() - * function. - * - */ -int netif_send_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, - services_t sender) -{ - return generic_send_msg_remote(sess, NET_NETIF_SEND, device_id, - packet_get_id(packet), sender, 0); -} - -/** Start the device. - * - * @param[in] sess Network interface session. - * @param[in] device_id Device identifier. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the - * netif_start_message() function. - * - */ -int netif_start_req(async_sess_t *sess, device_id_t device_id) -{ - async_exch_t *exch = async_exchange_begin(sess); - int rc = async_req_1_0(exch, NET_NETIF_START, device_id); - async_exchange_end(exch); - - return rc; -} - -/** Stop the device. - * - * @param[in] sess Network interface session. - * @param[in] device_id Device identifier. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the - * netif_stop_message() function. - * - */ -int netif_stop_req(async_sess_t *sess, device_id_t device_id) -{ - async_exch_t *exch = async_exchange_begin(sess); - int rc = async_req_1_0(exch, NET_NETIF_STOP, device_id); - async_exchange_end(exch); - - return rc; -} - -/** Return the device usage statistics. - * - * @param[in] sess Network interface session. - * @param[in] device_id Device identifier. - * @param[out] stats Device usage statistics. - * - * @return EOK on success. - * - */ -int netif_stats_req(async_sess_t *sess, device_id_t device_id, - device_stats_t *stats) -{ - if (!stats) - return EBADMEM; - - async_exch_t *exch = async_exchange_begin(sess); - aid_t message_id = async_send_1(exch, NET_NETIF_STATS, - (sysarg_t) device_id, NULL); - async_data_read_start(exch, stats, sizeof(*stats)); - async_exchange_end(exch); - - sysarg_t result; - async_wait_for(message_id, &result); - - return (int) result; -} - -/** Create bidirectional connection with the network interface module - * - * Create bidirectional connection with the network interface module and - * register the message receiver. - * - * @param[in] service Network interface module service. - * @param[in] device_id Device identifier. - * @param[in] me Requesting module service. - * @param[in] receiver Message receiver. - * - * @return Session to the needed service. - * @return NULL on failure. - * - */ -async_sess_t *netif_bind_service(services_t service, device_id_t device_id, - services_t me, async_client_conn_t receiver) -{ - return bind_service(service, device_id, me, 0, receiver); -} - -/** @} - */ Index: pace/lib/net/netif/netif_skel.c =================================================================== --- uspace/lib/net/netif/netif_skel.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,422 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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. - */ - -/** @addtogroup libnet - * @{ - */ - -/** @file - * Network interface module skeleton implementation. - * @see netif_skel.h - */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t); - -/** Network interface global data. */ -netif_globals_t netif_globals; - -/** Probe the existence of the device. - * - * @param[in] device_id Device identifier. - * @param[in] irq Device interrupt number. - * @param[in] io Device input/output address. - * - * @return EOK on success. - * @return Other error codes as defined for the - * netif_probe_message(). - * - */ -static int netif_probe_req_local(device_id_t device_id, int irq, void *io) -{ - fibril_rwlock_write_lock(&netif_globals.lock); - int result = netif_probe_message(device_id, irq, io); - fibril_rwlock_write_unlock(&netif_globals.lock); - - return result; -} - -/** Send the packet queue. - * - * @param[in] device_id Device identifier. - * @param[in] packet Packet queue. - * @param[in] sender Sending module service. - * - * @return EOK on success. - * @return Other error codes as defined for the generic_send_msg() - * function. - * - */ -static int netif_send_msg_local(device_id_t device_id, packet_t *packet, - services_t sender) -{ - fibril_rwlock_write_lock(&netif_globals.lock); - int result = netif_send_message(device_id, packet, sender); - fibril_rwlock_write_unlock(&netif_globals.lock); - - return result; -} - -/** Start the device. - * - * @param[in] device_id Device identifier. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the - * netif_start_message() function. - * - */ -static int netif_start_req_local(device_id_t device_id) -{ - fibril_rwlock_write_lock(&netif_globals.lock); - - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) { - fibril_rwlock_write_unlock(&netif_globals.lock); - return rc; - } - - int result = netif_start_message(device); - if (result > NETIF_NULL) { - nil_device_state_msg(netif_globals.nil_sess, device_id, result); - fibril_rwlock_write_unlock(&netif_globals.lock); - return EOK; - } - - fibril_rwlock_write_unlock(&netif_globals.lock); - - return result; -} - -/** Stop the device. - * - * @param[in] device_id Device identifier. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the - * netif_stop_message() function. - * - */ -static int netif_stop_req_local(device_id_t device_id) -{ - fibril_rwlock_write_lock(&netif_globals.lock); - - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) { - fibril_rwlock_write_unlock(&netif_globals.lock); - return rc; - } - - int result = netif_stop_message(device); - if (result > NETIF_NULL) { - nil_device_state_msg(netif_globals.nil_sess, device_id, result); - fibril_rwlock_write_unlock(&netif_globals.lock); - return EOK; - } - - fibril_rwlock_write_unlock(&netif_globals.lock); - - return result; -} - -/** Find the device specific data. - * - * @param[in] device_id Device identifier. - * @param[out] device Device specific data. - * - * @return EOK on success. - * @return ENOENT if device is not found. - * @return EPERM if the device is not initialized. - * - */ -int find_device(device_id_t device_id, netif_device_t **device) -{ - if (!device) - return EBADMEM; - - *device = netif_device_map_find(&netif_globals.device_map, device_id); - if (*device == NULL) - return ENOENT; - - if ((*device)->state == NETIF_NULL) - return EPERM; - - return EOK; -} - -/** Clear the usage statistics. - * - * @param[in] stats The usage statistics. - * - */ -void null_device_stats(device_stats_t *stats) -{ - bzero(stats, sizeof(device_stats_t)); -} - -/** Release the given packet. - * - * Prepared for future optimization. - * - * @param[in] packet_id The packet identifier. - * - */ -void netif_pq_release(packet_id_t packet_id) -{ - pq_release_remote(netif_globals.sess, packet_id); -} - -/** Allocate new packet to handle the given content size. - * - * @param[in] content Minimum content size. - * - * @return The allocated packet. - * @return NULL on error. - * - */ -packet_t *netif_packet_get_1(size_t content) -{ - return packet_get_1_remote(netif_globals.sess, content); -} - -/** Register the device notification receiver, - * - * Register a network interface layer module as the device - * notification receiver. - * - * @param[in] sess Session to the network interface layer module. - * - * @return EOK on success. - * @return ELIMIT if there is another module registered. - * - */ -static int register_message(async_sess_t *sess) -{ - fibril_rwlock_write_lock(&netif_globals.lock); - if (netif_globals.nil_sess != NULL) { - fibril_rwlock_write_unlock(&netif_globals.lock); - return ELIMIT; - } - - netif_globals.nil_sess = sess; - - fibril_rwlock_write_unlock(&netif_globals.lock); - return EOK; -} - -/** Process the netif module messages. - * - * @param[in] callid Mmessage identifier. - * @param[in] call Message. - * @param[out] answer Answer. - * @param[out] count Number of arguments of the answer. - * - * @return EOK on success. - * @return ENOTSUP if the message is unknown. - * @return Other error codes as defined for each specific module - * message function. - * - * @see IS_NET_NETIF_MESSAGE() - * - */ -static int netif_module_message(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, size_t *count) -{ - size_t length; - device_stats_t stats; - packet_t *packet; - measured_string_t address; - int rc; - - *count = 0; - - if (!IPC_GET_IMETHOD(*call)) - return EOK; - - async_sess_t *callback = - async_callback_receive_start(EXCHANGE_SERIALIZE, call); - if (callback) - return register_message(callback); - - switch (IPC_GET_IMETHOD(*call)) { - case NET_NETIF_PROBE: - return netif_probe_req_local(IPC_GET_DEVICE(*call), - NETIF_GET_IRQ(*call), NETIF_GET_IO(*call)); - - case NET_NETIF_SEND: - rc = packet_translate_remote(netif_globals.sess, &packet, - IPC_GET_PACKET(*call)); - if (rc != EOK) - return rc; - - return netif_send_msg_local(IPC_GET_DEVICE(*call), packet, - IPC_GET_SENDER(*call)); - - case NET_NETIF_START: - return netif_start_req_local(IPC_GET_DEVICE(*call)); - - case NET_NETIF_STATS: - fibril_rwlock_read_lock(&netif_globals.lock); - - rc = async_data_read_receive(&callid, &length); - if (rc != EOK) { - fibril_rwlock_read_unlock(&netif_globals.lock); - return rc; - } - - if (length < sizeof(device_stats_t)) { - fibril_rwlock_read_unlock(&netif_globals.lock); - return EOVERFLOW; - } - - rc = netif_get_device_stats(IPC_GET_DEVICE(*call), &stats); - if (rc == EOK) { - rc = async_data_read_finalize(callid, &stats, - sizeof(device_stats_t)); - } - - fibril_rwlock_read_unlock(&netif_globals.lock); - return rc; - - case NET_NETIF_STOP: - return netif_stop_req_local(IPC_GET_DEVICE(*call)); - - case NET_NETIF_GET_ADDR: - fibril_rwlock_read_lock(&netif_globals.lock); - - rc = netif_get_addr_message(IPC_GET_DEVICE(*call), &address); - if (rc == EOK) - rc = measured_strings_reply(&address, 1); - - fibril_rwlock_read_unlock(&netif_globals.lock); - return rc; - } - - return netif_specific_message(callid, call, answer, count); -} - -/** Default fibril for new module connections. - * - * @param[in] iid Initial message identifier. - * @param[in] icall Initial message call structure. - * - */ -static void netif_client_connection(ipc_callid_t iid, ipc_call_t *icall, - void *arg) -{ - /* - * Accept the connection by answering - * the initial IPC_M_CONNECT_ME_TO call. - */ - async_answer_0(iid, EOK); - - while (true) { - ipc_call_t answer; - size_t count; - - /* Clear the answer structure */ - refresh_answer(&answer, &count); - - /* Fetch the next message */ - ipc_call_t call; - ipc_callid_t callid = async_get_call(&call); - - /* Process the message */ - int res = netif_module_message(callid, &call, &answer, &count); - - /* End if said to either by the message or the processing result */ - if ((!IPC_GET_IMETHOD(call)) || (res == EHANGUP)) - return; - - /* Answer the message */ - answer_call(callid, res, &answer, count); - } -} - -/** Start the network interface module. - * - * Initialize the client connection serving function, initialize the module, - * registers the module service and start the async manager, processing IPC - * messages in an infinite loop. - * - * @return EOK on success. - * @return Other error codes as defined for each specific module - * message function. - * - */ -int netif_module_start(void) -{ - async_set_client_connection(netif_client_connection); - - netif_globals.sess = connect_to_service(SERVICE_NETWORKING); - netif_globals.nil_sess = NULL; - netif_device_map_initialize(&netif_globals.device_map); - - int rc = pm_init(); - if (rc != EOK) - return rc; - - fibril_rwlock_initialize(&netif_globals.lock); - - rc = netif_initialize(); - if (rc != EOK) { - pm_destroy(); - return rc; - } - - async_manager(); - - pm_destroy(); - return EOK; -} - -/** @} - */ Index: uspace/lib/net/nil/nil_remote.c =================================================================== --- uspace/lib/net/nil/nil_remote.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/nil/nil_remote.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -54,5 +54,5 @@ * */ -int nil_device_state_msg(async_sess_t *sess, device_id_t device_id, +int nil_device_state_msg(async_sess_t *sess, nic_device_id_t device_id, sysarg_t state) { @@ -76,9 +76,44 @@ * */ -int nil_received_msg(async_sess_t *sess, device_id_t device_id, - packet_t *packet, services_t target) +int nil_received_msg(async_sess_t *sess, nic_device_id_t device_id, + packet_id_t packet_id) { return generic_received_msg_remote(sess, NET_NIL_RECEIVED, - device_id, packet_get_id(packet), target, 0); + device_id, packet_id, 0, 0); +} + +/** Notify upper layers that device address has changed + * + */ +int nil_addr_changed_msg(async_sess_t *sess, nic_device_id_t device_id, + const nic_address_t *address) +{ + assert(sess); + + async_exch_t *exch = async_exchange_begin(sess); + + aid_t message_id = async_send_1(exch, NET_NIL_ADDR_CHANGED, + (sysarg_t) device_id, NULL); + int rc = async_data_write_start(exch, address, sizeof (nic_address_t)); + + async_exchange_end(exch); + + sysarg_t res; + async_wait_for(message_id, &res); + + if (rc != EOK) + return rc; + + return (int) res; +} + +int nil_device_req(async_sess_t *sess, nic_device_id_t device_id, + devman_handle_t handle, size_t mtu) +{ + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_3_0(exch, NET_NIL_DEVICE, (sysarg_t) device_id, + (sysarg_t) handle, (sysarg_t) mtu); + async_exchange_end(exch); + return rc; } Index: uspace/lib/net/tl/icmp_client.c =================================================================== --- uspace/lib/net/tl/icmp_client.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/tl/icmp_client.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -39,12 +39,6 @@ #include #include - -#ifdef CONFIG_DEBUG -#include -#endif - #include #include - #include #include @@ -60,6 +54,5 @@ * @return Zero if the packet contains no data. */ -int -icmp_client_process_packet(packet_t *packet, icmp_type_t *type, +int icmp_client_process_packet(packet_t *packet, icmp_type_t *type, icmp_code_t *code, icmp_param_t *pointer, icmp_param_t *mtu) { @@ -81,9 +74,4 @@ *mtu = header->un.frag.mtu; - /* Remove debug dump */ -#ifdef CONFIG_DEBUG - printf("ICMP error %d (%d) in packet %d\n", header->type, header->code, - packet_get_id(packet)); -#endif return sizeof(icmp_header_t); } Index: uspace/lib/net/tl/tl_common.c =================================================================== --- uspace/lib/net/tl/tl_common.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/tl/tl_common.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -119,5 +119,5 @@ */ int tl_get_ip_packet_dimension(async_sess_t *sess, - packet_dimensions_t *packet_dimensions, device_id_t device_id, + packet_dimensions_t *packet_dimensions, nic_device_id_t device_id, packet_dimension_t **packet_dimension) { @@ -160,5 +160,5 @@ int tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions, - device_id_t device_id, size_t content) + nic_device_id_t device_id, size_t content) { packet_dimension_t *packet_dimension; @@ -170,7 +170,7 @@ packet_dimension->content = content; - if (device_id != DEVICE_INVALID_ID) { + if (device_id != NIC_DEVICE_INVALID_ID) { packet_dimension = packet_dimensions_find(packet_dimensions, - DEVICE_INVALID_ID); + NIC_DEVICE_INVALID_ID); if (packet_dimension) { @@ -179,5 +179,5 @@ else packet_dimensions_exclude(packet_dimensions, - DEVICE_INVALID_ID, free); + NIC_DEVICE_INVALID_ID, free); } } Index: uspace/lib/net/tl/tl_remote.c =================================================================== --- uspace/lib/net/tl/tl_remote.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/tl/tl_remote.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -56,5 +56,5 @@ * */ -int tl_received_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, +int tl_received_msg(async_sess_t *sess, nic_device_id_t device_id, packet_t *packet, services_t target, services_t error) { Index: uspace/lib/net/tl/tl_skel.c =================================================================== --- uspace/lib/net/tl/tl_skel.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/net/tl/tl_skel.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -123,4 +123,5 @@ goto out; + task_retval(0); async_manager(); Index: uspace/lib/nic/Makefile =================================================================== --- uspace/lib/nic/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,41 @@ +# +# Copyright (c) 2011 Radim Vansa +# 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 = ../.. +LIBRARY = libnic +LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNET_PREFIX)/libnet.a +EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include -I$(LIBNET_PREFIX)/include + +SOURCES = \ + src/nic_driver.c \ + src/nic_addr_db.c \ + src/nic_rx_control.c \ + src/nic_wol_virtues.c \ + src/nic_impl.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/nic/include/nic.h =================================================================== --- uspace/lib/nic/include/nic.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/include/nic.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,283 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Public header exposing NICF to drivers + */ + +#ifndef __NIC_H__ +#define __NIC_H__ + +#include +#include +#include +#include +#include + +struct nic; +typedef struct nic nic_t; + +/** + * Single WOL virtue descriptor. + */ +typedef struct nic_wol_virtue { + link_t item; + nic_wv_id_t id; + nic_wv_type_t type; + const void *data; + size_t length; + struct nic_wol_virtue *next; +} nic_wol_virtue_t; + +/** + * Simple structure for sending the allocated frames (packets) in a list. + */ +typedef struct { + link_t link; + packet_t *packet; +} nic_frame_t; + +typedef list_t nic_frame_list_t; + +/** + * Handler for writing packet data to the NIC device. + * The function is responsible for releasing the packet. + * It does not return anything, if some error is detected the function just + * silently fails (logging on debug level is suggested). + * + * @param nic_data + * @param packet Pointer to the packet to be sent + */ +typedef void (*write_packet_handler)(nic_t *, packet_t *); +/** + * The handler for transitions between driver states. + * If the handler returns negative error code, the transition between + * states is canceled (the state is not changed). + * + * @param nic_data NICF main structure + * + * @return EOK If everything is all right. + * @return negative error code on error. + */ +typedef int (*state_change_handler)(nic_t *); +/** + * Handler for unicast filtering mode change. + * + * @param nic_data NICF main structure + * @param new_mode The mode that should be set up + * @param address_list Addresses as argument to the mode + * @param address_count Number of addresses in the list + * + * @return EOK If the mode is set up + * @return ENOTSUP If this mode is not supported + */ +typedef int (*unicast_mode_change_handler)(nic_t *, + nic_unicast_mode_t, const nic_address_t *, size_t); +/** + * Handler for multicast filtering mode change. + * + * @param nic_data NICF main structure + * @param new_mode The mode that should be set up + * @param address_list Addresses as argument to the mode + * @param address_count Number of addresses in the list + * + * @return EOK If the mode is set up + * @return ENOTSUP If this mode is not supported + */ +typedef int (*multicast_mode_change_handler)(nic_t *, + nic_multicast_mode_t, const nic_address_t *, size_t); +/** + * Handler for broadcast filtering mode change. + * + * @param nic_data NICF main structure + * @param new_mode The mode that should be set up + * + * @return EOK If the mode is set up + * @return ENOTSUP If this mode is not supported + */ +typedef int (*broadcast_mode_change_handler)(nic_t *, nic_broadcast_mode_t); +/** + * Handler for blocked sources list change. + * + * @param nic_data NICF main structure + * @param address_list Addresses as argument to the mode + * @param address_count Number of addresses in the list + */ +typedef void (*blocked_sources_change_handler)(nic_t *, + const nic_address_t *, size_t); +/** + * Handler for VLAN filtering mask change. + * @param nic_data NICF main structure + * @param vlan_mask The new mask | NULL for disabling vlan filter + */ +typedef void (*vlan_mask_change_handler)(nic_t *, const nic_vlan_mask_t *); +/** + * Handler called when a WOL virtue is added. + * If the maximum of accepted WOL virtues changes due to adding this virtue + * you should update the vector wol_virtues.caps_max. + * The driver is allowed to store pointer to the virtue data until + * on_wol_virtue_remove on these data is called (although probably this is + * not a good practice). + * + * @param nic_data NICF main structure + * @param virtue Structure with virtue description + * + * @return EOK If the filter can be used. Software emulation of the + * filter is activated unless the emulate is set to 0. + * @return ENOTSUP If this filter cannot work on this NIC (e.g. the NIC + * cannot run in promiscuous node or the limit of WOL + * packets' specifications was reached). + * @return ELIMIT If this filter must implemented in HW but currently the + * limit of these HW filters was reached. + */ +typedef int (*wol_virtue_add_handler)(nic_t *, const nic_wol_virtue_t *); +/** + * Handler called when a WOL virtue is removed. + * If the maximum of accepted WOL virtues changes due to removing this + * virtue you should update the vector wol_virtues.caps_max. + * + * @param nic_data NICF main structure + * @param virtue Structure with virtue description + */ +typedef void (*wol_virtue_remove_handler)(nic_t *, const nic_wol_virtue_t *); +/** + * Handler for poll mode change. + * + * @param nic_data NICF main structure + * @param mode Mode to be set up + * @param period New period of polling (with NIC_POLL_PERIODIC) + * + * @return EOK If the mode was fully setup + * @return ENOTSUP If NICF should do the periodic polling + * @return EINVAL If this mode cannot be set up under no circumstances + */ +typedef int (*poll_mode_change_handler)(nic_t *, + nic_poll_mode_t, const struct timeval *); +/** + * Event handler called when the NIC should poll its buffers for a new frame + * (in NIC_POLL_PERIODIC or NIC_POLL_ON_DEMAND) modes. + * + * @param nic_data NICF main structure + */ +typedef void (*poll_request_handler)(nic_t *); + +/* nic_t allocation and deallocation */ +extern nic_t *nic_create_and_bind(ddf_dev_t *); +extern void nic_unbind_and_destroy(ddf_dev_t *); + +/* Functions called in the main function */ +extern int nic_driver_init(const char *); +extern void nic_driver_implement(driver_ops_t *, ddf_dev_ops_t *, + nic_iface_t *); + +/* Functions called in add_device */ +extern int nic_connect_to_services(nic_t *); +extern int nic_register_as_ddf_fun(nic_t *, ddf_dev_ops_t *); +extern int nic_get_resources(nic_t *, hw_res_list_parsed_t *); +extern void nic_set_specific(nic_t *, void *); +extern void nic_set_write_packet_handler(nic_t *, write_packet_handler); +extern void nic_set_state_change_handlers(nic_t *, + state_change_handler, state_change_handler, state_change_handler); +extern void nic_set_filtering_change_handlers(nic_t *, + unicast_mode_change_handler, multicast_mode_change_handler, + broadcast_mode_change_handler, blocked_sources_change_handler, + vlan_mask_change_handler); +extern void nic_set_wol_virtue_change_handlers(nic_t *, + wol_virtue_add_handler, wol_virtue_remove_handler); +extern void nic_set_poll_handlers(nic_t *, + poll_mode_change_handler, poll_request_handler); + +/* Functions called in device_added */ +extern int nic_ready(nic_t *); + +/* General driver functions */ +extern ddf_dev_t *nic_get_ddf_dev(nic_t *); +extern ddf_fun_t *nic_get_ddf_fun(nic_t *); +extern nic_t *nic_get_from_ddf_dev(ddf_dev_t *); +extern nic_t *nic_get_from_ddf_fun(ddf_fun_t *); +extern void *nic_get_specific(nic_t *); +extern nic_device_state_t nic_query_state(nic_t *); +extern void nic_set_tx_busy(nic_t *, int); +extern int nic_report_address(nic_t *, const nic_address_t *); +extern int nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *); +extern void nic_query_address(nic_t *, nic_address_t *); +extern void nic_received_packet(nic_t *, packet_t *); +extern void nic_received_noneth_packet(nic_t *, packet_t *); +extern void nic_received_frame(nic_t *, nic_frame_t *); +extern void nic_received_frame_list(nic_t *, nic_frame_list_t *); +extern void nic_disable_interrupt(nic_t *, int); +extern void nic_enable_interrupt(nic_t *, int); +extern nic_poll_mode_t nic_query_poll_mode(nic_t *, struct timeval *); + +/* Statistics updates */ +extern void nic_report_send_ok(nic_t *, size_t, size_t); +extern void nic_report_send_error(nic_t *, nic_send_error_cause_t, unsigned); +extern void nic_report_receive_error(nic_t *, nic_receive_error_cause_t, + unsigned); +extern void nic_report_collisions(nic_t *, unsigned); + +/* Packet / frame / frame list allocation and deallocation */ +extern packet_t *nic_alloc_packet(nic_t *, size_t); +extern void nic_release_packet(nic_t *, packet_t *); +extern nic_frame_t *nic_alloc_frame(nic_t *, size_t); +extern nic_frame_list_t *nic_alloc_frame_list(void); +extern void nic_frame_list_append(nic_frame_list_t *, nic_frame_t *); +extern void nic_release_frame(nic_t *, nic_frame_t *); + +/* RXC query and report functions */ +extern void nic_report_hw_filtering(nic_t *, int, int, int); +extern void nic_query_unicast(const nic_t *, + nic_unicast_mode_t *, size_t, nic_address_t *, size_t *); +extern void nic_query_multicast(const nic_t *, + nic_multicast_mode_t *, size_t, nic_address_t *, size_t *); +extern void nic_query_broadcast(const nic_t *, nic_broadcast_mode_t *); +extern void nic_query_blocked_sources(const nic_t *, + size_t, nic_address_t *, size_t *); +extern int nic_query_vlan_mask(const nic_t *, nic_vlan_mask_t *); +extern int nic_query_wol_max_caps(const nic_t *, nic_wv_type_t); +extern void nic_set_wol_max_caps(nic_t *, nic_wv_type_t, int); +extern uint64_t nic_mcast_hash(const nic_address_t *, size_t); +extern uint64_t nic_query_mcast_hash(nic_t *); + +/* Software period functions */ +extern void nic_sw_period_start(nic_t *); +extern void nic_sw_period_stop(nic_t *); + +/* Packet DMA lock */ +extern void * nic_dma_lock_packet(packet_t * packet); +extern void nic_dma_unlock_packet(packet_t * packet); + +#endif // __NIC_H__ + +/** @} + */ Index: uspace/lib/nic/include/nic_addr_db.h =================================================================== --- uspace/lib/nic/include/nic_addr_db.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/include/nic_addr_db.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Generic hash-set based database of addresses + */ + +#ifndef __NIC_ADDR_DB_H__ +#define __NIC_ADDR_DB_H__ + +#ifndef LIBNIC_INTERNAL +#error "This is internal libnic header, please don't include it" +#endif + +#include + +/** + * Initial size of DB's hash set + */ +#define NIC_ADDR_DB_INIT_SIZE 8 +/** + * Maximal length of addresses in the DB (in bytes). + */ +#define NIC_ADDR_MAX_LENGTH 16 + +/** + * Fibril-safe database of addresses implemented using hash set. + */ +typedef struct nic_addr_db { + hash_set_t set; + size_t addr_len; +} nic_addr_db_t; + +/** + * Helper structure for keeping the address in the hash set. + */ +typedef struct nic_addr_entry { + link_t item; + size_t addr_len; + uint8_t addr[NIC_ADDR_MAX_LENGTH]; +} nic_addr_entry_t; + +extern int nic_addr_db_init(nic_addr_db_t *db, size_t addr_len); +extern void nic_addr_db_clear(nic_addr_db_t *db); +extern void nic_addr_db_destroy(nic_addr_db_t *db); +extern size_t nic_addr_db_count(const nic_addr_db_t *db); +extern int nic_addr_db_insert(nic_addr_db_t *db, const uint8_t *addr); +extern int nic_addr_db_remove(nic_addr_db_t *db, const uint8_t *addr); +extern void nic_addr_db_remove_selected(nic_addr_db_t *db, + int (*func)(const uint8_t *, void *), void *arg); +extern int nic_addr_db_contains(const nic_addr_db_t *db, const uint8_t *addr); +extern void nic_addr_db_foreach(const nic_addr_db_t *db, + void (*func)(const uint8_t *, void *), void *arg); + +#endif + +/** @} + */ Index: uspace/lib/nic/include/nic_driver.h =================================================================== --- uspace/lib/nic/include/nic_driver.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/include/nic_driver.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,223 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Internal NICF structures + */ + +#ifndef __NIC_DRIVER_H__ +#define __NIC_DRIVER_H__ + +#ifndef LIBNIC_INTERNAL +#error "This is internal libnic's header, please do not include it" +#endif + +#include +#include +#include + +#include "nic.h" +#include "nic_rx_control.h" +#include "nic_wol_virtues.h" + +#define DEVICE_CATEGORY_NIC "nic" + +struct sw_poll_info { + fid_t fibril; + volatile int run; + volatile int running; +}; + +struct nic { + /** + * Device from device manager's point of view. + * The value must be set within the add_device handler + * (in nic_create_and_bind) and must not be changed. + */ + ddf_dev_t *dev; + /** + * Device's NIC function. + * The value must be set within the add_device handler + * (in nic_driver_register_as_ddf_function) and must not be changed. + */ + ddf_fun_t *fun; + /** Identifier for higher network stack layers */ + nic_device_id_t device_id; + /** Current state of the device */ + nic_device_state_t state; + /** Transmiter is busy - messages are dropped */ + int tx_busy; + /** Device's MAC address */ + nic_address_t mac; + /** Device's default MAC address (assigned the first time, used in STOP) */ + nic_address_t default_mac; + /** Session to SERVICE_NETWORKING */ + async_sess_t *net_session; + /** Session to SERVICE_ETHERNET or SERVICE_NILDUMMY */ + async_sess_t *nil_session; + /** Phone to APIC or i8259 */ + async_sess_t *irc_session; + /** Current polling mode of the NIC */ + nic_poll_mode_t poll_mode; + /** Polling period (applicable when poll_mode == NIC_POLL_PERIODIC) */ + struct timeval poll_period; + /** Current polling mode of the NIC */ + nic_poll_mode_t default_poll_mode; + /** Polling period (applicable when default_poll_mode == NIC_POLL_PERIODIC) */ + struct timeval default_poll_period; + /** Software period fibrill information */ + struct sw_poll_info sw_poll_info; + /** + * Lock on everything but statistics, rx control and wol virtues. This lock + * cannot be used if filters_lock or stats_lock is already held - you must + * acquire main_lock first (otherwise deadlock could happen). + */ + fibril_rwlock_t main_lock; + /** Device statistics */ + nic_device_stats_t stats; + /** + * Lock for statistics. You must not hold any other lock from nic_t except + * the main_lock at the same moment. If both this lock and main_lock should + * be locked, the main_lock must be locked as the first. + */ + fibril_rwlock_t stats_lock; + /** Receive control configuration */ + nic_rxc_t rx_control; + /** + * Lock for receive control. You must not hold any other lock from nic_t + * except the main_lock at the same moment. If both this lock and main_lock + * should be locked, the main_lock must be locked as the first. + */ + fibril_rwlock_t rxc_lock; + /** WOL virtues configuration */ + nic_wol_virtues_t wol_virtues; + /** + * Lock for WOL virtues. You must not hold any other lock from nic_t + * except the main_lock at the same moment. If both this lock and main_lock + * should be locked, the main_lock must be locked as the first. + */ + fibril_rwlock_t wv_lock; + /** + * Function really sending the data. This MUST be filled in if the + * nic_send_message_impl function is used for sending messages (filled + * as send_message member of the nic_iface_t structure). + * Called with the main_lock locked for reading. + */ + write_packet_handler write_packet; + /** + * Event handler called when device goes to the ACTIVE state. + * The implementation is optional. + * Called with the main_lock locked for writing. + */ + state_change_handler on_activating; + /** + * Event handler called when device goes to the DOWN state. + * The implementation is optional. + * Called with the main_lock locked for writing. + */ + state_change_handler on_going_down; + /** + * Event handler called when device goes to the STOPPED state. + * The implementation is optional. + * Called with the main_lock locked for writing. + */ + state_change_handler on_stopping; + /** + * Event handler called when the unicast receive mode is changed. + * The implementation is optional. Called with rxc_lock locked for writing. + */ + unicast_mode_change_handler on_unicast_mode_change; + /** + * Event handler called when the multicast receive mode is changed. + * The implementation is optional. Called with rxc_lock locked for writing. + */ + multicast_mode_change_handler on_multicast_mode_change; + /** + * Event handler called when the broadcast receive mode is changed. + * The implementation is optional. Called with rxc_lock locked for writing. + */ + broadcast_mode_change_handler on_broadcast_mode_change; + /** + * Event handler called when the blocked sources set is changed. + * The implementation is optional. Called with rxc_lock locked for writing. + */ + blocked_sources_change_handler on_blocked_sources_change; + /** + * Event handler called when the VLAN mask is changed. + * The implementation is optional. Called with rxc_lock locked for writing. + */ + vlan_mask_change_handler on_vlan_mask_change; + /** + * Event handler called when a new WOL virtue is added. + * The implementation is optional. + * Called with filters_lock locked for writing. + */ + wol_virtue_add_handler on_wol_virtue_add; + /** + * Event handler called when a WOL virtue is removed. + * The implementation is optional. + * Called with filters_lock locked for writing. + */ + wol_virtue_remove_handler on_wol_virtue_remove; + /** + * Event handler called when the polling mode is changed. + * The implementation is optional. + * Called with main_lock locked for writing. + */ + poll_mode_change_handler on_poll_mode_change; + /** + * Event handler called when the NIC should poll its buffers for a new frame + * (in NIC_POLL_PERIODIC or NIC_POLL_ON_DEMAND) modes. + * Called with the main_lock locked for reading. + * The implementation is optional. + */ + poll_request_handler on_poll_request; + /** Data specific for particular driver */ + void *specific; +}; + +/** + * Structure keeping global data + */ +typedef struct nic_globals { + list_t frame_list_cache; + size_t frame_list_cache_size; + list_t frame_cache; + size_t frame_cache_size; + fibril_mutex_t lock; +} nic_globals_t; + +#endif + +/** @} + */ Index: uspace/lib/nic/include/nic_impl.h =================================================================== --- uspace/lib/nic/include/nic_impl.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/include/nic_impl.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Prototypes of default DDF NIC interface methods implementations + */ + +#ifndef NIC_IMPL_H__ +#define NIC_IMPL_H__ + +#include +#include +#include +#include + +/* Inclusion of this file is not prohibited, because drivers could want to + * inject some adaptation layer between the DDF call and NICF implementation */ + +extern int nic_get_address_impl(ddf_fun_t *dev_fun, nic_address_t *address); +extern int nic_send_message_impl(ddf_fun_t *dev_fun, packet_id_t packet_id); +extern int nic_connect_to_nil_impl(ddf_fun_t *dev_fun, services_t nil_service, + int device_id); +extern int nic_get_state_impl(ddf_fun_t *dev_fun, nic_device_state_t *state); +extern int nic_set_state_impl(ddf_fun_t *dev_fun, nic_device_state_t state); +extern int nic_get_stats_impl(ddf_fun_t *dev_fun, nic_device_stats_t *stats); +extern int nic_unicast_get_mode_impl(ddf_fun_t *dev_fun, + nic_unicast_mode_t *, size_t, nic_address_t *, size_t *); +extern int nic_unicast_set_mode_impl(ddf_fun_t *dev_fun, + nic_unicast_mode_t, const nic_address_t *, size_t); +extern int nic_multicast_get_mode_impl(ddf_fun_t *dev_fun, + nic_multicast_mode_t *, size_t, nic_address_t *, size_t *); +extern int nic_multicast_set_mode_impl(ddf_fun_t *dev_fun, + nic_multicast_mode_t, const nic_address_t *, size_t); +extern int nic_broadcast_get_mode_impl(ddf_fun_t *, nic_broadcast_mode_t *); +extern int nic_broadcast_set_mode_impl(ddf_fun_t *, nic_broadcast_mode_t); +extern int nic_blocked_sources_get_impl(ddf_fun_t *, + size_t, nic_address_t *, size_t *); +extern int nic_blocked_sources_set_impl(ddf_fun_t *, const nic_address_t *, size_t); +extern int nic_vlan_get_mask_impl(ddf_fun_t *, nic_vlan_mask_t *); +extern int nic_vlan_set_mask_impl(ddf_fun_t *, const nic_vlan_mask_t *); +extern int nic_wol_virtue_add_impl(ddf_fun_t *dev_fun, nic_wv_type_t type, + const void *data, size_t length, nic_wv_id_t *new_id); +extern int nic_wol_virtue_remove_impl(ddf_fun_t *dev_fun, nic_wv_id_t id); +extern int nic_wol_virtue_probe_impl(ddf_fun_t *dev_fun, nic_wv_id_t id, + nic_wv_type_t *type, size_t max_length, void *data, size_t *length); +extern int nic_wol_virtue_list_impl(ddf_fun_t *dev_fun, nic_wv_type_t type, + size_t max_count, nic_wv_id_t *id_list, size_t *id_count); +extern int nic_wol_virtue_get_caps_impl(ddf_fun_t *, nic_wv_type_t, int *); +extern int nic_poll_get_mode_impl(ddf_fun_t *, + nic_poll_mode_t *, struct timeval *); +extern int nic_poll_set_mode_impl(ddf_fun_t *, + nic_poll_mode_t, const struct timeval *); +extern int nic_poll_now_impl(ddf_fun_t *); + +extern void nic_default_handler_impl(ddf_fun_t *dev_fun, + ipc_callid_t callid, ipc_call_t *call); +extern int nic_open_impl(ddf_fun_t *fun); +extern void nic_close_impl(ddf_fun_t *fun); + +extern void nic_device_added_impl(ddf_dev_t *dev); + +#endif + +/** @} + */ Index: uspace/lib/nic/include/nic_rx_control.h =================================================================== --- uspace/lib/nic/include/nic_rx_control.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/include/nic_rx_control.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Incoming packets (frames) filtering control structures + */ + +#ifndef __NIC_FILTERS_H__ +#define __NIC_FILTERS_H__ + +#ifndef LIBNIC_INTERNAL +#error "This is internal libnic's header, please do not include it" +#endif + +#include +#include +#include +#include + +#include "nic_addr_db.h" + +/** + * General structure describing receive control. + * The structure is not synchronized inside, the nic_driver should provide + * a synchronized facade. + */ +typedef struct nic_rxc { + /** + * Allowed unicast destination MAC addresses + */ + nic_addr_db_t unicast_addrs; + /** + * Allowed unicast destination MAC addresses + */ + nic_addr_db_t multicast_addrs; + /** + * Single flag if any source is blocked + */ + int block_sources; + /** + * Blocked source MAC addresses + */ + nic_addr_db_t blocked_sources; + /** + * Selected mode for unicast frames + */ + nic_unicast_mode_t unicast_mode; + /** + * Selected mode for multicast frames + */ + nic_multicast_mode_t multicast_mode; + /** + * Selected mode for broadcast frames + */ + nic_broadcast_mode_t broadcast_mode; + /** + * Mask for VLAN tags. This vector must be at least 512 bytes long. + */ + nic_vlan_mask_t *vlan_mask; + /** + * If true, the NIC is receiving only unicast frames which we really want to + * receive (the filtering is perfect). + */ + int unicast_exact; + /** + * If true, the NIC is receiving only multicast frames which we really want + * to receive (the filtering is perfect). + */ + int multicast_exact; + /** + * If true, the NIC is receiving only frames with VLAN tags which we really + * want to receive (the filtering is perfect). + */ + int vlan_exact; +} nic_rxc_t; + +#define VLAN_TPID_UPPER 0x81 +#define VLAN_TPID_LOWER 0x00 + +typedef struct vlan_header { + uint8_t tpid_upper; + uint8_t tpid_lower; + uint8_t vid_upper; + uint8_t vid_lower; +} __attribute__ ((packed)) vlan_header_t; + +extern int nic_rxc_init(nic_rxc_t *rxc); +extern int nic_rxc_clear(nic_rxc_t *rxc); +extern int nic_rxc_set_addr(nic_rxc_t *rxc, + const nic_address_t *prev_addr, const nic_address_t *curr_addr); +extern int nic_rxc_check(const nic_rxc_t *rxc, + const packet_t *packet, nic_frame_type_t *frame_type); +extern void nic_rxc_hw_filtering(nic_rxc_t *rxc, + int unicast_exact, int multicast_exact, int vlan_exact); +extern uint64_t nic_rxc_mcast_hash(const nic_address_t *list, size_t count); +extern uint64_t nic_rxc_multicast_get_hash(const nic_rxc_t *rxc); +extern void nic_rxc_unicast_get_mode(const nic_rxc_t *, nic_unicast_mode_t *, + size_t max_count, nic_address_t *address_list, size_t *address_count); +extern int nic_rxc_unicast_set_mode(nic_rxc_t *rxc, nic_unicast_mode_t mode, + const nic_address_t *address_list, size_t address_count); +extern void nic_rxc_multicast_get_mode(const nic_rxc_t *, + nic_multicast_mode_t *, size_t, nic_address_t *, size_t *); +extern int nic_rxc_multicast_set_mode(nic_rxc_t *, nic_multicast_mode_t mode, + const nic_address_t *address_list, size_t address_count); +extern void nic_rxc_broadcast_get_mode(const nic_rxc_t *, + nic_broadcast_mode_t *mode); +extern int nic_rxc_broadcast_set_mode(nic_rxc_t *, + nic_broadcast_mode_t mode); +extern void nic_rxc_blocked_sources_get(const nic_rxc_t *, + size_t max_count, nic_address_t *address_list, size_t *address_count); +extern int nic_rxc_blocked_sources_set(nic_rxc_t *, + const nic_address_t *address_list, size_t address_count); +extern int nic_rxc_vlan_get_mask(const nic_rxc_t *rxc, nic_vlan_mask_t *mask); +extern int nic_rxc_vlan_set_mask(nic_rxc_t *rxc, const nic_vlan_mask_t *mask); + +#endif + +/** @} + */ Index: uspace/lib/nic/include/nic_wol_virtues.h =================================================================== --- uspace/lib/nic/include/nic_wol_virtues.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/include/nic_wol_virtues.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Wake-on-LAN support + */ + +#ifndef __NIC_WOL_VIRTUES_H__ +#define __NIC_WOL_VIRTUES_H__ + +#ifndef LIBNIC_INTERNAL +#error "This is internal libnic's header, please do not include it" +#endif + +#include +#include +#include "nic.h" + +typedef struct nic_wol_virtues { + /** + * Operations for table + */ + hash_table_operations_t table_operations; + /** + * WOL virtues hashed by their ID's. + */ + hash_table_t table; + /** + * WOL virtues in lists by their type + */ + nic_wol_virtue_t *lists[NIC_WV_MAX]; + /** + * Number of virtues in the wv_types list + */ + size_t lists_sizes[NIC_WV_MAX]; + /** + * Counter for the ID's + */ + nic_wv_id_t next_id; + /** + * Maximum capabilities + */ + int caps_max[NIC_WV_MAX]; +} nic_wol_virtues_t; + +extern int nic_wol_virtues_init(nic_wol_virtues_t *); +extern void nic_wol_virtues_clear(nic_wol_virtues_t *); +extern int nic_wol_virtues_verify(nic_wv_type_t, const void *, size_t); +extern int nic_wol_virtues_list(const nic_wol_virtues_t *, nic_wv_type_t type, + size_t max_count, nic_wv_id_t *id_list, size_t *id_count); +extern int nic_wol_virtues_add(nic_wol_virtues_t *, nic_wol_virtue_t *); +extern nic_wol_virtue_t *nic_wol_virtues_remove(nic_wol_virtues_t *, + nic_wv_id_t); +extern const nic_wol_virtue_t *nic_wol_virtues_find(const nic_wol_virtues_t *, + nic_wv_id_t); + +#endif + +/** @} + */ Index: uspace/lib/nic/src/nic_addr_db.c =================================================================== --- uspace/lib/nic/src/nic_addr_db.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/src/nic_addr_db.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,277 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Generic hash-set based database of addresses + */ +#include +#include +#include +#include +#include + +#include "nic_addr_db.h" + +/** + * Hash set helper function + */ +static int nic_addr_equals(const link_t *item1, const link_t *item2) +{ + assert(item1 && item2); + size_t addr_len = ((const nic_addr_entry_t *) item1)->addr_len; + + assert(addr_len == ((const nic_addr_entry_t *) item2)->addr_len); + + size_t i; + for (i = 0; i < addr_len; ++i) { + if (((nic_addr_entry_t *) item1)->addr[i] != + ((nic_addr_entry_t *) item2)->addr[i]) + return false; + } + return true; +} + +/** + * Hash set helper function + */ +static unsigned long nic_addr_hash(const link_t *item) +{ + assert(item); + const nic_addr_entry_t *entry = (const nic_addr_entry_t *) item; + unsigned long hash = 0; + + size_t i; + for (i = 0; i < entry->addr_len; ++i) { + hash = (hash << 8) ^ (hash >> 24) ^ entry->addr[i]; + } + return hash; +} + +/** + * Helper wrapper + */ +static void nic_addr_destroy(link_t *item, void *unused) +{ + free(item); +} + +/** + * Initialize the database + * + * @param[in,out] db Uninitialized storage + * @param[in] addr_len Size of addresses in the db + * + * @return EOK If successfully initialized + * @return EINVAL If the address length is too big + * @return ENOMEM If there was not enough memory to initialize the storage + */ +int nic_addr_db_init(nic_addr_db_t *db, size_t addr_len) +{ + assert(db); + if (addr_len > NIC_ADDR_MAX_LENGTH) { + return EINVAL; + } + if (!hash_set_init(&db->set, nic_addr_hash, nic_addr_equals, + NIC_ADDR_DB_INIT_SIZE)) { + return ENOMEM; + } + db->addr_len = addr_len; + return EOK; +} + +/** + * Remove all records from the DB + * + * @param db + */ +void nic_addr_db_clear(nic_addr_db_t *db) +{ + assert(db); + hash_set_clear(&db->set, nic_addr_destroy, NULL); +} + +/** + * Free the memory used by db, including all records... + * + * @param db + */ +void nic_addr_db_destroy(nic_addr_db_t *db) +{ + assert(db); + hash_set_apply(&db->set, nic_addr_destroy, NULL); + hash_set_destroy(&db->set); +} + +/** + * Get number of addresses in the db + * + * @param db + * + * @return Number of adresses + */ +size_t nic_addr_db_count(const nic_addr_db_t *db) +{ + assert(db); + return hash_set_count(&db->set); +} + +/** + * Insert an address to the db + * + * @param db + * @param addr Inserted address. Length is implicitly concluded from the + * db's address length. + * + * @return EOK If the address was inserted + * @return ENOMEM If there was not enough memory + * @return EEXIST If this adress already is in the db + */ +int nic_addr_db_insert(nic_addr_db_t *db, const uint8_t *addr) +{ + assert(db && addr); + nic_addr_entry_t *entry = malloc(sizeof (nic_addr_entry_t)); + if (entry == NULL) { + return ENOMEM; + } + entry->addr_len = db->addr_len; + memcpy(entry->addr, addr, db->addr_len); + + return hash_set_insert(&db->set, &entry->item) ? EOK : EEXIST; +} + +/** + * Remove the address from the db + * + * @param db + * @param addr Removed address. + * + * @return EOK If the address was removed + * @return ENOENT If there is no address + */ +int nic_addr_db_remove(nic_addr_db_t *db, const uint8_t *addr) +{ + assert(db && addr); + nic_addr_entry_t entry; + entry.addr_len = db->addr_len; + memcpy(entry.addr, addr, db->addr_len); + + link_t *removed = hash_set_remove(&db->set, &entry.item); + free(removed); + return removed != NULL ? EOK : ENOENT; +} + +/** + * Test if the address is contained in the db + * + * @param db + * @param addr Tested addresss + * + * @return true if the address is in the db, false otherwise + */ +int nic_addr_db_contains(const nic_addr_db_t *db, const uint8_t *addr) +{ + assert(db && addr); + nic_addr_entry_t entry; + entry.addr_len = db->addr_len; + memcpy(entry.addr, addr, db->addr_len); + + return hash_set_contains(&db->set, &entry.item); +} + +/** + * Helper structure for nic_addr_db_foreach + */ +typedef struct { + void (*func)(const uint8_t *, void *); + void *arg; +} nic_addr_db_fe_arg_t; + +/** + * Helper function for nic_addr_db_foreach + */ +static void nic_addr_db_fe_helper(link_t *item, void *arg) { + nic_addr_db_fe_arg_t *hs = (nic_addr_db_fe_arg_t *) arg; + hs->func(((nic_addr_entry_t *) item)->addr, hs->arg); +} + +/** + * Executes a user-defined function on all addresses in the DB. The function + * must not change the addresses. + * + * @param db + * @param func User-defined function + * @param arg Custom argument passed to the function + */ +void nic_addr_db_foreach(const nic_addr_db_t *db, + void (*func)(const uint8_t *, void *), void *arg) +{ + nic_addr_db_fe_arg_t hs = { .func = func, .arg = arg }; + hash_set_apply((hash_set_t *) &db->set, nic_addr_db_fe_helper, &hs); +} + +/** + * Helper structure for nic_addr_db_remove_selected + */ +typedef struct { + int (*func)(const uint8_t *, void *); + void *arg; +} nic_addr_db_rs_arg_t; + +/** + * Helper function for nic_addr_db_foreach + */ +static int nic_addr_db_rs_helper(link_t *item, void *arg) { + nic_addr_db_rs_arg_t *hs = (nic_addr_db_rs_arg_t *) arg; + int retval = hs->func(((nic_addr_entry_t *) item)->addr, hs->arg); + if (retval) { + free(item); + } + return retval; +} + +/** + * Removes all addresses for which the function returns non-zero. + * + * @param db + * @param func User-defined function + * @param arg Custom argument passed to the function + */ +void nic_addr_db_remove_selected(nic_addr_db_t *db, + int (*func)(const uint8_t *, void *), void *arg) +{ + nic_addr_db_rs_arg_t hs = { .func = func, .arg = arg }; + hash_set_remove_selected(&db->set, nic_addr_db_rs_helper, &hs); +} + +/** @} + */ Index: uspace/lib/nic/src/nic_driver.c =================================================================== --- uspace/lib/nic/src/nic_driver.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/src/nic_driver.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,1368 @@ +/* + * Copyright (c) 2011 Radim Vansa + * Copyright (c) 2011 Jiri Michalec + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Internal implementation of general NIC operations + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "nic_driver.h" +#include "nic_impl.h" + +#define NIC_GLOBALS_MAX_CACHE_SIZE 16 + +nic_globals_t nic_globals; + +/** + * Initializes libraries required for NIC framework - logger, packet manager + * + * @param name Name of the device/driver (used in logging) + */ +int nic_driver_init(const char *name) +{ + list_initialize(&nic_globals.frame_list_cache); + nic_globals.frame_list_cache_size = 0; + list_initialize(&nic_globals.frame_cache); + nic_globals.frame_cache_size = 0; + fibril_mutex_initialize(&nic_globals.lock); + + char buffer[256]; + snprintf(buffer, 256, "drv/" DEVICE_CATEGORY_NIC "/%s", name); + + /* Initialize packet manager */ + return pm_init(); +} + +/** + * Fill in the default implementations for device options and NIC interface. + * + * @param driver_ops + * @param dev_ops + * @param iface + */ +void nic_driver_implement(driver_ops_t *driver_ops, ddf_dev_ops_t *dev_ops, + nic_iface_t *iface) +{ + if (driver_ops) { + if (!driver_ops->device_added) + driver_ops->device_added = nic_device_added_impl; + } + + if (dev_ops) { + if (!dev_ops->open) + dev_ops->open = nic_open_impl; + if (!dev_ops->close) + dev_ops->close = nic_close_impl; + if (!dev_ops->interfaces[NIC_DEV_IFACE]) + dev_ops->interfaces[NIC_DEV_IFACE] = iface; + if (!dev_ops->default_handler) + dev_ops->default_handler = nic_default_handler_impl; + } + + if (iface) { + if (!iface->get_state) + iface->get_state = nic_get_state_impl; + if (!iface->set_state) + iface->set_state = nic_set_state_impl; + if (!iface->send_message) + iface->send_message = nic_send_message_impl; + if (!iface->connect_to_nil) + iface->connect_to_nil = nic_connect_to_nil_impl; + if (!iface->get_address) + iface->get_address = nic_get_address_impl; + if (!iface->get_stats) + iface->get_stats = nic_get_stats_impl; + if (!iface->unicast_get_mode) + iface->unicast_get_mode = nic_unicast_get_mode_impl; + if (!iface->unicast_set_mode) + iface->unicast_set_mode = nic_unicast_set_mode_impl; + if (!iface->multicast_get_mode) + iface->multicast_get_mode = nic_multicast_get_mode_impl; + if (!iface->multicast_set_mode) + iface->multicast_set_mode = nic_multicast_set_mode_impl; + if (!iface->broadcast_get_mode) + iface->broadcast_get_mode = nic_broadcast_get_mode_impl; + if (!iface->broadcast_set_mode) + iface->broadcast_set_mode = nic_broadcast_set_mode_impl; + if (!iface->blocked_sources_get) + iface->blocked_sources_get = nic_blocked_sources_get_impl; + if (!iface->blocked_sources_set) + iface->blocked_sources_set = nic_blocked_sources_set_impl; + if (!iface->vlan_get_mask) + iface->vlan_get_mask = nic_vlan_get_mask_impl; + if (!iface->vlan_set_mask) + iface->vlan_set_mask = nic_vlan_set_mask_impl; + if (!iface->wol_virtue_add) + iface->wol_virtue_add = nic_wol_virtue_add_impl; + if (!iface->wol_virtue_remove) + iface->wol_virtue_remove = nic_wol_virtue_remove_impl; + if (!iface->wol_virtue_probe) + iface->wol_virtue_probe = nic_wol_virtue_probe_impl; + if (!iface->wol_virtue_list) + iface->wol_virtue_list = nic_wol_virtue_list_impl; + if (!iface->wol_virtue_get_caps) + iface->wol_virtue_get_caps = nic_wol_virtue_get_caps_impl; + if (!iface->poll_get_mode) + iface->poll_get_mode = nic_poll_get_mode_impl; + if (!iface->poll_set_mode) + iface->poll_set_mode = nic_poll_set_mode_impl; + if (!iface->poll_now) + iface->poll_now = nic_poll_now_impl; + } +} + +/** + * Setup write packet handler. This MUST be called in the add_device handler + * if the nic_send_message_impl function is used for sending messages (filled + * as send_message member of the nic_iface_t structure). The function must not + * be called anywhere else. + * + * @param nic_data + * @param wpfunc Function handling the write_packet request + */ +void nic_set_write_packet_handler(nic_t *nic_data, write_packet_handler wpfunc) +{ + nic_data->write_packet = wpfunc; +} + +/** + * Setup event handlers for transitions between driver states. + * This function can be called only in the add_device handler. + * + * @param on_activating Called when device is going to the ACTIVE state. + * @param on_going_down Called when device is going to the DOWN state. + * @param on_stopping Called when device is going to the STOP state. + */ +void nic_set_state_change_handlers(nic_t *nic_data, + state_change_handler on_activating, state_change_handler on_going_down, + state_change_handler on_stopping) +{ + nic_data->on_activating = on_activating; + nic_data->on_going_down = on_going_down; + nic_data->on_stopping = on_stopping; +} + +/** + * Setup event handlers for changing the filtering modes. + * This function can be called only in the add_device handler. + * + * @param nic_data + * @param on_unicast_mode_change + * @param on_multicast_mode_change + * @param on_broadcast_mode_change + * @param on_blocked_sources_change + * @param on_vlan_mask_change + */ +void nic_set_filtering_change_handlers(nic_t *nic_data, + unicast_mode_change_handler on_unicast_mode_change, + multicast_mode_change_handler on_multicast_mode_change, + broadcast_mode_change_handler on_broadcast_mode_change, + blocked_sources_change_handler on_blocked_sources_change, + vlan_mask_change_handler on_vlan_mask_change) +{ + nic_data->on_unicast_mode_change = on_unicast_mode_change; + nic_data->on_multicast_mode_change = on_multicast_mode_change; + nic_data->on_broadcast_mode_change = on_broadcast_mode_change; + nic_data->on_blocked_sources_change = on_blocked_sources_change; + nic_data->on_vlan_mask_change = on_vlan_mask_change; +} + +/** + * Setup filters for WOL virtues add and removal. + * This function can be called only in the add_device handler. Both handlers + * must be set or none of them. + * + * @param on_wv_add Called when a virtue is added + * @param on_wv_remove Called when a virtue is removed + */ +void nic_set_wol_virtue_change_handlers(nic_t *nic_data, + wol_virtue_add_handler on_wv_add, wol_virtue_remove_handler on_wv_remove) +{ + assert(on_wv_add != NULL && on_wv_remove != NULL); + nic_data->on_wol_virtue_add = on_wv_add; + nic_data->on_wol_virtue_remove = on_wv_remove; +} + +/** + * Setup poll handlers. + * This function can be called only in the add_device handler. + * + * @param on_poll_mode_change Called when the mode is about to be changed + * @param on_poll_request Called when poll request is triggered + */ +void nic_set_poll_handlers(nic_t *nic_data, + poll_mode_change_handler on_poll_mode_change, poll_request_handler on_poll_req) +{ + nic_data->on_poll_mode_change = on_poll_mode_change; + nic_data->on_poll_request = on_poll_req; +} + +/** + * Connect to the parent's driver and get HW resources list in parsed format. + * Note: this function should be called only from add_device handler, therefore + * we don't need to use locks. + * + * @param nic_data + * @param[out] resources Parsed lists of resources. + * + * @return EOK or negative error code + */ +int nic_get_resources(nic_t *nic_data, hw_res_list_parsed_t *resources) +{ + ddf_dev_t *dev = nic_data->dev; + + /* Connect to the parent's driver. */ + dev->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE, + dev->handle, IPC_FLAG_BLOCKING); + if (dev->parent_sess == NULL) + return EPARTY; + + return hw_res_get_list_parsed(nic_data->dev->parent_sess, resources, 0); +} + +/** + * Just a wrapper over the packet_get_1_remote function + */ +packet_t *nic_alloc_packet(nic_t *nic_data, size_t data_size) +{ + return packet_get_1_remote(nic_data->net_session, data_size); +} + + +/** + * Just a wrapper over the pq_release_remote function + */ +void nic_release_packet(nic_t *nic_data, packet_t *packet) +{ + pq_release_remote(nic_data->net_session, packet_get_id(packet)); +} + +/** Allocate frame and packet + * + * @param nic_data The NIC driver data + * @param packet_size Size of packet + * @param offload_size Size of packet offload + * @return pointer to allocated frame if success, NULL otherwise + */ +nic_frame_t *nic_alloc_frame(nic_t *nic_data, size_t packet_size) +{ + nic_frame_t *frame; + fibril_mutex_lock(&nic_globals.lock); + if (nic_globals.frame_cache_size > 0) { + link_t *first = list_first(&nic_globals.frame_cache); + list_remove(first); + nic_globals.frame_cache_size--; + frame = list_get_instance(first, nic_frame_t, link); + fibril_mutex_unlock(&nic_globals.lock); + } else { + fibril_mutex_unlock(&nic_globals.lock); + frame = malloc(sizeof(nic_frame_t)); + if (!frame) + return NULL; + + link_initialize(&frame->link); + } + + packet_t *packet = nic_alloc_packet(nic_data, packet_size); + if (!packet) { + free(frame); + return NULL; + } + + frame->packet = packet; + return frame; +} + +/** Release frame + * + * @param nic_data The driver data + * @param frame The frame to release + */ +void nic_release_frame(nic_t *nic_data, nic_frame_t *frame) +{ + if (!frame) + return; + if (frame->packet != NULL) { + nic_release_packet(nic_data, frame->packet); + } + fibril_mutex_lock(&nic_globals.lock); + if (nic_globals.frame_cache_size >= NIC_GLOBALS_MAX_CACHE_SIZE) { + fibril_mutex_unlock(&nic_globals.lock); + free(frame); + } else { + list_prepend(&frame->link, &nic_globals.frame_cache); + nic_globals.frame_cache_size++; + fibril_mutex_unlock(&nic_globals.lock); + } +} + +/** + * Allocate a new frame list + * + * @return New frame list or NULL on error. + */ +nic_frame_list_t *nic_alloc_frame_list(void) +{ + nic_frame_list_t *frames; + fibril_mutex_lock(&nic_globals.lock); + + if (nic_globals.frame_list_cache_size > 0) { + frames = + list_get_instance(list_first(&nic_globals.frame_list_cache), + nic_frame_list_t, head); + list_remove(&frames->head); + list_initialize(frames); + nic_globals.frame_list_cache_size--; + fibril_mutex_unlock(&nic_globals.lock); + } else { + fibril_mutex_unlock(&nic_globals.lock); + + frames = malloc(sizeof (nic_frame_list_t)); + if (frames != NULL) + list_initialize(frames); + } + + return frames; +} + +static void nic_driver_release_frame_list(nic_frame_list_t *frames) +{ + if (!frames) + return; + fibril_mutex_lock(&nic_globals.lock); + if (nic_globals.frame_list_cache_size >= NIC_GLOBALS_MAX_CACHE_SIZE) { + fibril_mutex_unlock(&nic_globals.lock); + free(frames); + } else { + list_prepend(&frames->head, &nic_globals.frame_list_cache); + nic_globals.frame_list_cache_size++; + fibril_mutex_unlock(&nic_globals.lock); + } +} + +/** + * Append a frame to the frame list + * + * @param frames Frame list + * @param frame Appended frame + */ +void nic_frame_list_append(nic_frame_list_t *frames, + nic_frame_t *frame) +{ + assert(frame != NULL && frames != NULL); + list_append(&frame->link, frames); +} + + +/** + * Enable interrupts for this driver. + * + * @param nic_data + * @param irq The IRQ number for this device + */ +void nic_enable_interrupt(nic_t *nic_data, int irq) +{ + async_exch_t *exch = async_exchange_begin(nic_data->irc_session); + async_msg_1(exch, IRC_ENABLE_INTERRUPT, irq); + async_exchange_end(exch); +} + +/** + * Disable interrupts for this driver. + * + * @param nic_data + * @param irq The IRQ number for this device + */ +void nic_disable_interrupt(nic_t *nic_data, int irq) +{ + async_exch_t *exch = async_exchange_begin(nic_data->irc_session); + async_msg_1(exch, IRC_CLEAR_INTERRUPT, irq); + async_exchange_end(exch); +} + +/** Get the polling mode information from the device + * + * The main lock should be locked, otherwise the inconsistency between + * mode and period can occure. + * + * @param nic_data The controller data + * @param period [out] The the period. Valid only if mode == NIC_POLL_PERIODIC + * @return Current polling mode of the controller + */ +nic_poll_mode_t nic_query_poll_mode(nic_t *nic_data, struct timeval *period) +{ + if (period) + *period = nic_data->poll_period; + return nic_data->poll_mode; +}; + +/** + * Connect to the NET and IRQ services. This function should be called only from + * the add_device handler, thus no locking is required. + * + * @param nic_data + * + * @return EOK If connection was successful. + * @return EINVAL If the IRC service cannot be determined. + * @return EREFUSED If NET or IRC service cannot be connected. + */ +int nic_connect_to_services(nic_t *nic_data) +{ + /* NET service */ + nic_data->net_session = service_connect_blocking(EXCHANGE_SERIALIZE, + SERVICE_NETWORKING, 0, 0); + if (nic_data->net_session == NULL) + return errno; + + /* IRC service */ + sysarg_t apic; + sysarg_t i8259; + services_t irc_service = -1; + if (((sysinfo_get_value("apic", &apic) == EOK) && (apic)) || + ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) + irc_service = SERVICE_IRC; + else + return EINVAL; + + nic_data->irc_session = service_connect_blocking(EXCHANGE_SERIALIZE, + irc_service, 0, 0); + if (nic_data->irc_session == NULL) + return errno; + + return EOK; +} + +/** Notify the NET service that the device is ready + * + * @param nic NICF structure + * + * @return EOK on success + * + */ +int nic_ready(nic_t *nic) +{ + fibril_rwlock_read_lock(&nic->main_lock); + + async_sess_t *session = nic->net_session; + devman_handle_t handle = nic->dev->handle; + + fibril_rwlock_read_unlock(&nic->main_lock); + + if (session == NULL) + return EINVAL; + + return net_driver_ready(session, handle); +} + +/** Inform the NICF about poll mode + * + * @param nic_data The controller data + * @param mode + * @param period [out] The the period. Valid only if mode == NIC_POLL_PERIODIC + * @return EOK + * @return EINVAL + */ +int nic_report_poll_mode(nic_t *nic_data, nic_poll_mode_t mode, + struct timeval *period) +{ + int rc = EOK; + fibril_rwlock_write_lock(&nic_data->main_lock); + nic_data->poll_mode = mode; + nic_data->default_poll_mode = mode; + if (mode == NIC_POLL_PERIODIC) { + if (period) { + memcpy(&nic_data->default_poll_period, period, sizeof (struct timeval)); + memcpy(&nic_data->poll_period, period, sizeof (struct timeval)); + } else { + rc = EINVAL; + } + } + fibril_rwlock_write_unlock(&nic_data->main_lock); + return rc; +} + +/** Inform the NICF about device's MAC adress. + * + * @return EOK On success + * + */ +int nic_report_address(nic_t *nic_data, const nic_address_t *address) +{ + assert(nic_data); + + if (address->address[0] & 1) + return EINVAL; + + fibril_rwlock_write_lock(&nic_data->main_lock); + + /* Notify NIL layer (and uppper) if bound - not in add_device */ + if (nic_data->nil_session != NULL) { + int rc = nil_addr_changed_msg(nic_data->nil_session, + nic_data->device_id, address); + if (rc != EOK) { + fibril_rwlock_write_unlock(&nic_data->main_lock); + return rc; + } + } + + fibril_rwlock_write_lock(&nic_data->rxc_lock); + + /* + * The initial address (all zeroes) shouldn't be + * there and we will ignore that error -- in next + * calls this should not happen. + */ + int rc = nic_rxc_set_addr(&nic_data->rx_control, + &nic_data->mac, address); + + /* For the first time also record the default MAC */ + if (MAC_IS_ZERO(nic_data->default_mac.address)) { + assert(MAC_IS_ZERO(nic_data->mac.address)); + memcpy(&nic_data->default_mac, address, sizeof(nic_address_t)); + } + + fibril_rwlock_write_unlock(&nic_data->rxc_lock); + + if ((rc != EOK) && (rc != ENOENT)) { + fibril_rwlock_write_unlock(&nic_data->main_lock); + return rc; + } + + memcpy(&nic_data->mac, address, sizeof(nic_address_t)); + + fibril_rwlock_write_unlock(&nic_data->main_lock); + + return EOK; +} + +/** + * Used to obtain devices MAC address. + * + * The main lock should be locked, otherwise the inconsistent address + * can be returend. + * + * @param nic_data The controller data + * @param address The output for address. + */ +void nic_query_address(nic_t *nic_data, nic_address_t *addr) { + if (!addr) + return; + if (!nic_data) + memset(addr, 0, sizeof(nic_address_t)); + + memcpy(addr, &nic_data->mac, sizeof(nic_address_t)); +}; + +/** + * The busy flag can be set to 1 only in the write_packet handler, to 0 it can + * be set anywhere. + * + * @param nic_data + * @param busy + */ +void nic_set_tx_busy(nic_t *nic_data, int busy) +{ + /* + * When the function is called in write_packet handler the main lock is + * locked so no race can happen. + * Otherwise, when it is unexpectedly set to 0 (even with main lock held + * by other fibril) it cannot crash anything. + */ + nic_data->tx_busy = busy; +} + +/** + * Provided for correct naming conventions. + * The packet is checked by filters and then sent up to the NIL layer or + * discarded, the frame is released. + * + * @param nic_data + * @param frame The frame containing received packet + */ +void nic_received_frame(nic_t *nic_data, nic_frame_t *frame) +{ + nic_received_packet(nic_data, frame->packet); + frame->packet = NULL; + nic_release_frame(nic_data, frame); +} + +/** + * This is the function that the driver should call when it receives a packet. + * The packet is checked by filters and then sent up to the NIL layer or + * discarded. + * + * @param nic_data + * @param packet The received packet + */ +void nic_received_packet(nic_t *nic_data, packet_t *packet) +{ + /* Note: this function must not lock main lock, because loopback driver + * calls it inside write_packet handler (with locked main lock) */ + packet_id_t pid = packet_get_id(packet); + + fibril_rwlock_read_lock(&nic_data->rxc_lock); + nic_frame_type_t frame_type; + int check = nic_rxc_check(&nic_data->rx_control, packet, &frame_type); + fibril_rwlock_read_unlock(&nic_data->rxc_lock); + /* Update statistics */ + fibril_rwlock_write_lock(&nic_data->stats_lock); + /* Both sending message up and releasing packet are atomic IPC calls */ + if (nic_data->state == NIC_STATE_ACTIVE && check) { + nic_data->stats.receive_packets++; + nic_data->stats.receive_bytes += packet_get_data_length(packet); + switch (frame_type) { + case NIC_FRAME_MULTICAST: + nic_data->stats.receive_multicast++; + break; + case NIC_FRAME_BROADCAST: + nic_data->stats.receive_broadcast++; + break; + default: + break; + } + fibril_rwlock_write_unlock(&nic_data->stats_lock); + nil_received_msg(nic_data->nil_session, nic_data->device_id, pid); + } else { + switch (frame_type) { + case NIC_FRAME_UNICAST: + nic_data->stats.receive_filtered_unicast++; + break; + case NIC_FRAME_MULTICAST: + nic_data->stats.receive_filtered_multicast++; + break; + case NIC_FRAME_BROADCAST: + nic_data->stats.receive_filtered_broadcast++; + break; + } + fibril_rwlock_write_unlock(&nic_data->stats_lock); + nic_release_packet(nic_data, packet); + } +} + +/** + * This function is to be used only in the loopback driver. It's workaround + * for the situation when the packet does not contain ethernet address. + * The filtering is therefore not applied here. + * + * @param nic_data + * @param packet + */ +void nic_received_noneth_packet(nic_t *nic_data, packet_t *packet) +{ + fibril_rwlock_write_lock(&nic_data->stats_lock); + nic_data->stats.receive_packets++; + nic_data->stats.receive_bytes += packet_get_data_length(packet); + fibril_rwlock_write_unlock(&nic_data->stats_lock); + + nil_received_msg(nic_data->nil_session, nic_data->device_id, + packet_get_id(packet)); +} + +/** + * Some NICs can receive multiple packets during single interrupt. These can + * send them in whole list of frames (actually nic_frame_t structures), then + * the list is deallocated and each packet is passed to the + * nic_received_packet function. + * + * @param nic_data + * @param frames List of received frames + */ +void nic_received_frame_list(nic_t *nic_data, nic_frame_list_t *frames) +{ + if (frames == NULL) + return; + while (!list_empty(frames)) { + nic_frame_t *frame = + list_get_instance(list_first(frames), nic_frame_t, link); + + list_remove(&frame->link); + nic_received_packet(nic_data, frame->packet); + frame->packet = NULL; + nic_release_frame(nic_data, frame); + } + nic_driver_release_frame_list(frames); +} + +/** Allocate and initialize the driver data. + * + * @return Allocated structure or NULL. + * + */ +static nic_t *nic_create(void) +{ + nic_t *nic_data = malloc(sizeof(nic_t)); + if (nic_data == NULL) + return NULL; + + /* Force zero to all uninitialized fields (e.g. added in future) */ + bzero(nic_data, sizeof(nic_t)); + if (nic_rxc_init(&nic_data->rx_control) != EOK) { + free(nic_data); + return NULL; + } + + if (nic_wol_virtues_init(&nic_data->wol_virtues) != EOK) { + free(nic_data); + return NULL; + } + + nic_data->dev = NULL; + nic_data->fun = NULL; + nic_data->device_id = NIC_DEVICE_INVALID_ID; + nic_data->state = NIC_STATE_STOPPED; + nic_data->net_session = NULL; + nic_data->nil_session = NULL; + nic_data->irc_session = NULL; + nic_data->poll_mode = NIC_POLL_IMMEDIATE; + nic_data->default_poll_mode = NIC_POLL_IMMEDIATE; + nic_data->write_packet = NULL; + nic_data->on_activating = NULL; + nic_data->on_going_down = NULL; + nic_data->on_stopping = NULL; + nic_data->specific = NULL; + + fibril_rwlock_initialize(&nic_data->main_lock); + fibril_rwlock_initialize(&nic_data->stats_lock); + fibril_rwlock_initialize(&nic_data->rxc_lock); + fibril_rwlock_initialize(&nic_data->wv_lock); + + bzero(&nic_data->mac, sizeof(nic_address_t)); + bzero(&nic_data->default_mac, sizeof(nic_address_t)); + bzero(&nic_data->stats, sizeof(nic_device_stats_t)); + + return nic_data; +} + +/** Create NIC structure for the device and bind it to dev_fun_t + * + * The pointer to the created and initialized NIC structure will + * be stored in device->nic_data. + * + * @param device The NIC device structure + * + * @return Pointer to created nic_t structure or NULL + * + */ +nic_t *nic_create_and_bind(ddf_dev_t *device) +{ + assert(device); + assert(!device->driver_data); + + nic_t *nic_data = nic_create(); + if (!nic_data) + return NULL; + + nic_data->dev = device; + device->driver_data = nic_data; + + return nic_data; +} + +/** + * Hangs up the phones in the structure, deallocates specific data and then + * the structure itself. + * + * @param data + */ +static void nic_destroy(nic_t *nic_data) { + if (nic_data->net_session != NULL) { + async_hangup(nic_data->net_session); + } + + if (nic_data->nil_session != NULL) { + async_hangup(nic_data->nil_session); + } + + free(nic_data->specific); + free(nic_data); +} + +/** + * Unbind and destroy nic_t stored in ddf_dev_t.nic_data. + * The ddf_dev_t.nic_data will be set to NULL, specific driver data will be + * destroyed. + * + * @param device The NIC device structure + */ +void nic_unbind_and_destroy(ddf_dev_t *device){ + if (!device) + return; + if (!device->driver_data) + return; + + nic_destroy((nic_t *) device->driver_data); + device->driver_data = NULL; + return; +} + +/** + * Creates an exposed DDF function for the device, named "port0". + * Device options are set as this function's options. The function is bound + * (see ddf_fun_bind) and then registered to the DEVICE_CATEGORY_NIC class. + * Note: this function should be called only from add_device handler, therefore + * we don't need to use locks. + * + * @param nic_data The NIC structure + * @param ops Device options for the DDF function. + */ +int nic_register_as_ddf_fun(nic_t *nic_data, ddf_dev_ops_t *ops) +{ + int rc; + assert(nic_data); + + nic_data->fun = ddf_fun_create(nic_data->dev, fun_exposed, "port0"); + if (nic_data->fun == NULL) + return ENOMEM; + + nic_data->fun->ops = ops; + nic_data->fun->driver_data = nic_data; + + rc = ddf_fun_bind(nic_data->fun); + if (rc != EOK) { + ddf_fun_destroy(nic_data->fun); + return rc; + } + + rc = ddf_fun_add_to_category(nic_data->fun, DEVICE_CATEGORY_NIC); + if (rc != EOK) { + ddf_fun_destroy(nic_data->fun); + return rc; + } + + return EOK; +} + +/** + * Set information about current HW filtering. + * 1 ... Only those frames we want to receive are passed through HW + * 0 ... The HW filtering is imperfect + * -1 ... Don't change the setting + * Can be called only from the on_*_change handler. + * + * @param nic_data + * @param unicast_exact Unicast frames + * @param mcast_exact Multicast frames + * @param vlan_exact VLAN tags + */ +void nic_report_hw_filtering(nic_t *nic_data, + int unicast_exact, int multicast_exact, int vlan_exact) +{ + nic_rxc_hw_filtering(&nic_data->rx_control, + unicast_exact, multicast_exact, vlan_exact); +} + +/** + * Computes hash for the address list based on standard multicast address + * hashing. + * + * @param address_list + * @param count + * + * @return Multicast hash + * + * @see multicast_hash + */ +uint64_t nic_mcast_hash(const nic_address_t *list, size_t count) +{ + return nic_rxc_mcast_hash(list, count); +} + +/** + * Computes hash for multicast addresses currently set up in the RX multicast + * filtering. For promiscuous mode returns all ones, for blocking all zeroes. + * Can be called only from the state change handlers (on_activating, + * on_going_down and on_stopping). + * + * @param nic_data + * + * @return Multicast hash + * + * @see multicast_hash + */ +uint64_t nic_query_mcast_hash(nic_t *nic_data) +{ + fibril_rwlock_read_lock(&nic_data->rxc_lock); + uint64_t hash = nic_rxc_multicast_get_hash(&nic_data->rx_control); + fibril_rwlock_read_unlock(&nic_data->rxc_lock); + return hash; +} + +/** + * Queries the current mode of unicast frames receiving. + * Can be called only from the on_*_change handler. + * + * @param nic_data + * @param mode The new unicast mode + * @param max_count Max number of addresses that can be written into the + * address_list. + * @param address_list List of MAC addresses or NULL. + * @param address_count Number of addresses in the list + */ +void nic_query_unicast(const nic_t *nic_data, + nic_unicast_mode_t *mode, + size_t max_count, nic_address_t *address_list, size_t *address_count) +{ + assert(mode != NULL); + nic_rxc_unicast_get_mode(&nic_data->rx_control, mode, + max_count, address_list, address_count); +} + +/** + * Queries the current mode of multicast frames receiving. + * Can be called only from the on_*_change handler. + * + * @param nic_data + * @param mode The current multicast mode + * @param max_count Max number of addresses that can be written into the + * address_list. + * @param address_list List of MAC addresses or NULL. + * @param address_count Number of addresses in the list + */ +void nic_query_multicast(const nic_t *nic_data, + nic_multicast_mode_t *mode, + size_t max_count, nic_address_t *address_list, size_t *address_count) +{ + assert(mode != NULL); + nic_rxc_multicast_get_mode(&nic_data->rx_control, mode, + max_count, address_list, address_count); +} + +/** + * Queries the current mode of broadcast frames receiving. + * Can be called only from the on_*_change handler. + * + * @param nic_data + * @param mode The new broadcast mode + */ +void nic_query_broadcast(const nic_t *nic_data, + nic_broadcast_mode_t *mode) +{ + assert(mode != NULL); + nic_rxc_broadcast_get_mode(&nic_data->rx_control, mode); +} + +/** + * Queries the current blocked source addresses. + * Can be called only from the on_*_change handler. + * + * @param nic_data + * @param max_count Max number of addresses that can be written into the + * address_list. + * @param address_list List of MAC addresses or NULL. + * @param address_count Number of addresses in the list + */ +void nic_query_blocked_sources(const nic_t *nic_data, + size_t max_count, nic_address_t *address_list, size_t *address_count) +{ + nic_rxc_blocked_sources_get(&nic_data->rx_control, + max_count, address_list, address_count); +} + +/** + * Query mask used for filtering according to the VLAN tags. + * Can be called only from the on_*_change handler. + * + * @param nic_data + * @param mask Must be 512 bytes long + * + * @return EOK + * @return ENOENT + */ +int nic_query_vlan_mask(const nic_t *nic_data, nic_vlan_mask_t *mask) +{ + assert(mask); + return nic_rxc_vlan_get_mask(&nic_data->rx_control, mask); +} + +/** + * Query maximum number of WOL virtues of specified type allowed on the device. + * Can be called only from add_device and on_wol_virtue_* handlers. + * + * @param nic_data + * @param type The type of the WOL virtues + * + * @return Maximal number of allowed virtues of this type. -1 means this type + * is not supported at all. + */ +int nic_query_wol_max_caps(const nic_t *nic_data, nic_wv_type_t type) +{ + return nic_data->wol_virtues.caps_max[type]; +} + +/** + * Sets maximum number of WOL virtues of specified type allowed on the device. + * Can be called only from add_device and on_wol_virtue_* handlers. + * + * @param nic_data + * @param type The type of the WOL virtues + * @param count Maximal number of allowed virtues of this type. -1 means + * this type is not supported at all. + */ +void nic_set_wol_max_caps(nic_t *nic_data, nic_wv_type_t type, int count) +{ + nic_data->wol_virtues.caps_max[type] = count; +} + +/** + * @param nic_data + * @return The driver-specific structure for this NIC. + */ +void *nic_get_specific(nic_t *nic_data) +{ + return nic_data->specific; +} + +/** + * @param nic_data + * @param specific The driver-specific structure for this NIC. + */ +void nic_set_specific(nic_t *nic_data, void *specific) +{ + nic_data->specific = specific; +} + +/** + * You can call the function only from one of the state change handlers. + * @param nic_data + * @return Current state of the NIC, prior to the actually executed change + */ +nic_device_state_t nic_query_state(nic_t *nic_data) +{ + return nic_data->state; +} + +/** + * @param nic_data + * @return DDF device associated with this NIC. + */ +ddf_dev_t *nic_get_ddf_dev(nic_t *nic_data) +{ + return nic_data->dev; +} + +/** + * @param nic_data + * @return DDF function associated with this NIC. + */ +ddf_fun_t *nic_get_ddf_fun(nic_t *nic_data) +{ + return nic_data->fun; +} + +/** + * @param dev DDF device associated with NIC + * @return The associated NIC structure + */ +nic_t *nic_get_from_ddf_dev(ddf_dev_t *dev) +{ + return (nic_t *) dev->driver_data; +}; + +/** + * @param dev DDF function associated with NIC + * @return The associated NIC structure + */ +nic_t *nic_get_from_ddf_fun(ddf_fun_t *fun) +{ + return (nic_t *) fun->driver_data; +}; + +/** + * Raises the send_packets and send_bytes in device statistics. + * + * @param nic_data + * @param packets Number of received packets + * @param bytes Number of received bytes + */ +void nic_report_send_ok(nic_t *nic_data, size_t packets, size_t bytes) +{ + fibril_rwlock_write_lock(&nic_data->stats_lock); + nic_data->stats.send_packets += packets; + nic_data->stats.send_bytes += bytes; + fibril_rwlock_write_unlock(&nic_data->stats_lock); +} + +/** + * Raises total error counter (send_errors) and the concrete send error counter + * determined by the cause argument. + * + * @param nic_data + * @param cause The concrete error cause. + */ +void nic_report_send_error(nic_t *nic_data, nic_send_error_cause_t cause, + unsigned count) +{ + if (count == 0) + return; + + fibril_rwlock_write_lock(&nic_data->stats_lock); + nic_data->stats.send_errors += count; + switch (cause) { + case NIC_SEC_BUFFER_FULL: + nic_data->stats.send_dropped += count; + break; + case NIC_SEC_ABORTED: + nic_data->stats.send_aborted_errors += count; + break; + case NIC_SEC_CARRIER_LOST: + nic_data->stats.send_carrier_errors += count; + break; + case NIC_SEC_FIFO_OVERRUN: + nic_data->stats.send_fifo_errors += count; + break; + case NIC_SEC_HEARTBEAT: + nic_data->stats.send_heartbeat_errors += count; + break; + case NIC_SEC_WINDOW_ERROR: + nic_data->stats.send_window_errors += count; + break; + case NIC_SEC_OTHER: + break; + } + fibril_rwlock_write_unlock(&nic_data->stats_lock); +} + +/** + * Raises total error counter (receive_errors) and the concrete receive error + * counter determined by the cause argument. + * + * @param nic_data + * @param cause The concrete error cause + */ +void nic_report_receive_error(nic_t *nic_data, + nic_receive_error_cause_t cause, unsigned count) +{ + fibril_rwlock_write_lock(&nic_data->stats_lock); + nic_data->stats.receive_errors += count; + switch (cause) { + case NIC_REC_BUFFER_FULL: + nic_data->stats.receive_dropped += count; + break; + case NIC_REC_LENGTH: + nic_data->stats.receive_length_errors += count; + break; + case NIC_REC_BUFFER_OVERFLOW: + nic_data->stats.receive_dropped += count; + break; + case NIC_REC_CRC: + nic_data->stats.receive_crc_errors += count; + break; + case NIC_REC_FRAME_ALIGNMENT: + nic_data->stats.receive_frame_errors += count; + break; + case NIC_REC_FIFO_OVERRUN: + nic_data->stats.receive_fifo_errors += count; + break; + case NIC_REC_MISSED: + nic_data->stats.receive_missed_errors += count; + break; + case NIC_REC_OTHER: + break; + } + fibril_rwlock_write_unlock(&nic_data->stats_lock); +} + +/** + * Raises the collisions counter in device statistics. + */ +void nic_report_collisions(nic_t *nic_data, unsigned count) +{ + fibril_rwlock_write_lock(&nic_data->stats_lock); + nic_data->stats.collisions += count; + fibril_rwlock_write_unlock(&nic_data->stats_lock); +} + +/** Just wrapper for checking nonzero time interval + * + * @oaram t The interval to check + * @returns Zero if the t is nonzero interval + * @returns Nonzero if t is zero interval + */ +static int timeval_nonpositive(struct timeval t) { + return (t.tv_sec <= 0) && (t.tv_usec <= 0); +} + +/** Main function of software period fibrill + * + * Just calls poll() in the nic->poll_period period + * + * @param data The NIC structure pointer + * + * @return 0, never reached + */ +static int period_fibril_fun(void *data) +{ + nic_t *nic = data; + struct sw_poll_info *info = &nic->sw_poll_info; + while (true) { + fibril_rwlock_read_lock(&nic->main_lock); + int run = info->run; + int running = info->running; + struct timeval remaining = nic->poll_period; + fibril_rwlock_read_unlock(&nic->main_lock); + + if (!running) { + remaining.tv_sec = 5; + remaining.tv_usec = 0; + } + + /* Wait the period (keep attention to overflows) */ + while (!timeval_nonpositive(remaining)) { + suseconds_t wait = 0; + if (remaining.tv_sec > 0) { + time_t wait_sec = remaining.tv_sec; + /* wait maximaly 5 seconds to get reasonable reaction time + * when period is reset + */ + if (wait_sec > 5) + wait_sec = 5; + + wait = (suseconds_t) wait_sec * 1000000; + + remaining.tv_sec -= wait_sec; + } else { + wait = remaining.tv_usec; + + if (wait > 5 * 1000000) { + wait = 5 * 1000000; + } + + remaining.tv_usec -= wait; + } + async_usleep(wait); + + /* Check if the period was not reset */ + if (info->run != run) + break; + } + + /* Provide polling if the period finished */ + fibril_rwlock_read_lock(&nic->main_lock); + if (info->running && info->run == run) { + nic->on_poll_request(nic); + } + fibril_rwlock_read_unlock(&nic->main_lock); + } + return 0; +} + +/** Starts software periodic polling + * + * Reset to new period if the original period was running + * + * @param nic_data Nic data structure + */ +void nic_sw_period_start(nic_t *nic_data) +{ + /* Create the fibril if it is not crated */ + if (nic_data->sw_poll_info.fibril == 0) { + nic_data->sw_poll_info.fibril = fibril_create(period_fibril_fun, + nic_data); + nic_data->sw_poll_info.running = 0; + nic_data->sw_poll_info.run = 0; + + /* Start fibril */ + fibril_add_ready(nic_data->sw_poll_info.fibril); + } + + /* Inform fibril about running with new period */ + nic_data->sw_poll_info.run = (nic_data->sw_poll_info.run + 1) % 100; + nic_data->sw_poll_info.running = 1; +} + +/** Stops software periodic polling + * + * @param nic_data Nic data structure + */ +void nic_sw_period_stop(nic_t *nic_data) +{ + nic_data->sw_poll_info.running = 0; +} + +// FIXME: Later +#if 0 + +/** Lock packet for DMA usage + * + * @param packet + * @return physical address of packet + */ +void *nic_dma_lock_packet(packet_t *packet) +{ + void *phys_addr; + size_t locked; + int rc = dma_lock(packet, &phys_addr, 1, &locked); + if (rc != EOK) + return NULL; + + assert(locked == 1); + return phys_addr; +} + +/** Unlock packet after DMA usage + * + * @param packet + */ +void nic_dma_unlock_packet(packet_t *packet) +{ + size_t unlocked; + int rc = dma_unlock(packet, 1, &unlocked); + if (rc != EOK) + return; + + assert(unlocked == 1); +} + +#endif + +/** @} + */ Index: uspace/lib/nic/src/nic_impl.c =================================================================== --- uspace/lib/nic/src/nic_impl.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/src/nic_impl.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,878 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Default DDF NIC interface methods implementations + */ + +#include +#include +#include +#include +#include +#include "nic_driver.h" +#include "nic_impl.h" + +/** + * Default implementation of the set_state method. Trivial. + * + * @param fun + * @param[out] state + * + * @return EOK always. + */ +int nic_get_state_impl(ddf_fun_t *fun, nic_device_state_t *state) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->main_lock); + *state = nic_data->state; + fibril_rwlock_read_unlock(&nic_data->main_lock); + return EOK; +} + +/** + * Default implementation of the set_state method. Changes the internal + * driver's state, calls the appropriate callback and notifies the NIL service + * about this change. + * + * @param fun + * @param state The new device's state + * + * @return EOK If the state was changed + * @return EINVAL If the state cannot be changed + */ +int nic_set_state_impl(ddf_fun_t *fun, nic_device_state_t state) +{ + if (state >= NIC_STATE_MAX) { + return EINVAL; + } + + nic_t *nic_data = (nic_t *) fun->driver_data; + + fibril_rwlock_write_lock(&nic_data->main_lock); + if (nic_data->state == state) { + /* No change, nothing to do */ + fibril_rwlock_write_unlock(&nic_data->main_lock); + return EOK; + } + if (state == NIC_STATE_ACTIVE) { + if (nic_data->nil_session == NULL || nic_data->net_session == NULL + || nic_data->device_id < 0) { + fibril_rwlock_write_unlock(&nic_data->main_lock); + return EINVAL; + } + } + + state_change_handler event_handler = NULL; + switch (state) { + case NIC_STATE_STOPPED: + event_handler = nic_data->on_stopping; + break; + case NIC_STATE_DOWN: + event_handler = nic_data->on_going_down; + break; + case NIC_STATE_ACTIVE: + event_handler = nic_data->on_activating; + break; + default: + break; + } + if (event_handler != NULL) { + int rc = event_handler(nic_data); + if (rc != EOK) { + fibril_rwlock_write_unlock(&nic_data->main_lock); + return EINVAL; + } + } + + if (state == NIC_STATE_STOPPED) { + /* Notify upper layers that we are reseting the MAC */ + int rc = nil_addr_changed_msg(nic_data->nil_session, + nic_data->device_id, &nic_data->default_mac); + nic_data->poll_mode = nic_data->default_poll_mode; + memcpy(&nic_data->poll_period, &nic_data->default_poll_period, + sizeof (struct timeval)); + if (rc != EOK) { + /* We have already ran the on stopped handler, even if we + * terminated the state change we would end up in undefined state. + * Therefore we just log the problem. */ + } + + fibril_rwlock_write_lock(&nic_data->stats_lock); + bzero(&nic_data->stats, sizeof (nic_device_stats_t)); + fibril_rwlock_write_unlock(&nic_data->stats_lock); + + fibril_rwlock_write_lock(&nic_data->rxc_lock); + nic_rxc_clear(&nic_data->rx_control); + /* Reinsert device's default MAC */ + nic_rxc_set_addr(&nic_data->rx_control, NULL, + &nic_data->default_mac); + fibril_rwlock_write_unlock(&nic_data->rxc_lock); + memcpy(&nic_data->mac, &nic_data->default_mac, sizeof (nic_address_t)); + + fibril_rwlock_write_lock(&nic_data->wv_lock); + nic_wol_virtues_clear(&nic_data->wol_virtues); + fibril_rwlock_write_unlock(&nic_data->wv_lock); + + /* Ensure stopping period of NIC_POLL_SOFTWARE_PERIODIC */ + nic_sw_period_stop(nic_data); + } + + nic_data->state = state; + + nil_device_state_msg(nic_data->nil_session, nic_data->device_id, state); + + fibril_rwlock_write_unlock(&nic_data->main_lock); + + return EOK; +} + +/** + * Default implementation of the send_message method. + * Send messages to the network. + * + * @param fun + * @param packet_id ID of the first packet in a queue of sent packets + * + * @return EOK If the message was sent + * @return EBUSY If the device is not in state when the packet can be set. + * @return EINVAL If the packet ID is invalid + */ +int nic_send_message_impl(ddf_fun_t *fun, packet_id_t packet_id) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + packet_t *packet, *next; + + fibril_rwlock_read_lock(&nic_data->main_lock); + if (nic_data->state != NIC_STATE_ACTIVE || nic_data->tx_busy) { + fibril_rwlock_read_unlock(&nic_data->main_lock); + pq_release_remote(nic_data->net_session, packet_id); + return EBUSY; + } + + int rc = packet_translate_remote(nic_data->net_session, &packet, packet_id); + + if (rc != EOK) { + fibril_rwlock_read_unlock(&nic_data->main_lock); + return EINVAL; + } + + /* + * Process the packet queue. Each sent packet must be detached from the + * queue and destroyed. This is why the cycle differs from loopback's + * cycle, where the packets are immediately used in upper layers and + * therefore they must not be destroyed (released). + */ + assert(nic_data->write_packet != NULL); + do { + next = pq_detach(packet); + nic_data->write_packet(nic_data, packet); + packet = next; + } while (packet); + fibril_rwlock_read_unlock(&nic_data->main_lock); + return EOK; +} + +/** + * Default implementation of the connect_to_nil method. + * Connects the driver to the NIL service. + * + * @param fun + * @param nil_service ID of the server implementing the NIL service + * @param device_id ID of the device as used in higher layers + * + * @return EOK If the services were bound + * @return Negative error code from service_connect_blocking + */ +int nic_connect_to_nil_impl(ddf_fun_t *fun, services_t nil_service, + nic_device_id_t device_id) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_write_lock(&nic_data->main_lock); + + nic_data->device_id = device_id; + + nic_data->nil_session = service_connect_blocking(EXCHANGE_SERIALIZE, + nil_service, 0, 0); + if (nic_data->nil_session != NULL) { + fibril_rwlock_write_unlock(&nic_data->main_lock); + return EOK; + } + + fibril_rwlock_write_unlock(&nic_data->main_lock); + return EHANGUP; +} + +/** + * Default implementation of the get_address method. + * Retrieves the NIC's physical address. + * + * @param fun + * @param address Pointer to the structure where the address will be stored. + * + * @return EOK If the services were bound + * @return ELIMIT If the buffer is too short + */ +int nic_get_address_impl(ddf_fun_t *fun, nic_address_t *address) +{ + assert(address); + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->main_lock); + memcpy(address, &nic_data->mac, sizeof (nic_address_t)); + fibril_rwlock_read_unlock(&nic_data->main_lock); + return EOK; +} + +/** + * Default implementation of the get_stats method. Copies the statistics from + * the drivers data to supplied buffer. + * + * @param fun + * @param[out] stats The buffer for statistics + * + * @return EOK (cannot fail) + */ +int nic_get_stats_impl(ddf_fun_t *fun, nic_device_stats_t *stats) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + assert (stats != NULL); + fibril_rwlock_read_lock(&nic_data->stats_lock); + memcpy(stats, &nic_data->stats, sizeof (nic_device_stats_t)); + fibril_rwlock_read_unlock(&nic_data->stats_lock); + return EOK; +} + +/** + * Default implementation of unicast_get_mode method. + * + * @param fun + * @param[out] mode Current operation mode + * @param[in] max_count Max number of addresses that can be written into the + * buffer (addr_list). + * @param[out] addr_list Buffer for addresses + * @param[out] addr_count Number of addresses written into the list + * + * @return EOK + */ +int nic_unicast_get_mode_impl(ddf_fun_t *fun, nic_unicast_mode_t *mode, + size_t max_count, nic_address_t *addr_list, size_t *addr_count) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->rxc_lock); + nic_rxc_unicast_get_mode(&nic_data->rx_control, mode, max_count, + addr_list, addr_count); + fibril_rwlock_read_unlock(&nic_data->rxc_lock); + return EOK; +} + +/** + * Default implementation of unicast_set_mode method. + * + * @param fun + * @param[in] mode New operation mode + * @param[in] addr_list List of unicast addresses + * @param[in] addr_count Number of addresses in the list + * + * @return EOK + * @return EINVAL + * @return ENOTSUP + * @return ENOMEM + */ +int nic_unicast_set_mode_impl(ddf_fun_t *fun, + nic_unicast_mode_t mode, const nic_address_t *addr_list, size_t addr_count) +{ + assert((addr_count == 0 && addr_list == NULL) + || (addr_count != 0 && addr_list != NULL)); + size_t i; + for (i = 0; i < addr_count; ++i) { + if (addr_list[i].address[0] & 1) + return EINVAL; + } + + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_write_lock(&nic_data->rxc_lock); + int rc = ENOTSUP; + if (nic_data->on_unicast_mode_change) { + rc = nic_data->on_unicast_mode_change(nic_data, + mode, addr_list, addr_count); + } + if (rc == EOK) { + rc = nic_rxc_unicast_set_mode(&nic_data->rx_control, mode, + addr_list, addr_count); + /* After changing the mode the addr db gets cleared, therefore we have + * to reinsert also the physical address of NIC. + */ + nic_rxc_set_addr(&nic_data->rx_control, NULL, &nic_data->mac); + } + fibril_rwlock_write_unlock(&nic_data->rxc_lock); + return rc; +} + + +/** + * Default implementation of multicast_get_mode method. + * + * @param fun + * @param[out] mode Current operation mode + * @param[in] max_count Max number of addresses that can be written into the + * buffer (addr_list). + * @param[out] addr_list Buffer for addresses + * @param[out] addr_count Number of addresses written into the list + * + * @return EOK + */ +int nic_multicast_get_mode_impl(ddf_fun_t *fun, nic_multicast_mode_t *mode, + size_t max_count, nic_address_t *addr_list, size_t *addr_count) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->rxc_lock); + nic_rxc_multicast_get_mode(&nic_data->rx_control, mode, max_count, + addr_list, addr_count); + fibril_rwlock_read_unlock(&nic_data->rxc_lock); + return EOK; +} + +/** + * Default implementation of multicast_set_mode method. + * + * @param fun + * @param[in] mode New operation mode + * @param[in] addr_list List of multicast addresses + * @param[in] addr_count Number of addresses in the list + * + * @return EOK + * @return EINVAL + * @return ENOTSUP + * @return ENOMEM + */ +int nic_multicast_set_mode_impl(ddf_fun_t *fun, nic_multicast_mode_t mode, + const nic_address_t *addr_list, size_t addr_count) +{ + assert((addr_count == 0 && addr_list == NULL) + || (addr_count != 0 && addr_list != NULL)); + size_t i; + for (i = 0; i < addr_count; ++i) { + if (!(addr_list[i].address[0] & 1)) + return EINVAL; + } + + nic_t *nic_data = (nic_t *) fun->dev->driver_data; + fibril_rwlock_write_lock(&nic_data->rxc_lock); + int rc = ENOTSUP; + if (nic_data->on_multicast_mode_change) { + rc = nic_data->on_multicast_mode_change(nic_data, mode, addr_list, addr_count); + } + if (rc == EOK) { + rc = nic_rxc_multicast_set_mode(&nic_data->rx_control, mode, + addr_list, addr_count); + } + fibril_rwlock_write_unlock(&nic_data->rxc_lock); + return rc; +} + +/** + * Default implementation of broadcast_get_mode method. + * + * @param fun + * @param[out] mode Current operation mode + * + * @return EOK + */ +int nic_broadcast_get_mode_impl(ddf_fun_t *fun, nic_broadcast_mode_t *mode) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->rxc_lock); + nic_rxc_broadcast_get_mode(&nic_data->rx_control, mode); + fibril_rwlock_read_unlock(&nic_data->rxc_lock); + return EOK; +} + +/** + * Default implementation of broadcast_set_mode method. + * + * @param fun + * @param[in] mode New operation mode + * + * @return EOK + * @return EINVAL + * @return ENOTSUP + * @return ENOMEM + */ +int nic_broadcast_set_mode_impl(ddf_fun_t *fun, nic_broadcast_mode_t mode) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_write_lock(&nic_data->rxc_lock); + int rc = ENOTSUP; + if (nic_data->on_broadcast_mode_change) { + rc = nic_data->on_broadcast_mode_change(nic_data, mode); + } + if (rc == EOK) { + rc = nic_rxc_broadcast_set_mode(&nic_data->rx_control, mode); + } + fibril_rwlock_write_unlock(&nic_data->rxc_lock); + return rc; +} + +/** + * Default implementation of blocked_sources_get method. + * + * @param fun + * @param[in] max_count Max number of addresses that can be written into the + * buffer (addr_list). + * @param[out] addr_list Buffer for addresses + * @param[out] addr_count Number of addresses written into the list + * + * @return EOK + */ +int nic_blocked_sources_get_impl(ddf_fun_t *fun, + size_t max_count, nic_address_t *addr_list, size_t *addr_count) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->rxc_lock); + nic_rxc_blocked_sources_get(&nic_data->rx_control, + max_count, addr_list, addr_count); + fibril_rwlock_read_unlock(&nic_data->rxc_lock); + return EOK; +} + +/** + * Default implementation of blocked_sources_set method. + * + * @param fun + * @param[in] addr_list List of blocked addresses + * @param[in] addr_count Number of addresses in the list + * + * @return EOK + * @return EINVAL + * @return ENOTSUP + * @return ENOMEM + */ +int nic_blocked_sources_set_impl(ddf_fun_t *fun, + const nic_address_t *addr_list, size_t addr_count) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_write_lock(&nic_data->rxc_lock); + if (nic_data->on_blocked_sources_change) { + nic_data->on_blocked_sources_change(nic_data, addr_list, addr_count); + } + int rc = nic_rxc_blocked_sources_set(&nic_data->rx_control, + addr_list, addr_count); + fibril_rwlock_write_unlock(&nic_data->rxc_lock); + return rc; +} + +/** + * Default implementation of vlan_get_mask method. + * + * @param fun + * @param[out] mask Current VLAN mask + * + * @return EOK + * @return ENOENT If the mask is not set + */ +int nic_vlan_get_mask_impl(ddf_fun_t *fun, nic_vlan_mask_t *mask) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->rxc_lock); + int rc = nic_rxc_vlan_get_mask(&nic_data->rx_control, mask); + fibril_rwlock_read_unlock(&nic_data->rxc_lock); + return rc; +} + +/** + * Default implementation of vlan_set_mask method. + * + * @param fun + * @param[in] mask The new VLAN mask + * + * @return EOK + * @return ENOMEM + */ +int nic_vlan_set_mask_impl(ddf_fun_t *fun, const nic_vlan_mask_t *mask) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_write_lock(&nic_data->rxc_lock); + int rc = nic_rxc_vlan_set_mask(&nic_data->rx_control, mask); + if (rc == EOK && nic_data->on_vlan_mask_change) { + nic_data->on_vlan_mask_change(nic_data, mask); + } + fibril_rwlock_write_unlock(&nic_data->rxc_lock); + return rc; +} + +/** + * Default implementation of the wol_virtue_add method. + * Create a new WOL virtue. + * + * @param[in] fun + * @param[in] type Type of the virtue + * @param[in] data Data required for this virtue (depends on type) + * @param[in] length Length of the data + * @param[out] filter Identifier of the new virtue + * + * @return EOK If the operation was successfully completed + * @return EINVAL If virtue type is not supported or the data are invalid + * @return ELIMIT If the driver does not allow to create more virtues + * @return ENOMEM If there was not enough memory to complete the operation + */ +int nic_wol_virtue_add_impl(ddf_fun_t *fun, nic_wv_type_t type, + const void *data, size_t length, nic_wv_id_t *new_id) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + if (nic_data->on_wol_virtue_add == NULL + || nic_data->on_wol_virtue_remove == NULL) { + return ENOTSUP; + } + if (type == NIC_WV_NONE || type >= NIC_WV_MAX) { + return EINVAL; + } + if (nic_wol_virtues_verify(type, data, length) != EOK) { + return EINVAL; + } + nic_wol_virtue_t *virtue = malloc(sizeof (nic_wol_virtue_t)); + if (virtue == NULL) { + return ENOMEM; + } + bzero(virtue, sizeof (nic_wol_virtue_t)); + if (length != 0) { + virtue->data = malloc(length); + if (virtue->data == NULL) { + free(virtue); + return ENOMEM; + } + memcpy((void *) virtue->data, data, length); + } + virtue->type = type; + virtue->length = length; + + fibril_rwlock_write_lock(&nic_data->wv_lock); + /* Check if we haven't reached the maximum */ + if (nic_data->wol_virtues.caps_max[type] < 0) { + fibril_rwlock_write_unlock(&nic_data->wv_lock); + return EINVAL; + } + if ((int) nic_data->wol_virtues.lists_sizes[type] >= + nic_data->wol_virtues.caps_max[type]) { + fibril_rwlock_write_unlock(&nic_data->wv_lock); + return ELIMIT; + } + /* Call the user-defined add callback */ + int rc = nic_data->on_wol_virtue_add(nic_data, virtue); + if (rc != EOK) { + free(virtue->data); + free(virtue); + fibril_rwlock_write_unlock(&nic_data->wv_lock); + return rc; + } + rc = nic_wol_virtues_add(&nic_data->wol_virtues, virtue); + if (rc != EOK) { + /* If the adding fails, call user-defined remove callback */ + nic_data->on_wol_virtue_remove(nic_data, virtue); + fibril_rwlock_write_unlock(&nic_data->wv_lock); + free(virtue->data); + free(virtue); + return rc; + } else { + *new_id = virtue->id; + fibril_rwlock_write_unlock(&nic_data->wv_lock); + } + return EOK; +} + +/** + * Default implementation of the wol_virtue_remove method. + * Destroys the WOL virtue. + * + * @param[in] fun + * @param[in] id WOL virtue identification + * + * @return EOK If the operation was successfully completed + * @return ENOTSUP If the function is not supported by the driver or device + * @return ENOENT If the virtue identifier is not valid. + */ +int nic_wol_virtue_remove_impl(ddf_fun_t *fun, nic_wv_id_t id) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + if (nic_data->on_wol_virtue_add == NULL + || nic_data->on_wol_virtue_remove == NULL) { + return ENOTSUP; + } + fibril_rwlock_write_lock(&nic_data->wv_lock); + nic_wol_virtue_t *virtue = + nic_wol_virtues_remove(&nic_data->wol_virtues, id); + if (virtue == NULL) { + fibril_rwlock_write_unlock(&nic_data->wv_lock); + return ENOENT; + } + /* The event handler is called after the filter was removed */ + nic_data->on_wol_virtue_remove(nic_data, virtue); + fibril_rwlock_write_unlock(&nic_data->wv_lock); + free(virtue->data); + free(virtue); + return EOK; +} + +/** + * Default implementation of the wol_virtue_probe method. + * Queries the type and data of the virtue. + * + * @param[in] fun + * @param[in] id Virtue identifier + * @param[out] type Type of the virtue. Can be NULL. + * @param[out] data Data used when the virtue was created. Can be NULL. + * @param[out] length Length of the data. Can be NULL. + * + * @return EOK If the operation was successfully completed + * @return ENOENT If the virtue identifier is not valid. + * @return ENOMEM If there was not enough memory to complete the operation + */ +int nic_wol_virtue_probe_impl(ddf_fun_t *fun, nic_wv_id_t id, + nic_wv_type_t *type, size_t max_length, void *data, size_t *length) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->wv_lock); + const nic_wol_virtue_t *virtue = + nic_wol_virtues_find(&nic_data->wol_virtues, id); + if (virtue == NULL) { + *type = NIC_WV_NONE; + *length = 0; + fibril_rwlock_read_unlock(&nic_data->wv_lock); + return ENOENT; + } else { + *type = virtue->type; + if (max_length > virtue->length) { + max_length = virtue->length; + } + memcpy(data, virtue->data, max_length); + *length = virtue->length; + fibril_rwlock_read_unlock(&nic_data->wv_lock); + return EOK; + } +} + +/** + * Default implementation of the wol_virtue_list method. + * List filters of the specified type. If NIC_WV_NONE is the type, it lists all + * filters. + * + * @param[in] fun + * @param[in] type Type of the virtues + * @param[out] virtues Vector of virtue ID's. + * @param[out] count Length of the data. Can be NULL. + * + * @return EOK If the operation was successfully completed + * @return ENOENT If the filter identification is not valid. + * @return ENOMEM If there was not enough memory to complete the operation + */ +int nic_wol_virtue_list_impl(ddf_fun_t *fun, nic_wv_type_t type, + size_t max_count, nic_wv_id_t *id_list, size_t *id_count) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->wv_lock); + int rc = nic_wol_virtues_list(&nic_data->wol_virtues, type, + max_count, id_list, id_count); + fibril_rwlock_read_unlock(&nic_data->wv_lock); + return rc; +} + +/** + * Default implementation of the wol_virtue_get_caps method. + * Queries for the current capabilities for some type of filter. + * + * @param[in] fun + * @param[in] type Type of the virtues + * @param[out] count Number of virtues of this type that can be currently set + * + * @return EOK If the operation was successfully completed + */ +int nic_wol_virtue_get_caps_impl(ddf_fun_t *fun, nic_wv_type_t type, int *count) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->wv_lock); + *count = nic_data->wol_virtues.caps_max[type] + - (int) nic_data->wol_virtues.lists_sizes[type]; + fibril_rwlock_read_unlock(&nic_data->wv_lock); + return EOK; +} + +/** + * Default implementation of the poll_get_mode method. + * Queries the current interrupt/poll mode of the NIC + * + * @param[in] fun + * @param[out] mode Current poll mode + * @param[out] period Period used in periodic polling. Can be NULL. + * + * @return EOK If the operation was successfully completed + * @return ENOTSUP This function is not supported. + * @return EPARTY Error in communication protocol + */ +int nic_poll_get_mode_impl(ddf_fun_t *fun, + nic_poll_mode_t *mode, struct timeval *period) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->main_lock); + *mode = nic_data->poll_mode; + memcpy(period, &nic_data->poll_period, sizeof (struct timeval)); + fibril_rwlock_read_unlock(&nic_data->main_lock); + return EOK; +} + +/** + * Default implementation of the poll_set_mode_impl method. + * Sets the interrupt/poll mode of the NIC. + * + * @param[in] fun + * @param[in] mode The new poll mode + * @param[in] period Period used in periodic polling. Can be NULL. + * + * @return EOK If the operation was successfully completed + * @return ENOTSUP This operation is not supported. + * @return EPARTY Error in communication protocol + */ +int nic_poll_set_mode_impl(ddf_fun_t *fun, + nic_poll_mode_t mode, const struct timeval *period) +{ + nic_t *nic_data = (nic_t *) fun->driver_data; + /* If the driver does not implement the poll mode change handler it cannot + * switch off interrupts and this is not supported. */ + if (nic_data->on_poll_mode_change == NULL) + return ENOTSUP; + + if ((mode == NIC_POLL_ON_DEMAND) && nic_data->on_poll_request == NULL) + return ENOTSUP; + + if (mode == NIC_POLL_PERIODIC || mode == NIC_POLL_SOFTWARE_PERIODIC) { + if (period == NULL) + return EINVAL; + if (period->tv_sec == 0 && period->tv_usec == 0) + return EINVAL; + if (period->tv_sec < 0 || period->tv_usec < 0) + return EINVAL; + } + fibril_rwlock_write_lock(&nic_data->main_lock); + int rc = nic_data->on_poll_mode_change(nic_data, mode, period); + assert(rc == EOK || rc == ENOTSUP || rc == EINVAL); + if (rc == ENOTSUP && (nic_data->on_poll_request != NULL) && + (mode == NIC_POLL_PERIODIC || mode == NIC_POLL_SOFTWARE_PERIODIC) ) { + + rc = nic_data->on_poll_mode_change(nic_data, NIC_POLL_ON_DEMAND, NULL); + assert(rc == EOK || rc == ENOTSUP); + if (rc == EOK) + nic_sw_period_start(nic_data); + } + if (rc == EOK) { + nic_data->poll_mode = mode; + if (period) + nic_data->poll_period = *period; + } + fibril_rwlock_write_unlock(&nic_data->main_lock); + return rc; +} + +/** + * Default implementation of the poll_now method. + * Wrapper for the actual poll implementation. + * + * @param[in] fun + * + * @return EOK If the NIC was polled + * @return ENOTSUP If the function is not supported + * @return EINVAL If the NIC is not in state where it allows on demand polling + */ +int nic_poll_now_impl(ddf_fun_t *fun) { + nic_t *nic_data = (nic_t *) fun->driver_data; + fibril_rwlock_read_lock(&nic_data->main_lock); + if (nic_data->poll_mode != NIC_POLL_ON_DEMAND) { + fibril_rwlock_read_unlock(&nic_data->main_lock); + return EINVAL; + } + if (nic_data->on_poll_request != NULL) { + nic_data->on_poll_request(nic_data); + fibril_rwlock_read_unlock(&nic_data->main_lock); + return EOK; + } else { + fibril_rwlock_read_unlock(&nic_data->main_lock); + return ENOTSUP; + } +} + +/** Default implementation of the device_added method + * + * Just calls nic_ready. + * + * @param dev + * + */ +void nic_device_added_impl(ddf_dev_t *dev) +{ + nic_ready((nic_t *) dev->driver_data); +} + +/** + * Default handler for unknown methods (outside of the NIC interface). + * Logs a warning message and returns ENOTSUP to the caller. + * + * @param fun The DDF function where the method should be called. + * @param callid IPC call identifier + * @param call IPC call data + */ +void nic_default_handler_impl(ddf_fun_t *fun, ipc_callid_t callid, + ipc_call_t *call) +{ + async_answer_0(callid, ENOTSUP); +} + +/** + * Default (empty) OPEN function implementation. + * + * @param fun The DDF function + * + * @return EOK always. + */ +int nic_open_impl(ddf_fun_t *fun) +{ + return EOK; +} + +/** + * Default (empty) OPEN function implementation. + * + * @param fun The DDF function + */ +void nic_close_impl(ddf_fun_t *fun) +{ +} + +/** @} + */ Index: uspace/lib/nic/src/nic_rx_control.c =================================================================== --- uspace/lib/nic/src/nic_rx_control.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/src/nic_rx_control.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,539 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Incoming packets (frames) filtering functions + */ + +#include +#include +#include +#include +#include +#include +#include +#include "nic_rx_control.h" + +/** + * Initializes the receive control structure + * + * @param rxc + * + * @return EOK On success + * @return ENOMEM On not enough memory + * @return EINVAL Internal error, should not happen + */ +int nic_rxc_init(nic_rxc_t *rxc) +{ + bzero(rxc, sizeof (nic_rxc_t)); + int rc; + rc = nic_addr_db_init(&rxc->blocked_sources, ETH_ADDR); + if (rc != EOK) { + return rc; + } + rc = nic_addr_db_init(&rxc->unicast_addrs, ETH_ADDR); + if (rc != EOK) { + return rc; + } + rc = nic_addr_db_init(&rxc->multicast_addrs, ETH_ADDR); + if (rc != EOK) { + return rc; + } + rxc->block_sources = false; + rxc->unicast_mode = NIC_UNICAST_DEFAULT; + rxc->multicast_mode = NIC_MULTICAST_BLOCKED; + rxc->broadcast_mode = NIC_BROADCAST_ACCEPTED; + + /* Default NIC behavior */ + rxc->unicast_exact = true; + rxc->multicast_exact = false; + rxc->vlan_exact = true; + return EOK; +} + +/** Reinitialize the structure. + * + * @param filters + */ +int nic_rxc_clear(nic_rxc_t *rxc) +{ + nic_addr_db_destroy(&rxc->unicast_addrs); + nic_addr_db_destroy(&rxc->multicast_addrs); + nic_addr_db_destroy(&rxc->blocked_sources); + return nic_rxc_init(rxc); +} + +/** Set the NIC's address that should be used as the default address during + * the checks. + * + * @param rxc + * @param prev_addr Previously used default address. Can be NULL + * if this is the first call after filters' initialization. + * @param curr_addr The new default address. + * + * @return EOK On success + * + */ +int nic_rxc_set_addr(nic_rxc_t *rxc, const nic_address_t *prev_addr, + const nic_address_t *curr_addr) +{ + if (prev_addr != NULL) { + int rc = nic_addr_db_remove(&rxc->unicast_addrs, + (const uint8_t *) &prev_addr->address); + if (rc != EOK) + return rc; + } + + return nic_addr_db_insert(&rxc->unicast_addrs, + (const uint8_t *) &curr_addr->address); +} + +/* Helper structure */ +typedef struct { + size_t max_count; + nic_address_t *address_list; + size_t address_count; +} nic_rxc_add_addr_t; + +/** Helper function */ +static void nic_rxc_add_addr(const uint8_t *addr, void *arg) +{ + nic_rxc_add_addr_t *hs = (nic_rxc_add_addr_t *) arg; + if (hs->address_count < hs->max_count && hs->address_list != NULL) { + memcpy(&hs->address_list[hs->address_count].address, addr, ETH_ADDR); + } + hs->address_count++; +} + +/** + * Queries the current mode of unicast frames receiving. + * + * @param rxc + * @param mode The new unicast mode + * @param max_count Max number of addresses that can be written into the + * address_list. + * @param address_list List of MAC addresses or NULL. + * @param address_count Number of accepted addresses (can be > max_count) + */ +void nic_rxc_unicast_get_mode(const nic_rxc_t *rxc, nic_unicast_mode_t *mode, + size_t max_count, nic_address_t *address_list, size_t *address_count) +{ + *mode = rxc->unicast_mode; + if (rxc->unicast_mode == NIC_UNICAST_LIST) { + nic_rxc_add_addr_t hs = { + .max_count = max_count, + .address_list = address_list, + .address_count = 0 + }; + nic_addr_db_foreach(&rxc->unicast_addrs, nic_rxc_add_addr, &hs); + if (address_count) { + *address_count = hs.address_count; + } + } +} + +/** + * Sets the current mode of unicast frames receiving. + * + * @param rxc + * @param mode The current unicast mode + * @param address_list List of MAC addresses or NULL. + * @param address_count Number of addresses in the list + * + * @return EOK On success + * @return EINVAL If any of the MAC addresses is not a unicast address. + * @return ENOMEM If there was not enough memory + */ +int nic_rxc_unicast_set_mode(nic_rxc_t *rxc, nic_unicast_mode_t mode, + const nic_address_t *address_list, size_t address_count) +{ + if (mode == NIC_UNICAST_LIST && address_list == NULL) { + return EINVAL; + } else if (mode != NIC_UNICAST_LIST && address_list != NULL) { + return EINVAL; + } + + if (rxc->unicast_mode == NIC_UNICAST_LIST) { + nic_addr_db_clear(&rxc->unicast_addrs); + } + rxc->unicast_mode = mode; + size_t i; + for (i = 0; i < address_count; ++i) { + int rc = nic_addr_db_insert(&rxc->unicast_addrs, + (const uint8_t *) &address_list[i].address); + if (rc == ENOMEM) { + return ENOMEM; + } + } + return EOK; +} + +/** + * Queries the current mode of multicast frames receiving. + * + * @param rxc + * @param mode The current multicast mode + * @param max_count Max number of addresses that can be written into the + * address_list. + * @param address_list List of MAC addresses or NULL. + * @param address_count Number of accepted addresses (can be > max_count) + */ +void nic_rxc_multicast_get_mode(const nic_rxc_t *rxc, + nic_multicast_mode_t *mode, size_t max_count, nic_address_t *address_list, + size_t *address_count) +{ + *mode = rxc->multicast_mode; + if (rxc->multicast_mode == NIC_MULTICAST_LIST) { + nic_rxc_add_addr_t hs = { + .max_count = max_count, + .address_list = address_list, + .address_count = 0 + }; + nic_addr_db_foreach(&rxc->multicast_addrs, nic_rxc_add_addr, &hs); + if (address_count) { + *address_count = hs.address_count; + } + } +} + +/** + * Sets the current mode of multicast frames receiving. + * + * @param rxc + * @param mode The new multicast mode + * @param address_list List of MAC addresses or NULL. + * @param address_count Number of addresses in the list + * + * @return EOK On success + * @return EINVAL If any of the MAC addresses is not a multicast address. + * @return ENOMEM If there was not enough memory + */ +int nic_rxc_multicast_set_mode(nic_rxc_t *rxc, nic_multicast_mode_t mode, + const nic_address_t *address_list, size_t address_count) +{ + if (mode == NIC_MULTICAST_LIST && address_list == NULL) + return EINVAL; + else if (mode != NIC_MULTICAST_LIST && address_list != NULL) + return EINVAL; + + if (rxc->multicast_mode == NIC_MULTICAST_LIST) + nic_addr_db_clear(&rxc->multicast_addrs); + + rxc->multicast_mode = mode; + size_t i; + for (i = 0; i < address_count; ++i) { + int rc = nic_addr_db_insert(&rxc->multicast_addrs, + (const uint8_t *)&address_list[i].address); + if (rc == ENOMEM) { + return ENOMEM; + } + } + return EOK; +} + +/** + * Queries the current mode of broadcast frames receiving. + * + * @param rxc + * @param mode The new broadcast mode + */ +void nic_rxc_broadcast_get_mode(const nic_rxc_t *rxc, nic_broadcast_mode_t *mode) +{ + *mode = rxc->broadcast_mode; +} + +/** + * Sets the current mode of broadcast frames receiving. + * + * @param rxc + * @param mode The new broadcast mode + * + * @return EOK On success + */ +int nic_rxc_broadcast_set_mode(nic_rxc_t *rxc, nic_broadcast_mode_t mode) +{ + rxc->broadcast_mode = mode; + return EOK; +} + +/** + * Queries the current blocked source addresses. + * + * @param rxc + * @param max_count Max number of addresses that can be written into the + * address_list. + * @param address_list List of MAC addresses or NULL. + * @param address_count Number of blocked addresses (can be > max_count) + */ +void nic_rxc_blocked_sources_get(const nic_rxc_t *rxc, + size_t max_count, nic_address_t *address_list, size_t *address_count) +{ + nic_rxc_add_addr_t hs = { + .max_count = max_count, + .address_list = address_list, + .address_count = 0 + }; + nic_addr_db_foreach(&rxc->blocked_sources, nic_rxc_add_addr, &hs); + if (address_count) { + *address_count = hs.address_count; + } +} + +/** + * Clears the currently blocked addresses and sets the addresses contained in + * the list as the set of blocked source addresses (no frame with this source + * address will be received). Duplicated addresses are ignored. + * + * @param rxc + * @param address_list List of the blocked addresses. Can be NULL. + * @param address_count Number of addresses in the list + * + * @return EOK On success + * @return ENOMEM If there was not enough memory + */ +int nic_rxc_blocked_sources_set(nic_rxc_t *rxc, + const nic_address_t *address_list, size_t address_count) +{ + assert((address_count == 0 && address_list == NULL) + || (address_count != 0 && address_list != NULL)); + + nic_addr_db_clear(&rxc->blocked_sources); + rxc->block_sources = (address_count != 0); + size_t i; + for (i = 0; i < address_count; ++i) { + int rc = nic_addr_db_insert(&rxc->blocked_sources, + (const uint8_t *) &address_list[i].address); + if (rc == ENOMEM) { + return ENOMEM; + } + } + return EOK; +} + +/** + * Query mask used for filtering according to the VLAN tags. + * + * @param rxc + * @param mask Must be 512 bytes long + * + * @return EOK + * @return ENOENT + */ +int nic_rxc_vlan_get_mask(const nic_rxc_t *rxc, nic_vlan_mask_t *mask) +{ + if (rxc->vlan_mask == NULL) { + return ENOENT; + } + memcpy(mask, rxc->vlan_mask, sizeof (nic_vlan_mask_t)); + return EOK; +} + +/** + * Set mask for filtering according to the VLAN tags. + * + * @param rxc + * @param mask Must be 512 bytes long + * + * @return EOK + * @return ENOMEM + */ +int nic_rxc_vlan_set_mask(nic_rxc_t *rxc, const nic_vlan_mask_t *mask) +{ + if (mask == NULL) { + if (rxc->vlan_mask) { + free(rxc->vlan_mask); + } + rxc->vlan_mask = NULL; + return EOK; + } + if (!rxc->vlan_mask) { + rxc->vlan_mask = malloc(sizeof (nic_vlan_mask_t)); + if (rxc->vlan_mask == NULL) { + return ENOMEM; + } + } + memcpy(rxc->vlan_mask, mask, sizeof (nic_vlan_mask_t)); + return EOK; +} + + +/** + * Check if the frame passes through the receive control. + * + * @param rxc + * @param packet The probed frame + * + * @return True if the frame passes, false if it does not + */ +int nic_rxc_check(const nic_rxc_t *rxc, const packet_t *packet, + nic_frame_type_t *frame_type) +{ + assert(frame_type != NULL); + uint8_t *dest_addr = (uint8_t *) packet + packet->data_start; + uint8_t *src_addr = dest_addr + ETH_ADDR; + + if (dest_addr[0] & 1) { + /* Multicast or broadcast */ + if (*(uint32_t *) dest_addr == 0xFFFFFFFF && + *(uint16_t *) (dest_addr + 4) == 0xFFFF) { + /* It is broadcast */ + *frame_type = NIC_FRAME_BROADCAST; + if (rxc->broadcast_mode == NIC_BROADCAST_BLOCKED) + return false; + } else { + *frame_type = NIC_FRAME_MULTICAST; + /* In promiscuous mode the multicast_exact should be set to true */ + if (!rxc->multicast_exact) { + if (rxc->multicast_mode == NIC_MULTICAST_BLOCKED) + return false; + else { + if (!nic_addr_db_contains(&rxc->multicast_addrs, + dest_addr)) + return false; + } + } + } + } else { + /* Unicast */ + *frame_type = NIC_FRAME_UNICAST; + /* In promiscuous mode the unicast_exact should be set to true */ + if (!rxc->unicast_exact) { + if (rxc->unicast_mode == NIC_UNICAST_BLOCKED) + return false; + else { + if (!nic_addr_db_contains(&rxc->unicast_addrs, + dest_addr)) + return false; + } + } + } + /* Blocked source addresses */ + if (rxc->block_sources) { + if (nic_addr_db_contains(&rxc->blocked_sources, src_addr)) + return false; + } + /* VLAN filtering */ + if (!rxc->vlan_exact && rxc->vlan_mask != NULL) { + vlan_header_t *vlan_header = (vlan_header_t *) + ((uint8_t *) packet + packet->data_start + 2 * ETH_ADDR); + if (vlan_header->tpid_upper == VLAN_TPID_UPPER && + vlan_header->tpid_lower == VLAN_TPID_LOWER) { + int index = ((int) (vlan_header->vid_upper & 0xF) << 5) | + (vlan_header->vid_lower >> 3); + if (!(rxc->vlan_mask->bitmap[index] & + (1 << (vlan_header->vid_lower & 0x7)))) + return false; + } + } + + return true; +} + +/** + * Set information about current HW filtering. + * 1 ... Only those frames we want to receive are passed through HW + * 0 ... The HW filtering is imperfect + * -1 ... Don't change the setting + * This function should be called only from the mode change event handler. + * + * @param rxc + * @param unicast_exact Unicast frames + * @param mcast_exact Multicast frames + * @param vlan_exact VLAN tags + */ +void nic_rxc_hw_filtering(nic_rxc_t *rxc, + int unicast_exact, int multicast_exact, int vlan_exact) +{ + if (unicast_exact >= 0) + rxc->unicast_exact = unicast_exact; + if (multicast_exact >= 0) + rxc->multicast_exact = multicast_exact; + if (vlan_exact >= 0) + rxc->vlan_exact = vlan_exact; +} + +/** + * Computes hash for the address list based on standard multicast address + * hashing. + * + * @param address_list + * @param count + * + * @return Multicast hash + * + * @see multicast_hash + */ +uint64_t nic_rxc_mcast_hash(const nic_address_t *address_list, size_t count) +{ + size_t i; + uint64_t hash = 0; + for (i = 0; i < count; ++i) { + hash |= multicast_hash(address_list[i].address); + } + return hash; +} + +static void nic_rxc_hash_addr(const uint8_t *address, void *arg) +{ + *((uint64_t *) arg) |= multicast_hash(address); +} + +/** + * Computes hash for multicast addresses currently set up in the RX multicast + * filtering. For promiscuous mode returns all ones, for blocking all zeroes. + * Can be called only from the on_*_change handler. + * + * @param rxc + * + * @return Multicast hash + * + * @see multicast_hash + */ +uint64_t nic_rxc_multicast_get_hash(const nic_rxc_t *rxc) +{ + switch (rxc->multicast_mode) { + case NIC_MULTICAST_UNKNOWN: + case NIC_MULTICAST_BLOCKED: + return 0; + case NIC_MULTICAST_LIST: + break; + case NIC_MULTICAST_PROMISC: + return ~ (uint64_t) 0; + } + uint64_t hash; + nic_addr_db_foreach(&rxc->multicast_addrs, nic_rxc_hash_addr, &hash); + return hash; +} + +/** @} + */ Index: uspace/lib/nic/src/nic_wol_virtues.c =================================================================== --- uspace/lib/nic/src/nic_wol_virtues.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/lib/nic/src/nic_wol_virtues.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,296 @@ +/* + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** + * @addtogroup libnic + * @{ + */ +/** + * @file + * @brief Wake-on-LAN support + */ + +#include "nic_wol_virtues.h" +#include + +#define NIC_WV_HASH_COUNT 32 + +/** + * Hash table helper function + */ +static int nic_wv_compare(unsigned long key[], hash_count_t keys, + link_t *item) +{ + nic_wol_virtue_t *virtue = (nic_wol_virtue_t *) item; + return (virtue->id == (nic_wv_id_t) key[0]); +} + +/** + * Hash table helper function + */ +static void nic_wv_rc(link_t *item) +{ +} + +/** + * Hash table helper function + */ +static hash_index_t nic_wv_hash(unsigned long keys[]) +{ + return keys[0] % NIC_WV_HASH_COUNT; +} + +/** + * Initializes the WOL virtues structure + * + * @param wvs + * + * @return EOK On success + * @return ENOMEM On not enough memory + */ +int nic_wol_virtues_init(nic_wol_virtues_t *wvs) +{ + bzero(wvs, sizeof (nic_wol_virtues_t)); + wvs->table_operations.compare = nic_wv_compare; + wvs->table_operations.hash = nic_wv_hash; + wvs->table_operations.remove_callback = nic_wv_rc; + if (!hash_table_create(&wvs->table, NIC_WV_HASH_COUNT, 1, + &wvs->table_operations)) { + return ENOMEM; + } + size_t i; + for (i = 0; i < NIC_WV_MAX; ++i) { + wvs->caps_max[i] = -1; + } + wvs->next_id = 0; + return EOK; +} + +/** + * Reinitializes the structure, destroying all virtues. The next_id is not + * changed (some apps could still hold the filter IDs). + * + * @param wvs + */ +void nic_wol_virtues_clear(nic_wol_virtues_t *wvs) +{ + hash_table_clear(&wvs->table); + nic_wv_type_t type; + for (type = NIC_WV_NONE; type < NIC_WV_MAX; ++type) { + nic_wol_virtue_t *virtue = wvs->lists[type]; + while (virtue != NULL) { + nic_wol_virtue_t *next = virtue->next; + free(virtue->data); + free(virtue); + virtue = next; + } + wvs->lists_sizes[type] = 0; + } +} + +/** + * Verifies that the arguments for the WOL virtues are correct. + * + * @param type Type of the virtue + * @param data Data argument for the virtue + * @param length Length of the data + * + * @return EOK The arguments are correct + * @return EINVAL The arguments are incorrect + * @return ENOTSUP This type is unknown + */ +int nic_wol_virtues_verify(nic_wv_type_t type, const void *data, size_t length) +{ + switch (type) { + case NIC_WV_ARP_REQUEST: + case NIC_WV_BROADCAST: + case NIC_WV_LINK_CHANGE: + return EOK; + case NIC_WV_DESTINATION: + return length == sizeof (nic_address_t) ? EOK : EINVAL; + case NIC_WV_DIRECTED_IPV4: + return length == sizeof (nic_wv_ipv4_data_t) ? EOK : EINVAL; + case NIC_WV_DIRECTED_IPV6: + return length == sizeof (nic_wv_ipv6_data_t) ? EOK : EINVAL; + case NIC_WV_FULL_MATCH: + return length % 2 == 0 ? EOK : EINVAL; + case NIC_WV_MAGIC_PACKET: + return data == NULL || length == sizeof (nic_wv_magic_packet_data_t) ? + EOK : EINVAL; + default: + return ENOTSUP; + } +} + +/** + * Adds the virtue to the list of known virtues, activating it. + * + * @param wvs + * @param virtue The virtue structure + * + * @return EOK On success + * @return ENOTSUP If the virtue type is not supported + * @return EINVAL If the virtue type is a single-filter and there's already + * a virtue of this type defined, or there is something wrong + * with the data + * @return ENOMEM Not enough memory to activate the virtue + */ +int nic_wol_virtues_add(nic_wol_virtues_t *wvs, nic_wol_virtue_t *virtue) +{ + if (!nic_wv_is_multi(virtue->type) && + wvs->lists[virtue->type] != NULL) { + return EINVAL; + } + do { + virtue->id = wvs->next_id++; + } while (NULL != + hash_table_find(&wvs->table, (unsigned long *) &virtue->id)); + hash_table_insert(&wvs->table, + (unsigned long *) &virtue->id, &virtue->item); + virtue->next = wvs->lists[virtue->type]; + wvs->lists[virtue->type] = virtue; + wvs->lists_sizes[virtue->type]++; + return EOK; +} + +/** + * Removes the virtue from the list of virtues, but NOT deallocating the + * nic_wol_virtue structure. + * + * @param wvs + * @param id Identifier of the removed virtue + * + * @return Removed virtue structure or NULL if not found. + */ +nic_wol_virtue_t *nic_wol_virtues_remove(nic_wol_virtues_t *wvs, nic_wv_id_t id) +{ + nic_wol_virtue_t *virtue = (nic_wol_virtue_t *) + hash_table_find(&wvs->table, (unsigned long *) &id); + if (virtue == NULL) { + return NULL; + } + + /* Remove from filter_table */ + hash_table_remove(&wvs->table, (unsigned long *) &id, 1); + + /* Remove from filter_types */ + assert(wvs->lists[virtue->type] != NULL); + if (wvs->lists[virtue->type] == virtue) { + wvs->lists[virtue->type] = virtue->next; + } else { + nic_wol_virtue_t *wv = wvs->lists[virtue->type]; + while (wv->next != virtue) { + wv = wv->next; + assert(wv != NULL); + } + wv->next = virtue->next; + } + wvs->lists_sizes[virtue->type]--; + + virtue->next = NULL; + return virtue; +} + + +/** + * Searches the filters table for a filter with specified ID + * + * @param wvs + * @param id Identifier of the searched virtue + * + * @return Requested filter or NULL if not found. + */ +const nic_wol_virtue_t *nic_wol_virtues_find(const nic_wol_virtues_t *wvs, + nic_wv_id_t id) +{ + /* + * The hash_table_find cannot be const, because it would require the + * returned link to be const as well. But in this case, when we're returning + * constant virtue the retyping is correct. + */ + link_t *virtue = hash_table_find( + &((nic_wol_virtues_t *) wvs)->table, (unsigned long *) &id); + return (const nic_wol_virtue_t *) virtue; +} + +/** + * Fill identifiers of current wol virtues of the specified type into the list. + * If the type is set to NIC_WV_NONE, all virtues are used. + * + * @param wvs + * @param[in] type Type of the virtues or NIC_WV_NONE + * @param[out] id_list The new vector of filter IDs. Can be NULL. + * @param[out] count Number of IDs in the filter_list. Can be NULL. + * + * @return EOK If it completes successfully + * @return EINVAL If the filter type is invalid + */ +int nic_wol_virtues_list(const nic_wol_virtues_t *wvs, nic_wv_type_t type, + size_t max_count, nic_wv_id_t *id_list, size_t *id_count) +{ + size_t count = 0; + if (type == NIC_WV_NONE) { + size_t i; + for (i = NIC_WV_NONE; i < NIC_WV_MAX; ++i) { + if (id_list != NULL) { + nic_wol_virtue_t *virtue = wvs->lists[i]; + while (virtue != NULL) { + if (count < max_count) { + id_list[count] = virtue->id; + } + ++count; + virtue = virtue->next; + } + } else { + count += wvs->lists_sizes[i]; + } + } + } else if (type >= NIC_WV_MAX) { + return EINVAL; + } else { + if (id_list != NULL) { + nic_wol_virtue_t *virtue = wvs->lists[type]; + while (virtue != NULL) { + if (count < max_count) { + id_list[count] = virtue->id; + } + ++count; + virtue = virtue->next; + } + } else { + count = wvs->lists_sizes[type]; + } + } + if (id_count != NULL) { + *id_count = count; + } + return EOK; +} + +/** @} + */ Index: pace/lib/packet/Makefile =================================================================== --- uspace/lib/packet/Makefile (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# 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 = ../.. -EXTRA_CFLAGS = -Iinclude -LIBRARY = libpacket - -SOURCES = \ - generic/packet_server.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/lib/packet/generic/packet_server.c =================================================================== --- uspace/lib/packet/generic/packet_server.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,374 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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. - */ - -/** @addtogroup libpacket - * @{ - */ - -/** @file - * Packet server implementation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define FREE_QUEUES_COUNT 7 - -/** The default address length reserved for new packets. */ -#define DEFAULT_ADDR_LEN 32 - -/** The default prefix reserved for new packets. */ -#define DEFAULT_PREFIX 64 - -/** The default suffix reserved for new packets. */ -#define DEFAULT_SUFFIX 64 - -/** Packet server global data. */ -static struct { - /** Safety lock. */ - fibril_mutex_t lock; - /** Free packet queues. */ - packet_t *free[FREE_QUEUES_COUNT]; - - /** - * Packet length upper bounds of the free packet queues. The maximal - * lengths of packets in each queue in the ascending order. The last - * queue is not limited. - */ - size_t sizes[FREE_QUEUES_COUNT]; - - /** Total packets allocated. */ - unsigned int count; -} ps_globals = { - .lock = FIBRIL_MUTEX_INITIALIZER(ps_globals.lock), - .free = { - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL - }, - .sizes = { - PAGE_SIZE, - PAGE_SIZE * 2, - PAGE_SIZE * 4, - PAGE_SIZE * 8, - PAGE_SIZE * 16, - PAGE_SIZE * 32, - PAGE_SIZE * 64 - }, - .count = 0 -}; - -/** Clears and initializes the packet according to the given dimensions. - * - * @param[in] packet The packet to be initialized. - * @param[in] addr_len The source and destination addresses maximal length in - * bytes. - * @param[in] max_prefix The maximal prefix length in bytes. - * @param[in] max_content The maximal content length in bytes. - * @param[in] max_suffix The maximal suffix length in bytes. - */ -static void -packet_init(packet_t *packet, size_t addr_len, size_t max_prefix, - size_t max_content, size_t max_suffix) -{ - /* Clear the packet content */ - bzero(((void *) packet) + sizeof(packet_t), - packet->length - sizeof(packet_t)); - - /* Clear the packet header */ - packet->order = 0; - packet->metric = 0; - packet->previous = 0; - packet->next = 0; - packet->addr_len = 0; - packet->src_addr = sizeof(packet_t); - packet->dest_addr = packet->src_addr + addr_len; - packet->max_prefix = max_prefix; - packet->max_content = max_content; - packet->data_start = packet->dest_addr + addr_len + packet->max_prefix; - packet->data_end = packet->data_start; -} - -/** Creates a new packet of dimensions at least as given. - * - * @param[in] length The total length of the packet, including the header, - * the addresses and the data of the packet. - * @param[in] addr_len The source and destination addresses maximal length in - * bytes. - * @param[in] max_prefix The maximal prefix length in bytes. - * @param[in] max_content The maximal content length in bytes. - * @param[in] max_suffix The maximal suffix length in bytes. - * @return The packet of dimensions at least as given. - * @return NULL if there is not enough memory left. - */ -static packet_t * -packet_create(size_t length, size_t addr_len, size_t max_prefix, - size_t max_content, size_t max_suffix) -{ - packet_t *packet; - int rc; - - assert(fibril_mutex_is_locked(&ps_globals.lock)); - - /* Already locked */ - packet = (packet_t *) mmap(NULL, length, PROTO_READ | PROTO_WRITE, - MAP_SHARED | MAP_ANONYMOUS, 0, 0); - if (packet == MAP_FAILED) - return NULL; - - ps_globals.count++; - packet->packet_id = ps_globals.count; - packet->length = length; - packet_init(packet, addr_len, max_prefix, max_content, max_suffix); - packet->magic_value = PACKET_MAGIC_VALUE; - rc = pm_add(packet); - if (rc != EOK) { - munmap(packet, packet->length); - return NULL; - } - - return packet; -} - -/** Return the packet of dimensions at least as given. - * - * Try to reuse free packets first. - * Create a new packet aligned to the memory page size if none available. - * Lock the global data during its processing. - * - * @param[in] addr_len The source and destination addresses maximal length in - * bytes. - * @param[in] max_prefix The maximal prefix length in bytes. - * @param[in] max_content The maximal content length in bytes. - * @param[in] max_suffix The maximal suffix length in bytes. - * @return The packet of dimensions at least as given. - * @return NULL if there is not enough memory left. - */ -static packet_t * -packet_get_local(size_t addr_len, size_t max_prefix, size_t max_content, - size_t max_suffix) -{ - size_t length = ALIGN_UP(sizeof(packet_t) + 2 * addr_len + - max_prefix + max_content + max_suffix, PAGE_SIZE); - - fibril_mutex_lock(&ps_globals.lock); - - packet_t *packet; - unsigned int index; - - for (index = 0; index < FREE_QUEUES_COUNT; index++) { - if ((length > ps_globals.sizes[index]) && - (index < FREE_QUEUES_COUNT - 1)) - continue; - - packet = ps_globals.free[index]; - while (packet_is_valid(packet) && (packet->length < length)) - packet = pm_find(packet->next); - - if (packet_is_valid(packet)) { - if (packet == ps_globals.free[index]) - ps_globals.free[index] = pq_detach(packet); - else - pq_detach(packet); - - packet_init(packet, addr_len, max_prefix, max_content, - max_suffix); - fibril_mutex_unlock(&ps_globals.lock); - - return packet; - } - } - - packet = packet_create(length, addr_len, max_prefix, max_content, - max_suffix); - - fibril_mutex_unlock(&ps_globals.lock); - - return packet; -} - -/** Release the packet and returns it to the appropriate free packet queue. - * - * @param[in] packet The packet to be released. - * - */ -static void packet_release(packet_t *packet) -{ - int index; - int result; - - assert(fibril_mutex_is_locked(&ps_globals.lock)); - - for (index = 0; (index < FREE_QUEUES_COUNT - 1) && - (packet->length > ps_globals.sizes[index]); index++) { - ; - } - - result = pq_add(&ps_globals.free[index], packet, packet->length, - packet->length); - assert(result == EOK); -} - -/** Releases the packet queue. - * - * @param[in] packet_id The first packet identifier. - * @return EOK on success. - * @return ENOENT if there is no such packet. - */ -static int packet_release_wrapper(packet_id_t packet_id) -{ - packet_t *packet; - - packet = pm_find(packet_id); - if (!packet_is_valid(packet)) - return ENOENT; - - fibril_mutex_lock(&ps_globals.lock); - pq_destroy(packet, packet_release); - fibril_mutex_unlock(&ps_globals.lock); - - return EOK; -} - -/** Shares the packet memory block. - * @param[in] packet The packet to be shared. - * @return EOK on success. - * @return EINVAL if the packet is not valid. - * @return EINVAL if the calling module does not accept the memory. - * @return ENOMEM if the desired and actual sizes differ. - * @return Other error codes as defined for the - * async_share_in_finalize() function. - */ -static int packet_reply(packet_t *packet) -{ - ipc_callid_t callid; - size_t size; - - if (!packet_is_valid(packet)) - return EINVAL; - - if (!async_share_in_receive(&callid, &size)) { - async_answer_0(callid, EINVAL); - return EINVAL; - } - - if (size != packet->length) { - async_answer_0(callid, ENOMEM); - return ENOMEM; - } - - return async_share_in_finalize(callid, packet, - PROTO_READ | PROTO_WRITE); -} - -/** Processes the packet server message. - * - * @param[in] callid The message identifier. - * @param[in] call The message parameters. - * @param[out] answer The message answer parameters. - * @param[out] answer_count The last parameter for the actual answer in the - * answer parameter. - * @return EOK on success. - * @return ENOMEM if there is not enough memory left. - * @return ENOENT if there is no such packet as in the packet - * message parameter. - * @return ENOTSUP if the message is not known. - * @return Other error codes as defined for the - * packet_release_wrapper() function. - */ -int packet_server_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, - size_t *answer_count) -{ - packet_t *packet; - - if (!IPC_GET_IMETHOD(*call)) - return EOK; - - *answer_count = 0; - switch (IPC_GET_IMETHOD(*call)) { - case NET_PACKET_CREATE_1: - packet = packet_get_local(DEFAULT_ADDR_LEN, DEFAULT_PREFIX, - IPC_GET_CONTENT(*call), DEFAULT_SUFFIX); - if (!packet) - return ENOMEM; - *answer_count = 2; - IPC_SET_ARG1(*answer, (sysarg_t) packet->packet_id); - IPC_SET_ARG2(*answer, (sysarg_t) packet->length); - return EOK; - - case NET_PACKET_CREATE_4: - packet = packet_get_local( - ((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(*call)) ? - IPC_GET_ADDR_LEN(*call) : DEFAULT_ADDR_LEN), - DEFAULT_PREFIX + IPC_GET_PREFIX(*call), - IPC_GET_CONTENT(*call), - DEFAULT_SUFFIX + IPC_GET_SUFFIX(*call)); - if (!packet) - return ENOMEM; - *answer_count = 2; - IPC_SET_ARG1(*answer, (sysarg_t) packet->packet_id); - IPC_SET_ARG2(*answer, (sysarg_t) packet->length); - return EOK; - - case NET_PACKET_GET: - packet = pm_find(IPC_GET_ID(*call)); - if (!packet_is_valid(packet)) - return ENOENT; - return packet_reply(packet); - - case NET_PACKET_GET_SIZE: - packet = pm_find(IPC_GET_ID(*call)); - if (!packet_is_valid(packet)) - return ENOENT; - IPC_SET_ARG1(*answer, (sysarg_t) packet->length); - *answer_count = 1; - return EOK; - - case NET_PACKET_RELEASE: - return packet_release_wrapper(IPC_GET_ID(*call)); - } - - return ENOTSUP; -} - -/** @} - */ Index: pace/lib/packet/include/packet_server.h =================================================================== --- uspace/lib/packet/include/packet_server.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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. - */ - -/** @addtogroup libpacket - * @{ - */ - -/** @file - * Packet server. - * The hosting module has to be compiled with both the packet.c and the - * packet_server.c source files. To function correctly, initialization of the - * packet map by the pm_init() function has to happen at the first place. Then - * the packet messages have to be processed by the packet_server_message() - * function. The packet map should be released by the pm_destroy() function - * during the module termination. - * @see IS_NET_PACKET_MESSAGE() - */ - -#ifndef LIBPACKET_PACKET_SERVER_H_ -#define LIBPACKET_PACKET_SERVER_H_ - -#include - -extern int packet_server_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, - size_t *); - -#endif - -/** @} - */ Index: uspace/lib/usb/include/usb/classes/hub.h =================================================================== --- uspace/lib/usb/include/usb/classes/hub.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/usb/include/usb/classes/hub.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -72,5 +72,9 @@ uint8_t port_count; /** Characteristics bitmask. */ - uint16_t characteristics; + uint8_t characteristics; +#define HUB_CHAR_POWER_PER_PORT_FLAG (1 << 0) +#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1) + /* Unused part of characteristics field */ + uint8_t characteristics_reserved; /** Time from power-on to stabilization of current on the port. */ uint8_t power_good_time; @@ -92,5 +96,5 @@ /** Number of downstream ports that this hub supports */ - uint8_t ports_count; + uint8_t port_count; /** @@ -119,6 +123,4 @@ */ uint16_t hub_characteristics; -#define HUB_CHAR_POWER_PER_PORT_FLAG (1 << 0) -#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1) /** @@ -214,11 +216,6 @@ * Maximum size of usb hub descriptor in bytes */ -extern size_t USB_HUB_MAX_DESCRIPTOR_SIZE; - - - - - - +/* 7 (basic size) + 2*32 (port bitmasks) */ +#define USB_HUB_MAX_DESCRIPTOR_SIZE 71 #endif Index: uspace/lib/usbdev/include/usb/dev/pipes.h =================================================================== --- uspace/lib/usbdev/include/usb/dev/pipes.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/usbdev/include/usb/dev/pipes.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -183,5 +183,5 @@ int usb_pipe_write(usb_pipe_t *, void *, size_t); -int usb_pipe_control_read(usb_pipe_t *, void *, size_t, +int usb_pipe_control_read(usb_pipe_t *, const void *, size_t, void *, size_t, size_t *); int usb_pipe_control_write(usb_pipe_t *, void *, size_t, Index: uspace/lib/usbdev/src/pipesio.c =================================================================== --- uspace/lib/usbdev/src/pipesio.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/lib/usbdev/src/pipesio.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -328,5 +328,5 @@ */ static int usb_pipe_control_read_no_check(usb_pipe_t *pipe, - void *setup_buffer, size_t setup_buffer_size, + const void *setup_buffer, size_t setup_buffer_size, void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size) { @@ -411,5 +411,5 @@ */ int usb_pipe_control_read(usb_pipe_t *pipe, - void *setup_buffer, size_t setup_buffer_size, + const void *setup_buffer, size_t setup_buffer_size, void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size) { Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/devman/devman.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -794,4 +794,7 @@ case EOK: dev->state = DEVICE_USABLE; + exch = async_exchange_begin(drv->sess); + async_msg_1(exch, DRIVER_DEV_ADDED, dev->handle); + async_exchange_end(exch); break; case ENOENT: @@ -1066,4 +1069,7 @@ link = hash_table_find(&tree->devman_devices, &key); + if (link == NULL) + return NULL; + return hash_table_get_instance(link, dev_node_t, devman_dev); } Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/devman/main.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -634,4 +634,7 @@ fibril_rwlock_read_unlock(&device_tree.rwlock); dev_del_ref(dev); + if (gone_rc == EOK) + gone_rc = ENOTSUP; + async_answer_0(callid, gone_rc); return; } Index: uspace/srv/fs/fat/fat.h =================================================================== --- uspace/srv/fs/fat/fat.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/fs/fat/fat.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -141,4 +141,18 @@ } __attribute__ ((packed)) fat_bs_t; +#define FAT32_FSINFO_SIG1 "RRaA" +#define FAT32_FSINFO_SIG2 "rrAa" +#define FAT32_FSINFO_SIG3 "\x00\x00\x55\xaa" + +typedef struct { + uint8_t sig1[4]; + uint8_t res1[480]; + uint8_t sig2[4]; + uint32_t free_clusters; + uint32_t last_allocated_cluster; + uint8_t res2[12]; + uint8_t sig3[4]; +} __attribute__ ((packed)) fat32_fsinfo_t; + typedef enum { FAT_INVALID, Index: uspace/srv/fs/fat/fat_ops.c =================================================================== --- uspace/srv/fs/fat/fat_ops.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/fs/fat/fat_ops.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1025,9 +1025,43 @@ } +static int fat_update_fat32_fsinfo(service_id_t service_id) +{ + fat_bs_t *bs; + fat32_fsinfo_t *info; + block_t *b; + int rc; + + bs = block_bb_get(service_id); + assert(FAT_IS_FAT32(bs)); + + rc = block_get(&b, service_id, uint16_t_le2host(bs->fat32.fsinfo_sec), + BLOCK_FLAGS_NONE); + if (rc != EOK) + return rc; + + info = (fat32_fsinfo_t *) b->data; + + if (bcmp(info->sig1, FAT32_FSINFO_SIG1, sizeof(info->sig1)) || + bcmp(info->sig2, FAT32_FSINFO_SIG2, sizeof(info->sig2)) || + bcmp(info->sig3, FAT32_FSINFO_SIG3, sizeof(info->sig3))) { + (void) block_put(b); + return EINVAL; + } + + /* For now, invalidate the counter. */ + info->free_clusters = host2uint16_t_le(-1); + + b->dirty = true; + return block_put(b); +} + static int fat_unmounted(service_id_t service_id) { fs_node_t *fn; fat_node_t *nodep; - int rc; + fat_bs_t *bs; + int rc; + + bs = block_bb_get(service_id); rc = fat_root_get(&fn, service_id); @@ -1043,4 +1077,11 @@ (void) fat_node_put(fn); return EBUSY; + } + + if (FAT_IS_FAT32(bs)) { + /* + * Attempt to update the FAT32 FS info. + */ + (void) fat_update_fat32_fsinfo(service_id); } Index: uspace/srv/hw/irc/apic/apic.c =================================================================== --- uspace/srv/hw/irc/apic/apic.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/hw/irc/apic/apic.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -206,7 +206,10 @@ } - if (pio_enable((void *) IO_APIC_BASE, IO_APIC_SIZE, - (void **) &io_apic) != EOK) + int rc = pio_enable((void *) IO_APIC_BASE, IO_APIC_SIZE, + (void **) &io_apic); + if (rc != EOK) { + printf("%s: Failed to enable PIO for APIC: %d\n", NAME, rc); return false; + } async_set_client_connection(apic_connection); Index: pace/srv/hw/netif/ne2000/Makefile =================================================================== --- uspace/srv/hw/netif/ne2000/Makefile (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,47 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# 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 = ../../../.. -ROOT_PATH = $(USPACE_PREFIX)/.. -LIBS = $(LIBNET_PREFIX)/libnet.a -EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include - -COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common -CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config - --include $(COMMON_MAKEFILE) --include $(CONFIG_MAKEFILE) - -BINARY = ne2000 - -SOURCES = \ - dp8390.c \ - ne2000.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/srv/hw/netif/ne2000/dp8390.c =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,655 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * Copyright (c) 2011 Martin Decky - * 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. - */ - -/* - * This code is based upon the NE2000 driver for MINIX, - * distributed according to a BSD-style license. - * - * Copyright (c) 1987, 1997, 2006 Vrije Universiteit - * Copyright (c) 1992, 1994 Philip Homburg - * Copyright (c) 1996 G. Falzoni - * - */ - -/** @addtogroup ne2000 - * @{ - */ - -/** @file - * - * NE2000 (based on DP8390) network interface core implementation. - * Only the basic NE2000 PIO (ISA) interface is supported, remote - * DMA is completely absent from this code for simplicity. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include "dp8390.h" - -/** Page size */ -#define DP_PAGE 256 - -/** 6 * DP_PAGE >= 1514 bytes */ -#define SQ_PAGES 6 - -/* NE2000 implementation. */ - -/** NE2000 Data Register */ -#define NE2K_DATA 0x0010 - -/** NE2000 Reset register */ -#define NE2K_RESET 0x001f - -/** NE2000 data start */ -#define NE2K_START 0x4000 - -/** NE2000 data size */ -#define NE2K_SIZE 0x4000 - -/** NE2000 retry count */ -#define NE2K_RETRY 0x1000 - -/** NE2000 error messages rate limiting */ -#define NE2K_ERL 10 - -/** Minimum Ethernet packet size in bytes */ -#define ETH_MIN_PACK_SIZE 60 - -/** Maximum Ethernet packet size in bytes */ -#define ETH_MAX_PACK_SIZE_TAGGED 1518 - -/** Type definition of the receive header - * - */ -typedef struct { - /** Copy of RSR */ - uint8_t status; - - /** Pointer to next packet */ - uint8_t next; - - /** Receive Byte Count Low */ - uint8_t rbcl; - - /** Receive Byte Count High */ - uint8_t rbch; -} recv_header_t; - -/** Read a memory block word by word. - * - * @param[in] port Source address. - * @param[out] buf Destination buffer. - * @param[in] size Memory block size in bytes. - * - */ -static void pio_read_buf_16(void *port, void *buf, size_t size) -{ - size_t i; - - for (i = 0; (i << 1) < size; i++) - *((uint16_t *) buf + i) = pio_read_16((ioport16_t *) (port)); -} - -/** Write a memory block word by word. - * - * @param[in] port Destination address. - * @param[in] buf Source buffer. - * @param[in] size Memory block size in bytes. - * - */ -static void pio_write_buf_16(void *port, void *buf, size_t size) -{ - size_t i; - - for (i = 0; (i << 1) < size; i++) - pio_write_16((ioport16_t *) port, *((uint16_t *) buf + i)); -} - -static void ne2k_download(ne2k_t *ne2k, void *buf, size_t addr, size_t size) -{ - size_t esize = size & ~1; - - pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff); - pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff); - pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff); - pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff); - pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); - - if (esize != 0) { - pio_read_buf_16(ne2k->data_port, buf, esize); - size -= esize; - buf += esize; - } - - if (size) { - assert(size == 1); - - uint16_t word = pio_read_16(ne2k->data_port); - memcpy(buf, &word, 1); - } -} - -static void ne2k_upload(ne2k_t *ne2k, void *buf, size_t addr, size_t size) -{ - size_t esize = size & ~1; - - pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff); - pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff); - pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff); - pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff); - pio_write_8(ne2k->port + DP_CR, CR_DM_RW | CR_PS_P0 | CR_STA); - - if (esize != 0) { - pio_write_buf_16(ne2k->data_port, buf, esize); - size -= esize; - buf += esize; - } - - if (size) { - assert(size == 1); - - uint16_t word = 0; - - memcpy(&word, buf, 1); - pio_write_16(ne2k->data_port, word); - } -} - -static void ne2k_init(ne2k_t *ne2k) -{ - unsigned int i; - - /* Reset the ethernet card */ - uint8_t val = pio_read_8(ne2k->port + NE2K_RESET); - usleep(2000); - pio_write_8(ne2k->port + NE2K_RESET, val); - usleep(2000); - - /* Reset the DP8390 */ - pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); - for (i = 0; i < NE2K_RETRY; i++) { - if (pio_read_8(ne2k->port + DP_ISR) != 0) - break; - } -} - -/** Probe and initialize the network interface. - * - * @param[in,out] ne2k Network interface structure. - * @param[in] port Device address. - * @param[in] irq Device interrupt vector. - * - * @return EOK on success. - * @return EXDEV if the network interface was not recognized. - * - */ -int ne2k_probe(ne2k_t *ne2k, void *port, int irq) -{ - unsigned int i; - - /* General initialization */ - ne2k->port = port; - ne2k->data_port = ne2k->port + NE2K_DATA; - ne2k->irq = irq; - ne2k->probed = false; - ne2k->up = false; - - ne2k_init(ne2k); - - /* Check if the DP8390 is really there */ - uint8_t val = pio_read_8(ne2k->port + DP_CR); - if ((val & (CR_STP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT)) - return EXDEV; - - /* Disable the receiver and init TCR and DCR */ - pio_write_8(ne2k->port + DP_RCR, RCR_MON); - pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); - pio_write_8(ne2k->port + DP_DCR, DCR_WORDWIDE | DCR_8BYTES | DCR_BMS); - - /* Setup a transfer to get the MAC address */ - pio_write_8(ne2k->port + DP_RBCR0, ETH_ADDR << 1); - pio_write_8(ne2k->port + DP_RBCR1, 0); - pio_write_8(ne2k->port + DP_RSAR0, 0); - pio_write_8(ne2k->port + DP_RSAR1, 0); - pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); - - for (i = 0; i < ETH_ADDR; i++) - ne2k->mac[i] = pio_read_16(ne2k->data_port); - - ne2k->probed = true; - return EOK; -} - -/** Start the network interface. - * - * @param[in,out] ne2k Network interface structure. - * - * @return EOK on success. - * @return EXDEV if the network interface is disabled. - * - */ -int ne2k_up(ne2k_t *ne2k) -{ - if (!ne2k->probed) - return EXDEV; - - ne2k_init(ne2k); - - /* - * Setup send queue. Use the first - * SQ_PAGES of NE2000 memory for the send - * buffer. - */ - ne2k->sq.dirty = false; - ne2k->sq.page = NE2K_START / DP_PAGE; - fibril_mutex_initialize(&ne2k->sq_mutex); - fibril_condvar_initialize(&ne2k->sq_cv); - - /* - * Setup receive ring buffer. Use all the rest - * of the NE2000 memory (except the first SQ_PAGES - * reserved for the send buffer) for the receive - * ring buffer. - */ - ne2k->start_page = ne2k->sq.page + SQ_PAGES; - ne2k->stop_page = ne2k->sq.page + NE2K_SIZE / DP_PAGE; - - /* - * Initialization of the DP8390 following the mandatory procedure - * in reference manual ("DP8390D/NS32490D NIC Network Interface - * Controller", National Semiconductor, July 1995, Page 29). - */ - - /* Step 1: */ - pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STP | CR_DM_ABORT); - - /* Step 2: */ - pio_write_8(ne2k->port + DP_DCR, DCR_WORDWIDE | DCR_8BYTES | DCR_BMS); - - /* Step 3: */ - pio_write_8(ne2k->port + DP_RBCR0, 0); - pio_write_8(ne2k->port + DP_RBCR1, 0); - - /* Step 4: */ - pio_write_8(ne2k->port + DP_RCR, RCR_AB); - - /* Step 5: */ - pio_write_8(ne2k->port + DP_TCR, TCR_INTERNAL); - - /* Step 6: */ - pio_write_8(ne2k->port + DP_BNRY, ne2k->start_page); - pio_write_8(ne2k->port + DP_PSTART, ne2k->start_page); - pio_write_8(ne2k->port + DP_PSTOP, ne2k->stop_page); - - /* Step 7: */ - pio_write_8(ne2k->port + DP_ISR, 0xff); - - /* Step 8: */ - pio_write_8(ne2k->port + DP_IMR, - IMR_PRXE | IMR_PTXE | IMR_RXEE | IMR_TXEE | IMR_OVWE | IMR_CNTE); - - /* Step 9: */ - pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_DM_ABORT | CR_STP); - - pio_write_8(ne2k->port + DP_PAR0, ne2k->mac[0]); - pio_write_8(ne2k->port + DP_PAR1, ne2k->mac[1]); - pio_write_8(ne2k->port + DP_PAR2, ne2k->mac[2]); - pio_write_8(ne2k->port + DP_PAR3, ne2k->mac[3]); - pio_write_8(ne2k->port + DP_PAR4, ne2k->mac[4]); - pio_write_8(ne2k->port + DP_PAR5, ne2k->mac[5]); - - pio_write_8(ne2k->port + DP_MAR0, 0xff); - pio_write_8(ne2k->port + DP_MAR1, 0xff); - pio_write_8(ne2k->port + DP_MAR2, 0xff); - pio_write_8(ne2k->port + DP_MAR3, 0xff); - pio_write_8(ne2k->port + DP_MAR4, 0xff); - pio_write_8(ne2k->port + DP_MAR5, 0xff); - pio_write_8(ne2k->port + DP_MAR6, 0xff); - pio_write_8(ne2k->port + DP_MAR7, 0xff); - - pio_write_8(ne2k->port + DP_CURR, ne2k->start_page + 1); - - /* Step 10: */ - pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STA); - - /* Step 11: */ - pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); - - /* Reset counters by reading */ - pio_read_8(ne2k->port + DP_CNTR0); - pio_read_8(ne2k->port + DP_CNTR1); - pio_read_8(ne2k->port + DP_CNTR2); - - /* Finish the initialization */ - ne2k->up = true; - return EOK; -} - -/** Stop the network interface. - * - * @param[in,out] ne2k Network interface structure. - * - */ -void ne2k_down(ne2k_t *ne2k) -{ - if ((ne2k->probed) && (ne2k->up)) { - pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); - ne2k_init(ne2k); - ne2k->up = false; - } -} - -/** Send a frame. - * - * @param[in,out] ne2k Network interface structure. - * @param[in] packet Frame to be sent. - * - */ -void ne2k_send(ne2k_t *ne2k, packet_t *packet) -{ - assert(ne2k->probed); - assert(ne2k->up); - - fibril_mutex_lock(&ne2k->sq_mutex); - - while (ne2k->sq.dirty) - fibril_condvar_wait(&ne2k->sq_cv, &ne2k->sq_mutex); - - void *buf = packet_get_data(packet); - size_t size = packet_get_data_length(packet); - - if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) { - fibril_mutex_unlock(&ne2k->sq_mutex); - fprintf(stderr, "%s: Frame dropped (invalid size %zu bytes)\n", - NAME, size); - return; - } - - /* Upload the frame to the ethernet card */ - ne2k_upload(ne2k, buf, ne2k->sq.page * DP_PAGE, size); - ne2k->sq.dirty = true; - ne2k->sq.size = size; - - /* Initialize the transfer */ - pio_write_8(ne2k->port + DP_TPSR, ne2k->sq.page); - pio_write_8(ne2k->port + DP_TBCR0, size & 0xff); - pio_write_8(ne2k->port + DP_TBCR1, (size >> 8) & 0xff); - pio_write_8(ne2k->port + DP_CR, CR_TXP | CR_STA); - - fibril_mutex_unlock(&ne2k->sq_mutex); -} - -static void ne2k_reset(ne2k_t *ne2k) -{ - unsigned int i; - - /* Stop the chip */ - pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); - pio_write_8(ne2k->port + DP_RBCR0, 0); - pio_write_8(ne2k->port + DP_RBCR1, 0); - - for (i = 0; i < NE2K_RETRY; i++) { - if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RST) != 0) - break; - } - - pio_write_8(ne2k->port + DP_TCR, TCR_1EXTERNAL | TCR_OFST); - pio_write_8(ne2k->port + DP_CR, CR_STA | CR_DM_ABORT); - pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); - - /* Acknowledge the ISR_RDC (remote DMA) interrupt */ - for (i = 0; i < NE2K_RETRY; i++) { - if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RDC) != 0) - break; - } - - uint8_t val = pio_read_8(ne2k->port + DP_ISR); - pio_write_8(ne2k->port + DP_ISR, val & ~ISR_RDC); - - /* - * Reset the transmit ring. If we were transmitting a frame, - * we pretend that the packet is processed. Higher layers will - * retransmit if the packet wasn't actually sent. - */ - fibril_mutex_lock(&ne2k->sq_mutex); - ne2k->sq.dirty = false; - fibril_mutex_unlock(&ne2k->sq_mutex); -} - -static frame_t *ne2k_receive_frame(ne2k_t *ne2k, uint8_t page, size_t length) -{ - frame_t *frame = (frame_t *) malloc(sizeof(frame_t)); - if (frame == NULL) - return NULL; - - link_initialize(&frame->link); - - frame->packet = netif_packet_get_1(length); - if (frame->packet == NULL) { - free(frame); - return NULL; - } - - void *buf = packet_suffix(frame->packet, length); - bzero(buf, length); - uint8_t last = page + length / DP_PAGE; - - if (last >= ne2k->stop_page) { - size_t left = (ne2k->stop_page - page) * DP_PAGE - - sizeof(recv_header_t); - - ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t), - left); - ne2k_download(ne2k, buf + left, ne2k->start_page * DP_PAGE, - length - left); - } else - ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t), - length); - - ne2k->stats.receive_packets++; - return frame; -} - -static list_t *ne2k_receive(ne2k_t *ne2k) -{ - /* - * Allocate memory for the list of received frames. - * If the allocation fails here we still receive the - * frames from the network, but they will be lost. - */ - list_t *frames = (list_t *) malloc(sizeof(list_t)); - if (frames != NULL) - list_initialize(frames); - - while (true) { - uint8_t boundary = pio_read_8(ne2k->port + DP_BNRY) + 1; - - if (boundary == ne2k->stop_page) - boundary = ne2k->start_page; - - pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_STA); - uint8_t current = pio_read_8(ne2k->port + DP_CURR); - pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STA); - - if (current == boundary) - /* No more frames to process */ - break; - - recv_header_t header; - size_t size = sizeof(header); - size_t offset = boundary * DP_PAGE; - - /* Get the frame header */ - pio_write_8(ne2k->port + DP_RBCR0, size & 0xff); - pio_write_8(ne2k->port + DP_RBCR1, (size >> 8) & 0xff); - pio_write_8(ne2k->port + DP_RSAR0, offset & 0xff); - pio_write_8(ne2k->port + DP_RSAR1, (offset >> 8) & 0xff); - pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); - - pio_read_buf_16(ne2k->data_port, (void *) &header, size); - - size_t length = - (((size_t) header.rbcl) | (((size_t) header.rbch) << 8)) - size; - uint8_t next = header.next; - - if ((length < ETH_MIN_PACK_SIZE) - || (length > ETH_MAX_PACK_SIZE_TAGGED)) { - fprintf(stderr, "%s: Rant frame (%zu bytes)\n", NAME, length); - next = current; - } else if ((header.next < ne2k->start_page) - || (header.next > ne2k->stop_page)) { - fprintf(stderr, "%s: Malformed next frame %u\n", NAME, - header.next); - next = current; - } else if (header.status & RSR_FO) { - /* - * This is very serious, so we issue a warning and - * reset the buffers. - */ - fprintf(stderr, "%s: FIFO overrun\n", NAME); - ne2k->overruns++; - next = current; - } else if ((header.status & RSR_PRX) && (ne2k->up)) { - if (frames != NULL) { - frame_t *frame = ne2k_receive_frame(ne2k, boundary, length); - if (frame != NULL) - list_append(&frame->link, frames); - } - } - - /* - * Update the boundary pointer - * to the value of the page - * prior to the next packet to - * be processed. - */ - if (next == ne2k->start_page) - next = ne2k->stop_page - 1; - else - next--; - - pio_write_8(ne2k->port + DP_BNRY, next); - } - - return frames; -} - -list_t *ne2k_interrupt(ne2k_t *ne2k, uint8_t isr, uint8_t tsr) -{ - /* List of received frames */ - list_t *frames = NULL; - - if (isr & (ISR_PTX | ISR_TXE)) { - if (isr & ISR_TXE) - ne2k->stats.send_errors++; - else { - if (tsr & TSR_PTX) - ne2k->stats.send_packets++; - - if (tsr & TSR_COL) - ne2k->stats.collisions++; - - if (tsr & TSR_ABT) - ne2k->stats.send_aborted_errors++; - - if (tsr & TSR_CRS) - ne2k->stats.send_carrier_errors++; - - if (tsr & TSR_FU) { - ne2k->underruns++; - if (ne2k->underruns < NE2K_ERL) - fprintf(stderr, "%s: FIFO underrun\n", NAME); - } - - if (tsr & TSR_CDH) { - ne2k->stats.send_heartbeat_errors++; - if (ne2k->stats.send_heartbeat_errors < NE2K_ERL) - fprintf(stderr, "%s: CD heartbeat failure\n", NAME); - } - - if (tsr & TSR_OWC) - ne2k->stats.send_window_errors++; - } - - fibril_mutex_lock(&ne2k->sq_mutex); - - if (ne2k->sq.dirty) { - /* Prepare the buffer for next packet */ - ne2k->sq.dirty = false; - ne2k->sq.size = 0; - - /* Signal a next frame to be sent */ - fibril_condvar_broadcast(&ne2k->sq_cv); - } else { - ne2k->misses++; - if (ne2k->misses < NE2K_ERL) - fprintf(stderr, "%s: Spurious PTX interrupt\n", NAME); - } - - fibril_mutex_unlock(&ne2k->sq_mutex); - } - - if (isr & ISR_RXE) - ne2k->stats.receive_errors++; - - if (isr & ISR_CNT) { - ne2k->stats.receive_crc_errors += - pio_read_8(ne2k->port + DP_CNTR0); - ne2k->stats.receive_frame_errors += - pio_read_8(ne2k->port + DP_CNTR1); - ne2k->stats.receive_missed_errors += - pio_read_8(ne2k->port + DP_CNTR2); - } - - if (isr & ISR_PRX) - frames = ne2k_receive(ne2k); - - if (isr & ISR_RST) { - /* - * The chip is stopped, and all arrived - * frames are delivered. - */ - ne2k_reset(ne2k); - } - - /* Unmask interrupts to be processed in the next round */ - pio_write_8(ne2k->port + DP_IMR, - IMR_PRXE | IMR_PTXE | IMR_RXEE | IMR_TXEE | IMR_OVWE | IMR_CNTE); - - return frames; -} - -/** @} - */ Index: pace/srv/hw/netif/ne2000/dp8390.h =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,248 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * Copyright (c) 2011 Martin Decky - * 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. - */ - -/* - * This code is based upon the NE2000 driver for MINIX, - * distributed according to a BSD-style license. - * - * Copyright (c) 1987, 1997, 2006 Vrije Universiteit - * Copyright (c) 1992, 1994 Philip Homburg - * Copyright (c) 1996 G. Falzoni - * - */ - -/** @addtogroup ne2000 - * @{ - */ - -/** @file - * DP8390 network interface definitions. - */ - -#ifndef __NET_NETIF_DP8390_H__ -#define __NET_NETIF_DP8390_H__ - -#include -#include -#include -#include - -/** Module name */ -#define NAME "ne2000" - -/** Input/output size */ -#define NE2K_IO_SIZE 0x0020 - -/** Ethernet address length */ -#define ETH_ADDR 6 - -/* National Semiconductor DP8390 Network Interface Controller. */ - -/** Page 0, for reading */ -#define DP_CR 0x00 /**< Command Register */ -#define DP_CLDA0 0x01 /**< Current Local DMA Address 0 */ -#define DP_CLDA1 0x02 /**< Current Local DMA Address 1 */ -#define DP_BNRY 0x03 /**< Boundary Pointer */ -#define DP_TSR 0x04 /**< Transmit Status Register */ -#define DP_NCR 0x05 /**< Number of Collisions Register */ -#define DP_FIFO 0x06 /**< FIFO */ -#define DP_ISR 0x07 /**< Interrupt Status Register */ -#define DP_CRDA0 0x08 /**< Current Remote DMA Address 0 */ -#define DP_CRDA1 0x09 /**< Current Remote DMA Address 1 */ -#define DP_RSR 0x0c /**< Receive Status Register */ -#define DP_CNTR0 0x0d /**< Tally Counter 0 */ -#define DP_CNTR1 0x0e /**< Tally Counter 1 */ -#define DP_CNTR2 0x0f /**< Tally Counter 2 */ - -/** Page 0, for writing */ -#define DP_PSTART 0x01 /**< Page Start Register*/ -#define DP_PSTOP 0x02 /**< Page Stop Register */ -#define DP_TPSR 0x04 /**< Transmit Page Start Register */ -#define DP_TBCR0 0x05 /**< Transmit Byte Count Register 0 */ -#define DP_TBCR1 0x06 /**< Transmit Byte Count Register 1 */ -#define DP_RSAR0 0x08 /**< Remote Start Address Register 0 */ -#define DP_RSAR1 0x09 /**< Remote Start Address Register 1 */ -#define DP_RBCR0 0x0a /**< Remote Byte Count Register 0 */ -#define DP_RBCR1 0x0b /**< Remote Byte Count Register 1 */ -#define DP_RCR 0x0c /**< Receive Configuration Register */ -#define DP_TCR 0x0d /**< Transmit Configuration Register */ -#define DP_DCR 0x0e /**< Data Configuration Register */ -#define DP_IMR 0x0f /**< Interrupt Mask Register */ - -/** Page 1, read/write */ -#define DP_PAR0 0x01 /**< Physical Address Register 0 */ -#define DP_PAR1 0x02 /**< Physical Address Register 1 */ -#define DP_PAR2 0x03 /**< Physical Address Register 2 */ -#define DP_PAR3 0x04 /**< Physical Address Register 3 */ -#define DP_PAR4 0x05 /**< Physical Address Register 4 */ -#define DP_PAR5 0x06 /**< Physical Address Register 5 */ -#define DP_CURR 0x07 /**< Current Page Register */ -#define DP_MAR0 0x08 /**< Multicast Address Register 0 */ -#define DP_MAR1 0x09 /**< Multicast Address Register 1 */ -#define DP_MAR2 0x0a /**< Multicast Address Register 2 */ -#define DP_MAR3 0x0b /**< Multicast Address Register 3 */ -#define DP_MAR4 0x0c /**< Multicast Address Register 4 */ -#define DP_MAR5 0x0d /**< Multicast Address Register 5 */ -#define DP_MAR6 0x0e /**< Multicast Address Register 6 */ -#define DP_MAR7 0x0f /**< Multicast Address Register 7 */ - -/* Bits in Command Register */ -#define CR_STP 0x01 /**< Stop (software reset) */ -#define CR_STA 0x02 /**< Start (activate NIC) */ -#define CR_TXP 0x04 /**< Transmit Packet */ -#define CR_DMA 0x38 /**< Mask for DMA control */ -#define CR_DM_NOP 0x00 /**< DMA: No Operation */ -#define CR_DM_RR 0x08 /**< DMA: Remote Read */ -#define CR_DM_RW 0x10 /**< DMA: Remote Write */ -#define CR_DM_SP 0x18 /**< DMA: Send Packet */ -#define CR_DM_ABORT 0x20 /**< DMA: Abort Remote DMA Operation */ -#define CR_PS 0xc0 /**< Mask for Page Select */ -#define CR_PS_P0 0x00 /**< Register Page 0 */ -#define CR_PS_P1 0x40 /**< Register Page 1 */ -#define CR_PS_P2 0x80 /**< Register Page 2 */ -#define CR_PS_T1 0xc0 /**< Test Mode Register Map */ - -/* Bits in Interrupt State Register */ -#define ISR_PRX 0x01 /**< Packet Received with no errors */ -#define ISR_PTX 0x02 /**< Packet Transmitted with no errors */ -#define ISR_RXE 0x04 /**< Receive Error */ -#define ISR_TXE 0x08 /**< Transmit Error */ -#define ISR_OVW 0x10 /**< Overwrite Warning */ -#define ISR_CNT 0x20 /**< Counter Overflow */ -#define ISR_RDC 0x40 /**< Remote DMA Complete */ -#define ISR_RST 0x80 /**< Reset Status */ - -/* Bits in Interrupt Mask Register */ -#define IMR_PRXE 0x01 /**< Packet Received Interrupt Enable */ -#define IMR_PTXE 0x02 /**< Packet Transmitted Interrupt Enable */ -#define IMR_RXEE 0x04 /**< Receive Error Interrupt Enable */ -#define IMR_TXEE 0x08 /**< Transmit Error Interrupt Enable */ -#define IMR_OVWE 0x10 /**< Overwrite Warning Interrupt Enable */ -#define IMR_CNTE 0x20 /**< Counter Overflow Interrupt Enable */ -#define IMR_RDCE 0x40 /**< DMA Complete Interrupt Enable */ - -/* Bits in Data Configuration Register */ -#define DCR_WTS 0x01 /**< Word Transfer Select */ -#define DCR_BYTEWIDE 0x00 /**< WTS: byte wide transfers */ -#define DCR_WORDWIDE 0x01 /**< WTS: word wide transfers */ -#define DCR_BOS 0x02 /**< Byte Order Select */ -#define DCR_LTLENDIAN 0x00 /**< BOS: Little Endian */ -#define DCR_BIGENDIAN 0x02 /**< BOS: Big Endian */ -#define DCR_LAS 0x04 /**< Long Address Select */ -#define DCR_BMS 0x08 /**< Burst Mode Select */ -#define DCR_AR 0x10 /**< Autoinitialize Remote */ -#define DCR_FTS 0x60 /**< Fifo Threshold Select */ -#define DCR_2BYTES 0x00 /**< 2 bytes */ -#define DCR_4BYTES 0x40 /**< 4 bytes */ -#define DCR_8BYTES 0x20 /**< 8 bytes */ -#define DCR_12BYTES 0x60 /**< 12 bytes */ - -/* Bits in Transmit Configuration Register */ -#define TCR_CRC 0x01 /**< Inhibit CRC */ -#define TCR_ELC 0x06 /**< Encoded Loopback Control */ -#define TCR_NORMAL 0x00 /**< ELC: Normal Operation */ -#define TCR_INTERNAL 0x02 /**< ELC: Internal Loopback */ -#define TCR_0EXTERNAL 0x04 /**< ELC: External Loopback LPBK=0 */ -#define TCR_1EXTERNAL 0x06 /**< ELC: External Loopback LPBK=1 */ -#define TCR_ATD 0x08 /**< Auto Transmit Disable */ -#define TCR_OFST 0x10 /**< Collision Offset Enable (be nice) */ - -/* Bits in Interrupt Status Register */ -#define TSR_PTX 0x01 /**< Packet Transmitted (without error) */ -#define TSR_DFR 0x02 /**< Transmit Deferred (reserved) */ -#define TSR_COL 0x04 /**< Transmit Collided */ -#define TSR_ABT 0x08 /**< Transmit Aborted */ -#define TSR_CRS 0x10 /**< Carrier Sense Lost */ -#define TSR_FU 0x20 /**< FIFO Underrun */ -#define TSR_CDH 0x40 /**< CD Heartbeat */ -#define TSR_OWC 0x80 /**< Out of Window Collision */ - -/* Bits in Receive Configuration Register */ -#define RCR_SEP 0x01 /**< Save Errored Packets */ -#define RCR_AR 0x02 /**< Accept Runt Packets */ -#define RCR_AB 0x04 /**< Accept Broadcast */ -#define RCR_AM 0x08 /**< Accept Multicast */ -#define RCR_PRO 0x10 /**< Physical Promiscuous */ -#define RCR_MON 0x20 /**< Monitor Mode */ - -/* Bits in Receive Status Register */ -#define RSR_PRX 0x01 /**< Packet Received Intact */ -#define RSR_CRC 0x02 /**< CRC Error */ -#define RSR_FAE 0x04 /**< Frame Alignment Error */ -#define RSR_FO 0x08 /**< FIFO Overrun */ -#define RSR_MPA 0x10 /**< Missed Packet */ -#define RSR_PHY 0x20 /**< Multicast Address Match */ -#define RSR_DIS 0x40 /**< Receiver Disabled */ -#define RSR_DFR 0x80 /**< In later manuals: Deferring */ - -typedef struct { - /* Device configuration */ - void *port; - void *data_port; - int irq; - uint8_t mac[ETH_ADDR]; - - uint8_t start_page; /**< Ring buffer start page */ - uint8_t stop_page; /**< Ring buffer stop page */ - - /* Send queue */ - struct { - bool dirty; /**< Buffer contains a packet */ - size_t size; /**< Packet size */ - uint8_t page; /**< Starting page of the buffer */ - } sq; - fibril_mutex_t sq_mutex; - fibril_condvar_t sq_cv; - - /* Driver run-time variables */ - bool probed; - bool up; - - /* Device statistics */ - device_stats_t stats; - uint64_t misses; /**< Receive frame misses */ - uint64_t underruns; /**< FIFO underruns */ - uint64_t overruns; /**< FIFO overruns */ -} ne2k_t; - -typedef struct { - link_t link; - packet_t *packet; -} frame_t; - -extern int ne2k_probe(ne2k_t *, void *, int); -extern int ne2k_up(ne2k_t *); -extern void ne2k_down(ne2k_t *); -extern void ne2k_send(ne2k_t *, packet_t *); -extern list_t *ne2k_interrupt(ne2k_t *, uint8_t, uint8_t); - -#endif - -/** @} - */ Index: pace/srv/hw/netif/ne2000/ne2000.c =================================================================== --- uspace/srv/hw/netif/ne2000/ne2000.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,410 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * Copyright (c) 2011 Martin Decky - * 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. - */ - -/** @addtogroup ne2000 - * @{ - */ - -/** @file - * NE2000 network interface implementation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "dp8390.h" - -/** Return the device from the interrupt call. - * - * @param[in] call The interrupt call. - * - */ -#define IRQ_GET_DEVICE(call) ((device_id_t) IPC_GET_IMETHOD(call)) - -/** Return the ISR from the interrupt call. - * - * @param[in] call The interrupt call. - * - */ -#define IRQ_GET_ISR(call) ((int) IPC_GET_ARG2(call)) - -/** Return the TSR from the interrupt call. - * - * @param[in] call The interrupt call. - * - */ -#define IRQ_GET_TSR(call) ((int) IPC_GET_ARG3(call)) - -static bool irc_service = false; -static async_sess_t *irc_sess = NULL; - -/** NE2000 kernel interrupt command sequence. - * - */ -static irq_cmd_t ne2k_cmds[] = { - { - /* Read Interrupt Status Register */ - .cmd = CMD_PIO_READ_8, - .addr = NULL, - .dstarg = 2 - }, - { - /* Mask supported interrupt causes */ - .cmd = CMD_BTEST, - .value = (ISR_PRX | ISR_PTX | ISR_RXE | ISR_TXE | ISR_OVW | - ISR_CNT | ISR_RDC), - .srcarg = 2, - .dstarg = 3, - }, - { - /* Predicate for accepting the interrupt */ - .cmd = CMD_PREDICATE, - .value = 4, - .srcarg = 3 - }, - { - /* - * Mask future interrupts via - * Interrupt Mask Register - */ - .cmd = CMD_PIO_WRITE_8, - .addr = NULL, - .value = 0 - }, - { - /* Acknowledge the current interrupt */ - .cmd = CMD_PIO_WRITE_A_8, - .addr = NULL, - .srcarg = 3 - }, - { - /* Read Transmit Status Register */ - .cmd = CMD_PIO_READ_8, - .addr = NULL, - .dstarg = 3 - }, - { - .cmd = CMD_ACCEPT - } -}; - -/** NE2000 kernel interrupt code. - * - */ -static irq_code_t ne2k_code = { - sizeof(ne2k_cmds) / sizeof(irq_cmd_t), - ne2k_cmds -}; - -/** Handle the interrupt notification. - * - * This is the interrupt notification function. It is quarantied - * that there is only a single instance of this notification - * function running at one time until the return from the - * ne2k_interrupt() function (where the interrupts are unmasked - * again). - * - * @param[in] iid Interrupt notification identifier. - * @param[in] call Interrupt notification. - * - */ -static void irq_handler(ipc_callid_t iid, ipc_call_t *call) -{ - device_id_t device_id = IRQ_GET_DEVICE(*call); - netif_device_t *device; - async_sess_t *nil_sess; - ne2k_t *ne2k; - - fibril_rwlock_read_lock(&netif_globals.lock); - - nil_sess = netif_globals.nil_sess; - - if (find_device(device_id, &device) == EOK) - ne2k = (ne2k_t *) device->specific; - else - ne2k = NULL; - - fibril_rwlock_read_unlock(&netif_globals.lock); - - if (ne2k != NULL) { - list_t *frames = - ne2k_interrupt(ne2k, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call)); - - if (frames != NULL) { - while (!list_empty(frames)) { - frame_t *frame = list_get_instance( - list_first(frames), frame_t, link); - - list_remove(&frame->link); - nil_received_msg(nil_sess, device_id, frame->packet, - SERVICE_NONE); - free(frame); - } - - free(frames); - } - } -} - -/** Change the network interface state. - * - * @param[in,out] device Network interface. - * @param[in] state New state. - * - */ -static void change_state(netif_device_t *device, device_state_t state) -{ - if (device->state != state) { - device->state = state; - - const char *desc; - switch (state) { - case NETIF_ACTIVE: - desc = "active"; - break; - case NETIF_STOPPED: - desc = "stopped"; - break; - default: - desc = "unknown"; - } - - printf("%s: State changed to %s\n", NAME, desc); - } -} - -int netif_specific_message(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, size_t *count) -{ - return ENOTSUP; -} - -int netif_get_device_stats(device_id_t device_id, device_stats_t *stats) -{ - if (!stats) - return EBADMEM; - - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) - return rc; - - ne2k_t *ne2k = (ne2k_t *) device->specific; - - memcpy(stats, &ne2k->stats, sizeof(device_stats_t)); - return EOK; -} - -int netif_get_addr_message(device_id_t device_id, measured_string_t *address) -{ - if (!address) - return EBADMEM; - - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) - return rc; - - ne2k_t *ne2k = (ne2k_t *) device->specific; - - address->value = ne2k->mac; - address->length = ETH_ADDR; - return EOK; -} - -int netif_probe_message(device_id_t device_id, int irq, void *io) -{ - netif_device_t *device = - (netif_device_t *) malloc(sizeof(netif_device_t)); - if (!device) - return ENOMEM; - - ne2k_t *ne2k = (ne2k_t *) malloc(sizeof(ne2k_t)); - if (!ne2k) { - free(device); - return ENOMEM; - } - - void *port; - int rc = pio_enable((void *) io, NE2K_IO_SIZE, &port); - if (rc != EOK) { - free(ne2k); - free(device); - return rc; - } - - bzero(device, sizeof(netif_device_t)); - bzero(ne2k, sizeof(ne2k_t)); - - device->device_id = device_id; - device->specific = (void *) ne2k; - device->state = NETIF_STOPPED; - - rc = ne2k_probe(ne2k, port, irq); - if (rc != EOK) { - printf("%s: No ethernet card found at I/O address %p\n", - NAME, port); - free(ne2k); - free(device); - return rc; - } - - rc = netif_device_map_add(&netif_globals.device_map, device->device_id, device); - if (rc != EOK) { - free(ne2k); - free(device); - return rc; - } - - printf("%s: Ethernet card at I/O address %p, IRQ %d, MAC ", - NAME, port, irq); - - unsigned int i; - for (i = 0; i < ETH_ADDR; i++) - printf("%02x%c", ne2k->mac[i], i < 5 ? ':' : '\n'); - - return EOK; -} - -int netif_start_message(netif_device_t *device) -{ - if (device->state != NETIF_ACTIVE) { - ne2k_t *ne2k = (ne2k_t *) device->specific; - - ne2k_cmds[0].addr = ne2k->port + DP_ISR; - ne2k_cmds[3].addr = ne2k->port + DP_IMR; - ne2k_cmds[4].addr = ne2k_cmds[0].addr; - ne2k_cmds[5].addr = ne2k->port + DP_TSR; - - int rc = register_irq(ne2k->irq, device->device_id, - device->device_id, &ne2k_code); - if (rc != EOK) - return rc; - - rc = ne2k_up(ne2k); - if (rc != EOK) { - unregister_irq(ne2k->irq, device->device_id); - return rc; - } - - change_state(device, NETIF_ACTIVE); - - if (irc_service) { - async_exch_t *exch = async_exchange_begin(irc_sess); - async_msg_1(exch, IRC_ENABLE_INTERRUPT, ne2k->irq); - async_exchange_end(exch); - } - } - - return device->state; -} - -int netif_stop_message(netif_device_t *device) -{ - if (device->state != NETIF_STOPPED) { - ne2k_t *ne2k = (ne2k_t *) device->specific; - - ne2k_down(ne2k); - unregister_irq(ne2k->irq, device->device_id); - change_state(device, NETIF_STOPPED); - } - - return device->state; -} - -int netif_send_message(device_id_t device_id, packet_t *packet, - services_t sender) -{ - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) - return rc; - - if (device->state != NETIF_ACTIVE) { - netif_pq_release(packet_get_id(packet)); - return EFORWARD; - } - - ne2k_t *ne2k = (ne2k_t *) device->specific; - - /* - * Process the packet queue - */ - - do { - packet_t *next = pq_detach(packet); - ne2k_send(ne2k, packet); - netif_pq_release(packet_get_id(packet)); - packet = next; - } while (packet); - - return EOK; -} - -int netif_initialize(void) -{ - sysarg_t apic; - sysarg_t i8259; - - if (((sysinfo_get_value("apic", &apic) == EOK) && (apic)) - || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) - irc_service = true; - - if (irc_service) { - while (!irc_sess) - irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE, - SERVICE_IRC, 0, 0); - } - - async_set_interrupt_received(irq_handler); - - return service_register(SERVICE_NE2000); -} - -int main(int argc, char *argv[]) -{ - /* Start the module */ - return netif_module_start(); -} - -/** @} - */ Index: uspace/srv/loc/loc.c =================================================================== --- uspace/srv/loc/loc.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/loc/loc.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1288,6 +1288,8 @@ cat = category_new("virtual"); categ_dir_add_cat(&cdir, cat); - - + + cat = category_new("nic"); + categ_dir_add_cat(&cdir, cat); + return true; } Index: pace/srv/net/cfg/lo =================================================================== --- uspace/srv/net/cfg/lo (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,13 +1,0 @@ -# loopback configuration - -NAME=lo - -NETIF=lo -NIL=nildummy -IL=ip - -IP_CONFIG=static -IP_ADDR=127.0.0.1 -IP_NETMASK=255.0.0.0 - -MTU=15535 Index: uspace/srv/net/cfg/lo.nic =================================================================== --- uspace/srv/net/cfg/lo.nic (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/srv/net/cfg/lo.nic (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,13 @@ +# loopback configuration + +NAME=lo + +HWPATH=/virt/lo/port0 +NIL=nildummy +IL=ip + +IP_CONFIG=static +IP_ADDR=127.0.0.1 +IP_NETMASK=255.0.0.0 + +MTU=15535 Index: pace/srv/net/cfg/ne2k =================================================================== --- uspace/srv/net/cfg/ne2k (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,24 +1,0 @@ -# DP8390 (NE2k) configuration - -NAME=ne2k - -NETIF=ne2000 -NIL=eth -IL=ip - -IRQ=5 -IO=300 - -# 8023_2_LSAP, 8023_2_SNAP -ETH_MODE=DIX -ETH_DUMMY=no - -IP_CONFIG=static -IP_ADDR=10.0.2.15 -IP_ROUTING=yes -IP_NETMASK=255.255.255.0 -IP_BROADCAST=10.0.2.255 -IP_GATEWAY=10.0.2.2 -ARP=arp - -MTU=1500 Index: uspace/srv/net/cfg/ne2k.nic =================================================================== --- uspace/srv/net/cfg/ne2k.nic (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/srv/net/cfg/ne2k.nic (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,21 @@ +# NE2000 configuration + +NAME=ne2k + +HWPATH=/hw/pci0/00:01.0/ne2k/port0 +NIL=eth +IL=ip + +# 8023_2_LSAP, 8023_2_SNAP +ETH_MODE=DIX +ETH_DUMMY=no + +IP_CONFIG=static +IP_ADDR=10.0.2.15 +IP_ROUTING=yes +IP_NETMASK=255.255.255.240 +IP_BROADCAST=10.0.2.255 +IP_GATEWAY=10.0.2.2 +ARP=arp + +MTU=1500 Index: pace/srv/net/documentation.txt =================================================================== --- uspace/srv/net/documentation.txt (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,201 +1,0 @@ -/** - -\mainpage Networking and TCP/IP Stack for HelenOS system - -\section introduction Introduction - -

-For the microkernel HelenOS a completely new networking stack was designed. -The networking stack was intended to implement current basic standards of the TCP/IP Stack. -Only the minimalistic functionality allowing the stack to function was to be implemented. -The networking stack is written in C. -

-

-Please see -

-
    -
  • \ref build
    • -
  • \ref software
    • -
  • \ref running
    • -
  • \ref testing
    • -
- -\page build Build from sources - -

-To compile the HelenOS from sources (the cross compilers from the build/ directory are recommended): -

-
    -
  1. change the working directory to the HelenOS source directory
    2. -
  2. run # make config
    3. -
  3. check/change the configuration
    4. -
  4. save and exit the configuration tool
    5. -
  5. run # make
    6. -
-

-The image.iso should be created on success. -

- -\page running Running the HelenOS with networking - -\section netstart Starting the networking - -

-After starting the HelenOS boot image in Qemu, the command line appears. -To run Qemu a script contrib/conf/qemu.sh for Linux or contrib/conf/qemu.bat for Windows in the HelenOS source directory can be used. -The provided scripts set the needed arguments: -
-vga std -M isapc -net nic,model=ne2k_isa -net user -redir udp:8080::8080 -redir udp:8081::8081 -boot d -cdrom image.iso
-Additional arguments may be specified on the command line, they override these set. -

- -

-The networking stack is started and initialized by running a command -
# netstart
-The networking stack is then started and configured network interfaces are enabled. -The current configuration is printed out. -Since that networking applications can be run using the command line as well. -

- -\section network Qemu network - -

-In the common mode Qemu creates a simple network with a gateway and settles the guest system in. -The network is 10.0.2.*, the gateway's address 10.0.2.2 and the guest system has 10.0.2.15. -%Even this simple setting was a bit hard to find in the documentation. -Therefore a static configuration is possible and no additional DHCP nor BOOTP implementations are necessary. -On the other hand the guest system is behind a firewall. -Qemu may be configured to forward some ports to the guest system and allows all outgoing traffic except ICMP and ARP protocols, so you can ping only the gateway. -

- -\section applications Applications - -

-A few networking applications are located in the app/ directory. -Common functions for parsing command line arguments and printing textual networking error messages are located in that directory as well. -The networking applications should be built with the libsocket library located in the socket/libsocket.a file. -They can use functions and definitions from the include/socket.h header file which contains socket API and further includes: -

-
    -
  • include/byteorder.h containing byte order manipulation,
    • -
  • include/in.h containing IPv4 socket address structure,
    • -
  • include/in6.h containing IPv6 socket address structure,
    • -
  • include/inet.h containing socket address structure and parsing functions,
    • -
  • include/socket codes.h containing address and protocol families and socket types and option levels, and
    • -
  • include/socket errno.h containing socket and general error codes.
    • -
- -\page software Software prerequisites - -

-The networking and TCP/IP stack is implemented for the ia32 architecture on top of HelenOS 0.4.1 (Escalopino), the most current stable release of HelenOS. -So far the only one operational network interface supported is in Qemu 0.10.2 and newer. -To run Qemu a script contrib/conf/qemu.sh for Linux or contrib/conf/qemu.bat for Windows in the HelenOS source directory can be used. -The qemu and its libraries have to be installed and in the path. -These scripts set all the necessary parameters -with some ports redirected from the local host to the guest system. -For testing purposes at least a low level communication application is recommended, N.E.T., netcat etc. -

-

-In order to build HelenOS and the networking stack from sources a few tools are -required: -

    -
  • binutils in version 2.19.1,
    • -
  • gcc–core in version 4.3.3 11,
    • -
  • gcc–objc in version 4.3.3, and
    • -
  • gcc–g++ in version 4.3.3.
    • -
-

-All these can be downloaded and installed as cross–compilers on Linux using a script contrib/toolchain.sh in the HelenOS source directory. -In addition rats, a static source code analyzer, and Doxygen, a documentation generator, were used. -All development was tracked in the HelenOS subversion repository. -

- - -\page testing Testing scenarios - -

-The scenarios contain the following shortcuts: -

-
    -
  • g for the quest system, HelenOS in Qemu
    • -
  • h for the host system
    • -
  • n for the NET application
    • -
  • e for echo echo application run in HelenOS
    • -
- -\section scenarios Testing scenarios -
    -
  • UDP -
      -
    1. g #netstart
      2. -
    2. h wine net.exe (->n) (or net.exe)
      3. -
    3. n set 127.0.0.1:8080 address and port, BuiltinUDP protocol
      4. -
    4. n send some data (an ARP will be generated and the original packet gets lost)
      5. -
    5. n send some data (the port is unreachable and the packet is discarded)
      6. -
    6. g #echo -p 8080 -c 3 -v (->e)
      7. -
    7. g prints Listening
      8. -
    8. n send some data
      9. -
    9. e prints received data
      10. -
    10. h prints reply
      11. -
    11. n click disconnect
      12. -
    12. n set :8081 port
      13. -
    13. n send some data
      14. -
    14. n click disconnect
      15. -
    15. n set :8080 port
      16. -
    16. count-1 times: -
        -
      1. n send some data
        2. -
      2. e prints received data
        3. -
      3. h prints reply
        4. -
      -
      17. -
    17. e prints Exiting
      18. -
    18. e quits
      19. -
    19. n send some data (the port is unreachable and the packet is discarded)
      20. -
    -
    • -
  • ICMP echo to 10.0.2.2 -
      -
    1. g #netstart
      2. -
    2. g #ping 10.0.2.2 (->p)
      3. -
    3. g prints ARP request for 10.0.2.2
      4. -
    4. g prints ARP reply from 10.0.2.2
      5. -
    5. p prints timeouted
      6. -
    6. p prints round trip time
      7. -
    7. p prints round trip time
      8. -
    8. p quits
      9. -
    -
    • -
  • ICMP echo to 127.0.0.1 -
      -
    1. g #netstart
      2. -
    2. g #ping 127.0.0.1 (->p)
      3. -
    3. p prints round trip time
      4. -
    4. p prints round trip time
      5. -
    5. p prints round trip time
      6. -
    6. p quits
      7. -
    -
    • -
  • ICMP with no internet on the host system (!) -
      -
    1. g #netstart
      2. -
    2. g #ping 123.123.123.3 (->p)
      3. -
    3. g prints ARP request for 10.0.2.2
      4. -
    4. g prints ARP reply from 10.0.2.2
      5. -
    5. p prints timeouted
      6. -
    6. p prints destination unreachable
      7. -
    7. p prints destination unreachable
      8. -
    8. p quits
      9. -
    -
    • -
- -*/ Index: uspace/srv/net/il/arp/arp.c =================================================================== --- uspace/srv/net/il/arp/arp.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/il/arp/arp.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -174,12 +174,6 @@ count); - if (device) { + if (device) arp_clear_device(device); - if (device->addr_data) - free(device->addr_data); - - if (device->broadcast_data) - free(device->broadcast_data); - } } @@ -190,6 +184,6 @@ } -static int arp_clear_address_req(device_id_t device_id, services_t protocol, - measured_string_t *address) +static int arp_clear_address_req(nic_device_id_t device_id, + services_t protocol, measured_string_t *address) { fibril_mutex_lock(&arp_globals.lock); @@ -218,5 +212,5 @@ } -static int arp_clear_device_req(device_id_t device_id) +static int arp_clear_device_req(nic_device_id_t device_id) { fibril_mutex_lock(&arp_globals.lock); @@ -289,5 +283,5 @@ * */ -static int arp_receive_message(device_id_t device_id, packet_t *packet) +static int arp_receive_message(nic_device_id_t device_id, packet_t *packet) { int rc; @@ -365,5 +359,5 @@ memcpy(src_proto, proto->addr->value, header->protocol_length); - memcpy(src_hw, device->addr->value, + memcpy(src_hw, device->addr, device->packet_dimension.addr_len); memcpy(des_hw, trans->hw_addr->value, @@ -393,5 +387,5 @@ * */ -static int arp_mtu_changed_message(device_id_t device_id, size_t mtu) +static int arp_mtu_changed_message(nic_device_id_t device_id, size_t mtu) { fibril_mutex_lock(&arp_globals.lock); @@ -409,4 +403,36 @@ printf("%s: Device %d changed MTU to %zu\n", NAME, device_id, mtu); + return EOK; +} + +static int arp_addr_changed_message(nic_device_id_t device_id) +{ + uint8_t addr_buffer[NIC_MAX_ADDRESS_LENGTH]; + size_t length; + ipc_callid_t data_callid; + if (!async_data_write_receive(&data_callid, &length)) { + async_answer_0(data_callid, EINVAL); + return EINVAL; + } + if (length > NIC_MAX_ADDRESS_LENGTH) { + async_answer_0(data_callid, ELIMIT); + return ELIMIT; + } + if (async_data_write_finalize(data_callid, addr_buffer, length) != EOK) { + return EINVAL; + } + + fibril_mutex_lock(&arp_globals.lock); + + arp_device_t *device = arp_cache_find(&arp_globals.cache, device_id); + if (!device) { + fibril_mutex_unlock(&arp_globals.lock); + return ENOENT; + } + + memcpy(device->addr, addr_buffer, length); + device->addr_len = length; + + fibril_mutex_unlock(&arp_globals.lock); return EOK; } @@ -456,4 +482,7 @@ async_answer_0(iid, (sysarg_t) rc); break; + case NET_IL_ADDR_CHANGED: + rc = arp_addr_changed_message(IPC_GET_DEVICE(*icall)); + async_answer_0(iid, (sysarg_t) rc); default: @@ -483,5 +512,5 @@ * */ -static int arp_device_message(device_id_t device_id, services_t service, +static int arp_device_message(nic_device_id_t device_id, services_t service, services_t protocol, measured_string_t *address) { @@ -586,24 +615,26 @@ /* Get hardware address */ - rc = nil_get_addr_req(device->sess, device_id, &device->addr, - &device->addr_data); - if (rc != EOK) { + int len = nil_get_addr_req(device->sess, device_id, device->addr, + NIC_MAX_ADDRESS_LENGTH); + if (len < 0) { fibril_mutex_unlock(&arp_globals.lock); arp_protos_destroy(&device->protos, free); free(device); - return rc; - } + return len; + } + + device->addr_len = len; /* Get broadcast address */ - rc = nil_get_broadcast_addr_req(device->sess, device_id, - &device->broadcast_addr, &device->broadcast_data); - if (rc != EOK) { - fibril_mutex_unlock(&arp_globals.lock); - free(device->addr); - free(device->addr_data); + len = nil_get_broadcast_addr_req(device->sess, device_id, + device->broadcast_addr, NIC_MAX_ADDRESS_LENGTH); + if (len < 0) { + fibril_mutex_unlock(&arp_globals.lock); arp_protos_destroy(&device->protos, free); free(device); - return rc; - } + return len; + } + + device->broadcast_addr_len = len; rc = arp_cache_add(&arp_globals.cache, device->device_id, @@ -611,8 +642,4 @@ if (rc != EOK) { fibril_mutex_unlock(&arp_globals.lock); - free(device->addr); - free(device->addr_data); - free(device->broadcast_addr); - free(device->broadcast_data); arp_protos_destroy(&device->protos, free); free(device); @@ -640,9 +667,9 @@ } -static int arp_send_request(device_id_t device_id, services_t protocol, +static int arp_send_request(nic_device_id_t device_id, services_t protocol, measured_string_t *target, arp_device_t *device, arp_proto_t *proto) { /* ARP packet content size = header + (address + translation) * 2 */ - size_t length = 8 + 2 * (proto->addr->length + device->addr->length); + size_t length = 8 + 2 * (proto->addr->length + device->addr_len); if (length > device->packet_dimension.content) return ELIMIT; @@ -661,5 +688,5 @@ header->hardware = htons(device->hardware); - header->hardware_length = (uint8_t) device->addr->length; + header->hardware_length = (uint8_t) device->addr_len; header->protocol = htons(protocol_map(device->service, protocol)); header->protocol_length = (uint8_t) proto->addr->length; @@ -667,17 +694,16 @@ length = sizeof(arp_header_t); - - memcpy(((uint8_t *) header) + length, device->addr->value, - device->addr->length); - length += device->addr->length; + memcpy(((uint8_t *) header) + length, device->addr, + device->addr_len); + length += device->addr_len; memcpy(((uint8_t *) header) + length, proto->addr->value, proto->addr->length); length += proto->addr->length; - bzero(((uint8_t *) header) + length, device->addr->length); - length += device->addr->length; + bzero(((uint8_t *) header) + length, device->addr_len); + length += device->addr_len; memcpy(((uint8_t *) header) + length, target->value, target->length); - - int rc = packet_set_addr(packet, (uint8_t *) device->addr->value, - (uint8_t *) device->broadcast_addr->value, device->addr->length); + + int rc = packet_set_addr(packet, device->addr, device->broadcast_addr, + device->addr_len); if (rc != EOK) { pq_release_remote(arp_globals.net_sess, packet_get_id(packet)); @@ -704,5 +730,5 @@ * */ -static int arp_translate_message(device_id_t device_id, services_t protocol, +static int arp_translate_message(nic_device_id_t device_id, services_t protocol, measured_string_t *target, measured_string_t **translation) { Index: uspace/srv/net/il/arp/arp.h =================================================================== --- uspace/srv/net/il/arp/arp.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/il/arp/arp.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -92,13 +92,13 @@ struct arp_device { /** Actual device hardware address. */ - measured_string_t *addr; - /** Actual device hardware address data. */ - uint8_t *addr_data; + uint8_t addr[NIC_MAX_ADDRESS_LENGTH]; + /** Actual device hardware address length. */ + size_t addr_len; /** Broadcast device hardware address. */ - measured_string_t *broadcast_addr; - /** Broadcast device hardware address data. */ - uint8_t *broadcast_data; + uint8_t broadcast_addr[NIC_MAX_ADDRESS_LENGTH]; + /** Broadcast device hardware address length. */ + size_t broadcast_addr_len; /** Device identifier. */ - device_id_t device_id; + nic_device_id_t device_id; /** Hardware type. */ hw_type_t hardware; Index: uspace/srv/net/il/ip/ip.c =================================================================== --- uspace/srv/net/il/ip/ip.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/il/ip/ip.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -354,5 +354,5 @@ ip_netif->routing = NET_DEFAULT_IP_ROUTING; configuration = &names[0]; - + /* Get configuration */ rc = net_get_device_conf_req(ip_globals.net_sess, ip_netif->device_id, @@ -406,5 +406,5 @@ return ENOTSUP; } - + if (configuration[6].value) { ip_netif->arp = get_running_module(&ip_globals.modules, @@ -417,10 +417,11 @@ } } + if (configuration[7].value) ip_netif->routing = (configuration[7].value[0] == 'y'); - + net_free_settings(configuration, data); } - + /* Bind netif service which also initializes the device */ ip_netif->sess = nil_bind_service(ip_netif->service, @@ -432,5 +433,5 @@ return ENOENT; } - + /* Has to be after the device netif module initialization */ if (ip_netif->arp) { @@ -448,5 +449,5 @@ } } - + /* Get packet dimensions */ rc = nil_packet_size_req(ip_netif->sess, ip_netif->device_id, @@ -461,5 +462,5 @@ ip_netif->packet_dimension.content = IP_MIN_CONTENT; } - + index = ip_netifs_add(&ip_globals.netifs, ip_netif->device_id, ip_netif); if (index < 0) @@ -478,9 +479,9 @@ printf("%s: Default gateway (%s)\n", NAME, defgateway); } - + return EOK; } -static int ip_device_req_local(device_id_t device_id, services_t netif) +static int ip_device_req_local(nic_device_id_t device_id, services_t netif) { ip_netif_t *ip_netif; @@ -498,9 +499,9 @@ return rc; } - + ip_netif->device_id = device_id; ip_netif->service = netif; - ip_netif->state = NETIF_STOPPED; - + ip_netif->state = NIC_STATE_STOPPED; + fibril_rwlock_write_lock(&ip_globals.netifs_lock); @@ -594,5 +595,5 @@ while (index >= 0) { netif = ip_netifs_get_index(&ip_globals.netifs, index); - if (netif && (netif->state == NETIF_ACTIVE)) { + if (netif && (netif->state == NIC_STATE_ACTIVE)) { route = ip_netif_find_route(netif, destination); if (route) @@ -1142,5 +1143,5 @@ } -static int ip_send_msg_local(device_id_t device_id, packet_t *packet, +static int ip_send_msg_local(nic_device_id_t device_id, packet_t *packet, services_t sender, services_t error) { @@ -1258,5 +1259,6 @@ * @return ENOENT if device is not found. */ -static int ip_device_state_message(device_id_t device_id, device_state_t state) +static int ip_device_state_message(nic_device_id_t device_id, + nic_device_state_t state) { ip_netif_t *netif; @@ -1272,5 +1274,6 @@ fibril_rwlock_write_unlock(&ip_globals.netifs_lock); - printf("%s: Device %d changed state to %d\n", NAME, device_id, state); + printf("%s: Device %d changed state to '%s'\n", NAME, device_id, + nic_device_state_to_string(state)); return EOK; @@ -1312,5 +1315,5 @@ * tl_received_msg() function. */ -static int ip_deliver_local(device_id_t device_id, packet_t *packet, +static int ip_deliver_local(nic_device_id_t device_id, packet_t *packet, ip_header_t *header, services_t error) { @@ -1413,5 +1416,5 @@ * is disabled. */ -static int ip_process_packet(device_id_t device_id, packet_t *packet) +static int ip_process_packet(nic_device_id_t device_id, packet_t *packet) { ip_header_t *header; @@ -1514,5 +1517,5 @@ * */ -static int ip_packet_size_message(device_id_t device_id, size_t *addr_len, +static int ip_packet_size_message(nic_device_id_t device_id, size_t *addr_len, size_t *prefix, size_t *content, size_t *suffix) { @@ -1572,5 +1575,5 @@ * @return ENOENT if device is not found. */ -static int ip_mtu_changed_message(device_id_t device_id, size_t mtu) +static int ip_mtu_changed_message(nic_device_id_t device_id, size_t mtu) { ip_netif_t *netif; @@ -1629,5 +1632,8 @@ async_answer_0(iid, (sysarg_t) rc); break; - + case NET_IL_ADDR_CHANGED: + async_answer_0(iid, (sysarg_t) EOK); + break; + default: async_answer_0(iid, (sysarg_t) ENOTSUP); @@ -1689,5 +1695,5 @@ } -static int ip_add_route_req_local(device_id_t device_id, in_addr_t address, +static int ip_add_route_req_local(nic_device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway) { @@ -1723,5 +1729,6 @@ } -static int ip_set_gateway_req_local(device_id_t device_id, in_addr_t gateway) +static int ip_set_gateway_req_local(nic_device_id_t device_id, + in_addr_t gateway) { ip_netif_t *netif; @@ -1757,5 +1764,5 @@ * */ -static int ip_received_error_msg_local(device_id_t device_id, +static int ip_received_error_msg_local(nic_device_id_t device_id, packet_t *packet, services_t target, services_t error) { @@ -1818,5 +1825,5 @@ static int ip_get_route_req_local(ip_protocol_t protocol, const struct sockaddr *destination, socklen_t addrlen, - device_id_t *device_id, void **header, size_t *headerlen) + nic_device_id_t *device_id, void **header, size_t *headerlen) { struct sockaddr_in *address_in; @@ -1909,5 +1916,5 @@ size_t suffix; size_t content; - device_id_t device_id; + nic_device_id_t device_id; int rc; Index: uspace/srv/net/il/ip/ip.h =================================================================== --- uspace/srv/net/il/ip/ip.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/il/ip/ip.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -92,5 +92,5 @@ in_addr_t broadcast; /** Device identifier. */ - device_id_t device_id; + nic_device_id_t device_id; /** Indicates whether using DHCP. */ int dhcp; @@ -108,5 +108,5 @@ services_t service; /** Device state. */ - device_state_t state; + nic_device_state_t state; }; Index: uspace/srv/net/net/Makefile =================================================================== --- uspace/srv/net/net/Makefile (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/net/Makefile (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -30,6 +30,6 @@ USPACE_PREFIX = ../../.. ROOT_PATH = $(USPACE_PREFIX)/.. -LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBPACKET_PREFIX)/libpacket.a -EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBPACKET_PREFIX)/include +LIBS = $(LIBNET_PREFIX)/libnet.a +EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common @@ -43,5 +43,5 @@ SOURCES = \ net.c \ - net_standalone.c + packet_server.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/net/net.c =================================================================== --- uspace/srv/net/net/net.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/net/net.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Radim Vansa * All rights reserved. * @@ -31,16 +32,14 @@ */ -/** @file - * Networking subsystem central module implementation. - * - */ - +#include #include #include #include #include +#include #include #include #include +#include #include #include @@ -49,6 +48,6 @@ #include #include +#include #include -#include #include #include @@ -57,15 +56,15 @@ #include #include -#include #include #include #include +#include +#include +#include +#include #include "net.h" - -/** Networking module name. */ -#define NAME "net" - -/** File read buffer size. */ -#define BUFFER_SIZE 256 +#include "packet_server.h" + +#define MAX_PATH_LENGTH 1024 /** Networking module global data. */ @@ -74,6 +73,4 @@ GENERIC_CHAR_MAP_IMPLEMENT(measured_strings, measured_string_t); DEVICE_MAP_IMPLEMENT(netifs, netif_t); - -static int startup(void); /** Add the configured setting to the configuration map. @@ -87,6 +84,6 @@ * */ -int add_configuration(measured_strings_t *configuration, const uint8_t *name, - const uint8_t *value) +static int add_configuration(measured_strings_t *configuration, + const uint8_t *name, const uint8_t *value) { int rc; @@ -109,70 +106,10 @@ /** Generate new system-unique device identifier. * - * @return The system-unique devic identifier. - */ -static device_id_t generate_new_device_id(void) + * @return The system-unique devic identifier. + * + */ +static nic_device_id_t generate_new_device_id(void) { return device_assign_devno(); -} - -static int parse_line(measured_strings_t *configuration, uint8_t *line) -{ - int rc; - - /* From the beginning */ - uint8_t *name = line; - - /* Skip comments and blank lines */ - if ((*name == '#') || (*name == '\0')) - return EOK; - - /* Skip spaces */ - while (isspace(*name)) - name++; - - /* Remember the name start */ - uint8_t *value = name; - - /* Skip the name */ - while (isalnum(*value) || (*value == '_')) - value++; - - if (*value == '=') { - /* Terminate the name */ - *value = '\0'; - } else { - /* Terminate the name */ - *value = '\0'; - - /* Skip until '=' */ - value++; - while ((*value) && (*value != '=')) - value++; - - /* Not found? */ - if (*value != '=') - return EINVAL; - } - - value++; - - /* Skip spaces */ - while (isspace(*value)) - value++; - - /* Create a bulk measured string till the end */ - measured_string_t *setting = - measured_string_create_bulk(value, 0); - if (!setting) - return ENOMEM; - - /* Add the configuration setting */ - rc = measured_strings_add(configuration, name, 0, setting); - if (rc != EOK) { - free(setting); - return rc; - } - - return EOK; } @@ -182,50 +119,26 @@ printf("%s: Reading configuration file %s/%s\n", NAME, directory, filename); - /* Construct the full filename */ - char fname[BUFFER_SIZE]; - if (snprintf(fname, BUFFER_SIZE, "%s/%s", directory, filename) > BUFFER_SIZE) - return EOVERFLOW; - - /* Open the file */ - FILE *cfg = fopen(fname, "r"); - if (!cfg) + cfg_file_t cfg; + int rc = cfg_load_path(directory, filename, &cfg); + if (rc != EOK) + return rc; + + if (cfg_anonymous(&cfg) == NULL) { + cfg_unload(&cfg); return ENOENT; - - /* - * Read the configuration line by line - * until an error or the end of file - */ - unsigned int line_number = 0; - size_t index = 0; - uint8_t line[BUFFER_SIZE]; - - while (!ferror(cfg) && !feof(cfg)) { - int read = fgetc(cfg); - if ((read > 0) && (read != '\n') && (read != '\r')) { - if (index >= BUFFER_SIZE) { - line[BUFFER_SIZE - 1] = '\0'; - fprintf(stderr, "%s: Configuration line %u too " - "long: %s\n", NAME, line_number, (char *) line); - - /* No space left in the line buffer */ - return EOVERFLOW; - } - /* Append the character */ - line[index] = (uint8_t) read; - index++; - } else { - /* On error or new line */ - line[index] = '\0'; - line_number++; - if (parse_line(configuration, line) != EOK) { - fprintf(stderr, "%s: Configuration error on " - "line %u: %s\n", NAME, line_number, (char *) line); - } - - index = 0; + } + + cfg_section_foreach(cfg_anonymous(&cfg), link) { + const cfg_entry_t *entry = cfg_entry_instance(link); + + rc = add_configuration(configuration, + (uint8_t *) entry->key, (uint8_t *) entry->value); + if (rc != EOK) { + cfg_unload(&cfg); + return rc; } } - fclose(cfg); + cfg_unload(&cfg); return EOK; } @@ -255,98 +168,4 @@ return read_configuration_file(CONF_DIR, CONF_GENERAL_FILE, &net_globals.configuration); -} - -/** Initialize the networking module. - * - * @param[in] client_connection The client connection processing - * function. The module skeleton propagates - * its own one. - * - * @return EOK on success. - * @return ENOMEM if there is not enough memory left. - * - */ -static int net_initialize(async_client_conn_t client_connection) -{ - int rc; - - netifs_initialize(&net_globals.netifs); - char_map_initialize(&net_globals.netif_names); - modules_initialize(&net_globals.modules); - measured_strings_initialize(&net_globals.configuration); - - /* TODO: dynamic configuration */ - rc = read_configuration(); - if (rc != EOK) - return rc; - - rc = add_module(NULL, &net_globals.modules, (uint8_t *) LO_NAME, - (uint8_t *) LO_FILENAME, SERVICE_LO, 0, connect_to_service); - if (rc != EOK) - return rc; - - rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME, - (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service); - if (rc != EOK) - return rc; - - rc = add_module(NULL, &net_globals.modules, (uint8_t *) ETHERNET_NAME, - (uint8_t *) ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service); - if (rc != EOK) - return rc; - - rc = add_module(NULL, &net_globals.modules, (uint8_t *) NILDUMMY_NAME, - (uint8_t *) NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service); - if (rc != EOK) - return rc; - - /* Build specific initialization */ - return net_initialize_build(client_connection); -} - -/** Start the networking module. - * - * Initializes the client connection serving function, - * initializes the module, registers the module service - * and starts the async manager, processing IPC messages - * in an infinite loop. - * - * @param[in] client_connection The client connection - * processing function. The - * module skeleton propagates - * its own one. - * - * @return EOK on successful module termination. - * @return Other error codes as defined for the net_initialize() function. - * @return Other error codes as defined for the REGISTER_ME() macro function. - * - */ -static int net_module_start(async_client_conn_t client_connection) -{ - int rc; - - async_set_client_connection(client_connection); - rc = pm_init(); - if (rc != EOK) - return rc; - - rc = net_initialize(client_connection); - if (rc != EOK) - goto out; - - rc = service_register(SERVICE_NETWORKING); - if (rc != EOK) - goto out; - - rc = startup(); - if (rc != EOK) - goto out; - - task_retval(0); - async_manager(); - -out: - pm_destroy(); - return rc; } @@ -364,8 +183,8 @@ */ static int net_get_conf(measured_strings_t *netif_conf, - measured_string_t *configuration, size_t count, uint8_t **data) -{ - if (data) - *data = NULL; + measured_string_t *configuration, size_t count) +{ + if ((!configuration) || (count <= 0)) + return EINVAL; size_t index; @@ -389,28 +208,65 @@ } -static int net_get_conf_req_local(measured_string_t **configuration, - size_t count, uint8_t **data) -{ - if (!configuration || (count <= 0)) - return EINVAL; - - return net_get_conf(NULL, *configuration, count, data); -} - -static int net_get_device_conf_req_local(device_id_t device_id, - measured_string_t **configuration, size_t count, uint8_t **data) -{ - if ((!configuration) || (count == 0)) - return EINVAL; - +static int net_get_device_conf(nic_device_id_t device_id, + measured_string_t *configuration, size_t count) +{ netif_t *netif = netifs_find(&net_globals.netifs, device_id); if (netif) - return net_get_conf(&netif->configuration, *configuration, count, data); + return net_get_conf(&netif->configuration, configuration, count); else - return net_get_conf(NULL, *configuration, count, data); -} - -void net_free_settings(measured_string_t *settings, uint8_t *data) -{ + return net_get_conf(NULL, configuration, count); +} + +static int net_get_devices(measured_string_t **devices, size_t *dev_count) +{ + if (!devices) + return EBADMEM; + + size_t max_count = netifs_count(&net_globals.netifs); + *devices = malloc(max_count * sizeof(measured_string_t)); + if (*devices == NULL) + return ENOMEM; + + size_t count = 0; + for (size_t i = 0; i < max_count; i++) { + netif_t *item = netifs_get_index(&net_globals.netifs, i); + if (item->sess != NULL) { + /* + * Use format "device_id:device_name" + * FIXME: This typecasting looks really ugly + */ + (*devices)[count].length = asprintf( + (char **) &((*devices)[count].value), + NIC_DEVICE_PRINT_FMT ":%s", item->id, + (const char *) item->name); + count++; + } + } + + *dev_count = (size_t) count; + return EOK; +} + +static int net_get_devices_count() +{ + size_t max_count = netifs_count(&net_globals.netifs); + + size_t count = 0; + for (size_t i = 0; i < max_count; i++) { + netif_t *item = netifs_get_index(&net_globals.netifs, i); + if (item->sess != NULL) + count++; + } + + return count; +} + +static void net_free_devices(measured_string_t *devices, size_t count) +{ + size_t i; + for (i = 0; i < count; ++i) + free(devices[i].value); + + free(devices); } @@ -431,25 +287,24 @@ * */ -static int start_device(netif_t *netif) -{ - int rc; - - /* Mandatory netif */ - measured_string_t *setting = - measured_strings_find(&netif->configuration, (uint8_t *) CONF_NETIF, 0); - - netif->driver = get_running_module(&net_globals.modules, setting->value); - if (!netif->driver) { - fprintf(stderr, "%s: Failed to start network interface driver '%s'\n", - NAME, setting->value); - return EINVAL; +static int init_device(netif_t *netif, devman_handle_t handle) +{ + printf("%s: Initializing device '%s'\n", NAME, netif->name); + + netif->handle = handle; + netif->sess = devman_device_connect(EXCHANGE_SERIALIZE, netif->handle, + IPC_FLAG_BLOCKING); + if (netif->sess == NULL) { + printf("%s: Unable to connect to device\n", NAME); + return EREFUSED; } /* Optional network interface layer */ - setting = measured_strings_find(&netif->configuration, (uint8_t *) CONF_NIL, 0); + measured_string_t *setting = measured_strings_find(&netif->configuration, + (uint8_t *) CONF_NIL, 0); if (setting) { - netif->nil = get_running_module(&net_globals.modules, setting->value); + netif->nil = get_running_module(&net_globals.modules, + setting->value); if (!netif->nil) { - fprintf(stderr, "%s: Failed to start network interface layer '%s'\n", + printf("%s: Unable to connect to network interface layer '%s'\n", NAME, setting->value); return EINVAL; @@ -459,143 +314,97 @@ /* Mandatory internet layer */ - setting = measured_strings_find(&netif->configuration, (uint8_t *) CONF_IL, 0); - netif->il = get_running_module(&net_globals.modules, setting->value); + setting = measured_strings_find(&netif->configuration, + (uint8_t *) CONF_IL, 0); + netif->il = get_running_module(&net_globals.modules, + setting->value); if (!netif->il) { - fprintf(stderr, "%s: Failed to start internet layer '%s'\n", + printf("%s: Unable to connect to internet layer '%s'\n", NAME, setting->value); return EINVAL; } - /* Hardware configuration */ - setting = measured_strings_find(&netif->configuration, (uint8_t *) CONF_IRQ, 0); - int irq = setting ? strtol((char *) setting->value, NULL, 10) : 0; - - setting = measured_strings_find(&netif->configuration, (uint8_t *) CONF_IO, 0); - uintptr_t io = setting ? strtol((char *) setting->value, NULL, 16) : 0; - - rc = netif_probe_req(netif->driver->sess, netif->id, irq, (void *) io); - if (rc != EOK) - return rc; - /* Network interface layer startup */ - services_t internet_service; + int rc; + services_t nil_service; if (netif->nil) { - setting = measured_strings_find(&netif->configuration, (uint8_t *) CONF_MTU, 0); + setting = measured_strings_find(&netif->configuration, + (uint8_t *) CONF_MTU, 0); if (!setting) setting = measured_strings_find(&net_globals.configuration, (uint8_t *) CONF_MTU, 0); - int mtu = setting ? strtol((char *) setting->value, NULL, 10) : 0; - rc = nil_device_req(netif->nil->sess, netif->id, mtu, - netif->driver->service); + int mtu = setting ? + strtol((const char *) setting->value, NULL, 10) : 0; + rc = nil_device_req(netif->nil->sess, netif->id, + netif->handle, mtu); + if (rc != EOK) { + printf("%s: Unable to start network interface layer\n", + NAME); + return rc; + } + + nil_service = netif->nil->service; + } else + nil_service = -1; + + /* Inter-network layer startup */ + switch (netif->il->service) { + case SERVICE_IP: + rc = ip_device_req(netif->il->sess, netif->id, nil_service); + if (rc != EOK) { + printf("%s: Unable to start internet layer\n", NAME); + return rc; + } + + break; + default: + return ENOENT; + } + + printf("%s: Activating device '%s'\n", NAME, netif->name); + return nic_set_state(netif->sess, NIC_STATE_ACTIVE); +} + +static int net_port_ready(devman_handle_t handle) +{ + char hwpath[MAX_PATH_LENGTH]; + int rc = devman_fun_get_path(handle, hwpath, MAX_PATH_LENGTH); + if (rc != EOK) + return EINVAL; + + int index = char_map_find(&net_globals.netif_hwpaths, + (uint8_t *) hwpath, 0); + if (index == CHAR_MAP_NULL) + return ENOENT; + + netif_t *netif = netifs_get_index(&net_globals.netifs, index); + if (netif == NULL) + return ENOENT; + + rc = init_device(netif, handle); + if (rc != EOK) + return rc; + + /* Increment module usage */ + if (netif->nil) + netif->nil->usage++; + + netif->il->usage++; + + return EOK; +} + +static int net_driver_ready_local(devman_handle_t handle) +{ + devman_handle_t *funs; + size_t count; + int rc = devman_dev_get_functions(handle, &funs, &count); + if (rc != EOK) + return rc; + + for (size_t i = 0; i < count; i++) { + rc = net_port_ready(funs[i]); if (rc != EOK) return rc; - - internet_service = netif->nil->service; - } else - internet_service = netif->driver->service; - - /* Inter-network layer startup */ - rc = ip_device_req(netif->il->sess, netif->id, internet_service); - if (rc != EOK) - return rc; - - return netif_start_req(netif->driver->sess, netif->id); -} - -/** Read the configuration and start all network interfaces. - * - * @return EOK on success. - * @return EXDEV if there is no available system-unique device identifier. - * @return EINVAL if any of the network interface names are not configured. - * @return ENOMEM if there is not enough memory left. - * @return Other error codes as defined for the read_configuration() - * function. - * @return Other error codes as defined for the read_netif_configuration() - * function. - * @return Other error codes as defined for the start_device() function. - * - */ -static int startup(void) -{ - const char *conf_files[] = { - "lo", - "ne2k" - }; - size_t count = sizeof(conf_files) / sizeof(char *); - int rc; - - size_t i; - for (i = 0; i < count; i++) { - netif_t *netif = (netif_t *) malloc(sizeof(netif_t)); - if (!netif) - return ENOMEM; - - netif->id = generate_new_device_id(); - if (!netif->id) - return EXDEV; - - rc = measured_strings_initialize(&netif->configuration); - if (rc != EOK) - return rc; - - /* Read configuration files */ - rc = read_netif_configuration(conf_files[i], netif); - if (rc != EOK) { - measured_strings_destroy(&netif->configuration, free); - free(netif); - return rc; - } - - /* Mandatory name */ - measured_string_t *setting = - measured_strings_find(&netif->configuration, (uint8_t *) CONF_NAME, 0); - if (!setting) { - fprintf(stderr, "%s: Network interface name is missing\n", NAME); - measured_strings_destroy(&netif->configuration, free); - free(netif); - return EINVAL; - } - netif->name = setting->value; - - /* Add to the netifs map */ - int index = netifs_add(&net_globals.netifs, netif->id, netif); - if (index < 0) { - measured_strings_destroy(&netif->configuration, free); - free(netif); - return index; - } - - /* - * Add to the netif names map and start network interfaces - * and needed modules. - */ - rc = char_map_add(&net_globals.netif_names, netif->name, 0, - index); - if (rc != EOK) { - measured_strings_destroy(&netif->configuration, free); - netifs_exclude_index(&net_globals.netifs, index, free); - return rc; - } - - rc = start_device(netif); - if (rc != EOK) { - printf("%s: Ignoring failed interface %s (%s)\n", NAME, - netif->name, str_error(rc)); - measured_strings_destroy(&netif->configuration, free); - netifs_exclude_index(&net_globals.netifs, index, free); - continue; - } - - /* Increment modules' usage */ - netif->driver->usage++; - if (netif->nil) - netif->nil->usage++; - netif->il->usage++; - - printf("%s: Network interface started (name: %s, id: %d, driver: %s, " - "nil: %s, il: %s)\n", NAME, netif->name, netif->id, - netif->driver->name, netif->nil ? (char *) netif->nil->name : "[none]", - netif->il->name); } @@ -618,10 +427,11 @@ * */ -int net_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, - size_t *answer_count) +static int net_message(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, size_t *answer_count) { measured_string_t *strings; uint8_t *data; int rc; + size_t count; *answer_count = 0; @@ -636,12 +446,11 @@ if (rc != EOK) return rc; - net_get_device_conf_req_local(IPC_GET_DEVICE(*call), &strings, - IPC_GET_COUNT(*call), NULL); - - /* Strings should not contain received data anymore */ - free(data); + + net_get_device_conf(IPC_GET_DEVICE(*call), strings, + IPC_GET_COUNT(*call)); rc = measured_strings_reply(strings, IPC_GET_COUNT(*call)); free(strings); + free(data); return rc; case NET_NET_GET_CONF: @@ -650,17 +459,31 @@ if (rc != EOK) return rc; - net_get_conf_req_local(&strings, IPC_GET_COUNT(*call), NULL); - - /* Strings should not contain received data anymore */ - free(data); + + net_get_conf(NULL, strings, IPC_GET_COUNT(*call)); rc = measured_strings_reply(strings, IPC_GET_COUNT(*call)); free(strings); - return rc; - case NET_NET_STARTUP: - return startup(); - } - - return ENOTSUP; + free(data); + return rc; + case NET_NET_GET_DEVICES_COUNT: + count = (size_t) net_get_devices_count(); + IPC_SET_ARG1(*answer, count); + *answer_count = 1; + return EOK; + case NET_NET_GET_DEVICES: + rc = net_get_devices(&strings, &count); + if (rc != EOK) + return rc; + + rc = measured_strings_reply(strings, count); + net_free_devices(strings, count); + return rc; + case NET_NET_DRIVER_READY: + rc = net_driver_ready_local(IPC_GET_ARG1(*call)); + *answer_count = 0; + return rc; + default: + return ENOTSUP; + } } @@ -684,6 +507,6 @@ /* Clear the answer structure */ ipc_call_t answer; - size_t answer_count; - refresh_answer(&answer, &answer_count); + size_t count; + refresh_answer(&answer, &count); /* Fetch the next message */ @@ -692,5 +515,9 @@ /* Process the message */ - int res = net_module_message(callid, &call, &answer, &answer_count); + int res; + if (IS_NET_PACKET_MESSAGE(call)) + res = packet_server_message(callid, &call, &answer, &count); + else + res = net_message(callid, &call, &answer, &count); /* End if told to either by the message or the processing result */ @@ -699,5 +526,5 @@ /* Answer the message */ - answer_call(callid, res, &answer, answer_count); + answer_call(callid, res, &answer, count); } } @@ -705,5 +532,172 @@ int main(int argc, char *argv[]) { - return net_module_start(net_client_connection); + netifs_initialize(&net_globals.netifs); + char_map_initialize(&net_globals.netif_hwpaths); + modules_initialize(&net_globals.modules); + measured_strings_initialize(&net_globals.configuration); + async_set_client_connection(net_client_connection); + + int rc = pm_init(); + if (rc != EOK) { + printf("%s: Unable to initialize packet management\n", NAME); + return rc; + } + + rc = packet_server_init(); + if (rc != EOK) { + printf("%s: Unable to initialize packet server\n", NAME); + pm_destroy(); + return rc; + } + + rc = read_configuration(); + if (rc != EOK) { + printf("%s: Error reading configuration\n", NAME); + pm_destroy(); + return rc; + } + + DIR *config_dir = opendir(CONF_DIR); + if (config_dir != NULL) { + struct dirent *dir_entry; + while ((dir_entry = readdir(config_dir))) { + /* Ignore files without the CONF_EXT extension */ + if ((str_size(dir_entry->d_name) < str_size(CONF_EXT)) || + (str_cmp(dir_entry->d_name + str_size(dir_entry->d_name) - + str_size(CONF_EXT), CONF_EXT) != 0)) + continue; + + + netif_t *netif = (netif_t *) malloc(sizeof(netif_t)); + if (!netif) + continue; + + netif->handle = -1; + netif->sess = NULL; + + netif->id = generate_new_device_id(); + if (!netif->id) { + free(netif); + continue; + } + + rc = measured_strings_initialize(&netif->configuration); + if (rc != EOK) { + free(netif); + continue; + } + + rc = read_netif_configuration(dir_entry->d_name, netif); + if (rc != EOK) { + printf("%s: Error reading configuration %s\n", NAME, + dir_entry->d_name); + free(netif); + continue; + } + + measured_string_t *name = measured_strings_find(&netif->configuration, + (uint8_t *) CONF_NAME, 0); + if (!name) { + printf("%s: Network interface name is missing in %s\n", + NAME, dir_entry->d_name); + measured_strings_destroy(&netif->configuration, free); + free(netif); + continue; + } + + netif->name = name->value; + + /* Mandatory hardware path */ + measured_string_t *hwpath = measured_strings_find( + &netif->configuration, (const uint8_t *) CONF_HWPATH, 0); + if (!hwpath) { + printf("%s: Hardware path is missing in %s\n", + NAME, dir_entry->d_name); + measured_strings_destroy(&netif->configuration, free); + free(netif); + continue; + } + + int index = netifs_add(&net_globals.netifs, netif->id, netif); + if (index < 0) { + measured_strings_destroy(&netif->configuration, free); + free(netif); + continue; + } + + /* + * Add to the hardware paths map and init network interfaces + * and needed modules. + */ + rc = char_map_add(&net_globals.netif_hwpaths, hwpath->value, 0, index); + if (rc != EOK) { + measured_strings_destroy(&netif->configuration, free); + netifs_exclude_index(&net_globals.netifs, index, free); + continue; + } + } + + closedir(config_dir); + } + + rc = add_module(NULL, &net_globals.modules, (uint8_t *) ETHERNET_NAME, + (uint8_t *) ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service); + if (rc != EOK) { + printf("%s: Error adding module '%s'\n", NAME, ETHERNET_NAME); + pm_destroy(); + return rc; + } + + rc = add_module(NULL, &net_globals.modules, (uint8_t *) NILDUMMY_NAME, + (uint8_t *) NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service); + if (rc != EOK) { + printf("%s: Error adding module '%s'\n", NAME, NILDUMMY_NAME); + pm_destroy(); + return rc; + } + + task_id_t task_id = net_spawn((uint8_t *) IP_FILENAME); + if (!task_id) { + printf("%s: Error spawning IP module\n", NAME); + pm_destroy(); + return EINVAL; + } + + rc = add_module(NULL, &net_globals.modules, (uint8_t *) IP_NAME, + (uint8_t *) IP_FILENAME, SERVICE_IP, task_id, ip_connect_module); + if (rc != EOK) { + printf("%s: Error adding module '%s'\n", NAME, IP_NAME); + pm_destroy(); + return rc; + } + + if (!net_spawn((uint8_t *) "/srv/icmp")) { + printf("%s: Error spawning ICMP module\n", NAME); + pm_destroy(); + return EINVAL; + } + + if (!net_spawn((uint8_t *) "/srv/udp")) { + printf("%s: Error spawning UDP module\n", NAME); + pm_destroy(); + return EINVAL; + } + + if (!net_spawn((uint8_t *) "/srv/tcp")) { + printf("%s: Error spawning TCP module\n", NAME); + pm_destroy(); + return EINVAL; + } + + rc = service_register(SERVICE_NETWORKING); + if (rc != EOK) { + printf("%s: Error registering service\n", NAME); + pm_destroy(); + return rc; + } + + task_retval(0); + async_manager(); + return 0; } Index: uspace/srv/net/net/net.h =================================================================== --- uspace/srv/net/net/net.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/net/net.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Radim Vansa * All rights reserved. * @@ -31,9 +32,4 @@ */ -/** @file - * Networking subsystem central module. - * - */ - #ifndef NET_NET_H_ #define NET_NET_H_ @@ -45,11 +41,7 @@ #include #include +#include -/** @name Modules definitions - * @{ - */ - -#define NE2000_FILENAME "/srv/ne2000" -#define NE2000_NAME "ne2000" +#define NAME "net" #define ETHERNET_FILENAME "/srv/eth" @@ -58,7 +50,4 @@ #define IP_FILENAME "/srv/ip" #define IP_NAME "ip" - -#define LO_FILENAME "/srv/lo" -#define LO_NAME "lo" #define NILDUMMY_FILENAME "/srv/nildummy" @@ -77,5 +66,5 @@ #define CONF_MTU "MTU" /**< Maximum transmission unit configuration label. */ #define CONF_NAME "NAME" /**< Network interface name configuration label. */ -#define CONF_NETIF "NETIF" /**< Network interface module name configuration label. */ +#define CONF_HWPATH "HWPATH" /**< Network interface hardware pathname label. */ #define CONF_NIL "NIL" /**< Network interface layer module name configuration label. */ @@ -85,4 +74,5 @@ #define CONF_DIR "/cfg/net" /**< Configuration directory. */ #define CONF_GENERAL_FILE "general" /**< General configuration file. */ +#define CONF_EXT ".nic" /**< Extension for NIC's configuration files. */ /** Configuration settings. @@ -98,13 +88,17 @@ */ typedef struct { - measured_strings_t configuration; /**< Configuration. */ + /** System-unique network interface name. */ + uint8_t *name; + /** System-unique network interface identifier. */ + nic_device_id_t id; + /** Configuration. */ + measured_strings_t configuration; /** Serving network interface driver module index. */ - module_t *driver; + devman_handle_t handle; /**< Handle for devman */ + async_sess_t *sess; /**< Driver session. */ - device_id_t id; /**< System-unique network interface identifier. */ - module_t *il; /**< Serving internet layer module index. */ - uint8_t *name; /**< System-unique network interface name. */ - module_t *nil; /**< Serving link layer module index. */ + module_t *nil; /**< Serving link layer module index. */ + module_t *il; /**< Serving internet layer module index. */ } netif_t; @@ -124,6 +118,6 @@ modules_t modules; /**< Available modules. */ - /** Network interface structure indices by names. */ - char_map_t netif_names; + /** Network interface structure indices by hardware path. */ + char_map_t netif_hwpaths; /** Present network interfaces. */ @@ -131,10 +125,4 @@ } net_globals_t; -extern int add_configuration(measured_strings_t *, const uint8_t *, - const uint8_t *); -extern int net_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, size_t *); -extern int net_initialize_build(async_client_conn_t); -extern int net_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, size_t *); - #endif Index: pace/srv/net/net/net_standalone.c =================================================================== --- uspace/srv/net/net/net_standalone.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,110 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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. - */ - -/** @addtogroup net - * @{ - */ - -/** @file - * Wrapper for the standalone networking module. - */ - -#include "net.h" - -#include -#include -#include -#include -#include - -#include -#include - -/** Networking module global data. */ -extern net_globals_t net_globals; - -/** Initialize the networking module for the chosen subsystem build type. - * - * @param[in] client_connection The client connection processing function. - * The module skeleton propagates its own one. - * - * @return EOK on success. - * @return ENOMEM if there is not enough memory left. - * - */ -int net_initialize_build(async_client_conn_t client_connection) -{ - int rc; - - task_id_t task_id = net_spawn((uint8_t *) "/srv/ip"); - if (!task_id) - return EINVAL; - - rc = add_module(NULL, &net_globals.modules, (uint8_t *) IP_NAME, - (uint8_t *) IP_FILENAME, SERVICE_IP, task_id, ip_connect_module); - if (rc != EOK) - return rc; - - if (!net_spawn((uint8_t *) "/srv/icmp")) - return EINVAL; - - if (!net_spawn((uint8_t *) "/srv/udp")) - return EINVAL; - - if (!net_spawn((uint8_t *) "/srv/tcp")) - return EINVAL; - - return EOK; -} - -/** Process the module message. - * - * Distribute the message to the right module. - * - * @param[in] callid The message identifier. - * @param[in] call The message parameters. - * @param[out] answer The message answer parameters. - * @param[out] answer_count The last parameter for the actual answer in - * the answer parameter. - * - * @return EOK on success. - * @return ENOTSUP if the message is not known. - * @return Other error codes. - * - */ -int net_module_message(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, size_t *count) -{ - if (IS_NET_PACKET_MESSAGE(*call)) - return packet_server_message(callid, call, answer, count); - - return net_message(callid, call, answer, count); -} - -/** @} - */ Index: uspace/srv/net/net/packet_server.c =================================================================== --- uspace/srv/net/net/packet_server.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/srv/net/net/packet_server.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,403 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** @addtogroup libpacket + * @{ + */ + +/** @file + * Packet server implementation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "packet_server.h" + +#define PACKET_SERVER_PROFILE 1 + +/** Number of queues cacheing the unused packets */ +#define FREE_QUEUES_COUNT 7 +/** Maximum number of packets in each queue */ +#define FREE_QUEUE_MAX_LENGTH 16 + +/** The default address length reserved for new packets. */ +#define DEFAULT_ADDR_LEN 32 + +/** The default prefix reserved for new packets. */ +#define DEFAULT_PREFIX 64 + +/** The default suffix reserved for new packets. */ +#define DEFAULT_SUFFIX 64 + +/** The queue with unused packets */ +typedef struct packet_queue { + packet_t *first; /**< First packet in the queue */ + size_t packet_size; /**< Maximal size of the packets in this queue */ + int count; /**< Length of the queue */ +} packet_queue_t; + +/** Packet server global data. */ +static struct { + /** Safety lock. */ + fibril_mutex_t lock; + /** Free packet queues. */ + packet_queue_t free_queues[FREE_QUEUES_COUNT]; + + /** Total packets allocated. */ + packet_id_t next_id; +} ps_globals = { + .lock = FIBRIL_MUTEX_INITIALIZER(ps_globals.lock), + .free_queues = { + { NULL, PAGE_SIZE, 0}, + { NULL, PAGE_SIZE * 2, 0}, + { NULL, PAGE_SIZE * 4, 0}, + { NULL, PAGE_SIZE * 8, 0}, + { NULL, PAGE_SIZE * 16, 0}, + { NULL, PAGE_SIZE * 32, 0}, + { NULL, PAGE_SIZE * 64, 0}, + }, + .next_id = 1 +}; + +/** Clears and initializes the packet according to the given dimensions. + * + * @param[in] packet The packet to be initialized. + * @param[in] addr_len The source and destination addresses maximal length in + * bytes. + * @param[in] max_prefix The maximal prefix length in bytes. + * @param[in] max_content The maximal content length in bytes. + * @param[in] max_suffix The maximal suffix length in bytes. + */ +static void packet_init(packet_t *packet, + size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix) +{ + /* Clear the packet content */ + bzero(((void *) packet) + sizeof(packet_t), + packet->length - sizeof(packet_t)); + + /* Clear the packet header */ + packet->order = 0; + packet->metric = 0; + packet->previous = 0; + packet->next = 0; + packet->offload_info = 0; + packet->offload_mask = 0; + packet->addr_len = 0; + packet->src_addr = sizeof(packet_t); + packet->dest_addr = packet->src_addr + addr_len; + packet->max_prefix = max_prefix; + packet->max_content = max_content; + packet->data_start = packet->dest_addr + addr_len + packet->max_prefix; + packet->data_end = packet->data_start; +} + +/** + * Releases the memory allocated for the packet + * + * @param[in] packet Pointer to the memory where the packet was allocated + */ +static void packet_dealloc(packet_t *packet) +{ + pm_remove(packet); + munmap(packet, packet->length); +} + +/** Creates a new packet of dimensions at least as given. + * + * @param[in] length The total length of the packet, including the header, + * the addresses and the data of the packet. + * @param[in] addr_len The source and destination addresses maximal length in + * bytes. + * @param[in] max_prefix The maximal prefix length in bytes. + * @param[in] max_content The maximal content length in bytes. + * @param[in] max_suffix The maximal suffix length in bytes. + * @return The packet of dimensions at least as given. + * @return NULL if there is not enough memory left. + */ +static packet_t *packet_alloc(size_t length, size_t addr_len, + size_t max_prefix, size_t max_content, size_t max_suffix) +{ + packet_t *packet; + int rc; + + /* Global lock is locked */ + assert(fibril_mutex_is_locked(&ps_globals.lock)); + /* The length is some multiple of PAGE_SIZE */ + assert(!(length & (PAGE_SIZE - 1))); + + packet = (packet_t *) mmap(NULL, length, PROTO_READ | PROTO_WRITE, + MAP_SHARED | MAP_ANONYMOUS, 0, 0); + if (packet == MAP_FAILED) + return NULL; + + /* Using 32bit packet_id the id could overflow */ + packet_id_t pid; + do { + pid = ps_globals.next_id; + ps_globals.next_id++; + } while (!pid || pm_find(pid)); + packet->packet_id = pid; + + packet->length = length; + packet_init(packet, addr_len, max_prefix, max_content, max_suffix); + packet->magic_value = PACKET_MAGIC_VALUE; + rc = pm_add(packet); + if (rc != EOK) { + packet_dealloc(packet); + return NULL; + } + + return packet; +} + +/** Return the packet of dimensions at least as given. + * + * Try to reuse free packets first. + * Create a new packet aligned to the memory page size if none available. + * Lock the global data during its processing. + * + * @param[in] addr_len The source and destination addresses maximal length in + * bytes. + * @param[in] max_prefix The maximal prefix length in bytes. + * @param[in] max_content The maximal content length in bytes. + * @param[in] max_suffix The maximal suffix length in bytes. + * @return The packet of dimensions at least as given. + * @return NULL if there is not enough memory left. + */ +static packet_t *packet_get_local(size_t addr_len, + size_t max_prefix, size_t max_content, size_t max_suffix) +{ + size_t length = ALIGN_UP(sizeof(packet_t) + 2 * addr_len + + max_prefix + max_content + max_suffix, PAGE_SIZE); + + if (length > PACKET_MAX_LENGTH) + return NULL; + + fibril_mutex_lock(&ps_globals.lock); + + packet_t *packet; + unsigned int index; + + for (index = 0; index < FREE_QUEUES_COUNT; index++) { + if ((length > ps_globals.free_queues[index].packet_size) && + (index < FREE_QUEUES_COUNT - 1)) + continue; + + packet = ps_globals.free_queues[index].first; + while (packet_is_valid(packet) && (packet->length < length)) + packet = pm_find(packet->next); + + if (packet_is_valid(packet)) { + ps_globals.free_queues[index].count--; + if (packet == ps_globals.free_queues[index].first) { + ps_globals.free_queues[index].first = pq_detach(packet); + } else { + pq_detach(packet); + } + + packet_init(packet, addr_len, max_prefix, max_content, max_suffix); + fibril_mutex_unlock(&ps_globals.lock); + + return packet; + } + } + + packet = packet_alloc(length, addr_len, + max_prefix, max_content, max_suffix); + + fibril_mutex_unlock(&ps_globals.lock); + + return packet; +} + +/** Release the packet and returns it to the appropriate free packet queue. + * + * @param[in] packet The packet to be released. + * + */ +static void packet_release(packet_t *packet) +{ + int index; + int result; + + assert(fibril_mutex_is_locked(&ps_globals.lock)); + + for (index = 0; (index < FREE_QUEUES_COUNT - 1) && + (packet->length > ps_globals.free_queues[index].packet_size); index++) { + ; + } + + ps_globals.free_queues[index].count++; + result = pq_add(&ps_globals.free_queues[index].first, packet, + packet->length, packet->length); + assert(result == EOK); +} + +/** Releases the packet queue. + * + * @param[in] packet_id The first packet identifier. + * @return EOK on success. + * @return ENOENT if there is no such packet. + */ +static int packet_release_wrapper(packet_id_t packet_id) +{ + packet_t *packet; + + packet = pm_find(packet_id); + if (!packet_is_valid(packet)) + return ENOENT; + + fibril_mutex_lock(&ps_globals.lock); + pq_destroy(packet, packet_release); + fibril_mutex_unlock(&ps_globals.lock); + + return EOK; +} + +/** Shares the packet memory block. + * @param[in] packet The packet to be shared. + * @return EOK on success. + * @return EINVAL if the packet is not valid. + * @return EINVAL if the calling module does not accept the memory. + * @return ENOMEM if the desired and actual sizes differ. + * @return Other error codes as defined for the + * async_share_in_finalize() function. + */ +static int packet_reply(packet_t *packet) +{ + ipc_callid_t callid; + size_t size; + + if (!packet_is_valid(packet)) + return EINVAL; + + if (!async_share_in_receive(&callid, &size)) { + async_answer_0(callid, EINVAL); + return EINVAL; + } + + if (size != packet->length) { + async_answer_0(callid, ENOMEM); + return ENOMEM; + } + + return async_share_in_finalize(callid, packet, + PROTO_READ | PROTO_WRITE); +} + +/** Processes the packet server message. + * + * @param[in] callid The message identifier. + * @param[in] call The message parameters. + * @param[out] answer The message answer parameters. + * @param[out] answer_count The last parameter for the actual answer in the + * answer parameter. + * @return EOK on success. + * @return ENOMEM if there is not enough memory left. + * @return ENOENT if there is no such packet as in the packet + * message parameter. + * @return ENOTSUP if the message is not known. + * @return Other error codes as defined for the + * packet_release_wrapper() function. + */ +int packet_server_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, + size_t *answer_count) +{ + packet_t *packet; + + if (!IPC_GET_IMETHOD(*call)) + return EOK; + + *answer_count = 0; + switch (IPC_GET_IMETHOD(*call)) { + case NET_PACKET_CREATE_1: + packet = packet_get_local(DEFAULT_ADDR_LEN, DEFAULT_PREFIX, + IPC_GET_CONTENT(*call), DEFAULT_SUFFIX); + if (!packet) + return ENOMEM; + *answer_count = 2; + IPC_SET_ARG1(*answer, (sysarg_t) packet->packet_id); + IPC_SET_ARG2(*answer, (sysarg_t) packet->length); + return EOK; + + case NET_PACKET_CREATE_4: + packet = packet_get_local( + ((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(*call)) ? + IPC_GET_ADDR_LEN(*call) : DEFAULT_ADDR_LEN), + DEFAULT_PREFIX + IPC_GET_PREFIX(*call), + IPC_GET_CONTENT(*call), + DEFAULT_SUFFIX + IPC_GET_SUFFIX(*call)); + if (!packet) + return ENOMEM; + *answer_count = 2; + IPC_SET_ARG1(*answer, (sysarg_t) packet->packet_id); + IPC_SET_ARG2(*answer, (sysarg_t) packet->length); + return EOK; + + case NET_PACKET_GET: + packet = pm_find(IPC_GET_ID(*call)); + if (!packet_is_valid(packet)) { + return ENOENT; + } + return packet_reply(packet); + + case NET_PACKET_GET_SIZE: + packet = pm_find(IPC_GET_ID(*call)); + if (!packet_is_valid(packet)) + return ENOENT; + IPC_SET_ARG1(*answer, (sysarg_t) packet->length); + *answer_count = 1; + return EOK; + + case NET_PACKET_RELEASE: + return packet_release_wrapper(IPC_GET_ID(*call)); + } + + return ENOTSUP; +} + +int packet_server_init() +{ + return EOK; +} + +/** @} + */ Index: uspace/srv/net/net/packet_server.h =================================================================== --- uspace/srv/net/net/packet_server.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) +++ uspace/srv/net/net/packet_server.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Radim Vansa + * 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. + */ + +/** @addtogroup libpacket + * @{ + */ + +/** @file + * Packet server. + * The hosting module has to be compiled with both the packet.c and the + * packet_server.c source files. To function correctly, initialization of the + * packet map by the pm_init() function has to happen at the first place. Then + * the packet messages have to be processed by the packet_server_message() + * function. The packet map should be released by the pm_destroy() function + * during the module termination. + * @see IS_NET_PACKET_MESSAGE() + */ + +#ifndef NET_PACKET_SERVER_H_ +#define NET_PACKET_SERVER_H_ + +#include + +extern int packet_server_init(void); +extern int packet_server_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, + size_t *); + +#endif + +/** @} + */ Index: pace/srv/net/netif/lo/Makefile =================================================================== --- uspace/srv/net/netif/lo/Makefile (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,46 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# 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 = ../../../.. -ROOT_PATH = $(USPACE_PREFIX)/.. -LIBS = $(LIBNET_PREFIX)/libnet.a -EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include - -COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common -CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config - --include $(COMMON_MAKEFILE) --include $(CONFIG_MAKEFILE) - -BINARY = lo - -SOURCES = \ - lo.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/srv/net/netif/lo/lo.c =================================================================== --- uspace/srv/net/netif/lo/lo.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ (revision ) @@ -1,231 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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. - */ - -/** @addtogroup lo - * @{ - */ - -/** @file - * Loopback network interface implementation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** Default address length. */ -#define DEFAULT_ADDR_LEN 6 - -/** Loopback module name. */ -#define NAME "lo" - -static uint8_t default_addr[DEFAULT_ADDR_LEN] = - {0, 0, 0, 0, 0, 0}; - -int netif_specific_message(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, size_t *count) -{ - return ENOTSUP; -} - -int netif_get_addr_message(device_id_t device_id, measured_string_t *address) -{ - if (!address) - return EBADMEM; - - address->value = default_addr; - address->length = DEFAULT_ADDR_LEN; - - return EOK; -} - -int netif_get_device_stats(device_id_t device_id, device_stats_t *stats) -{ - if (!stats) - return EBADMEM; - - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) - return rc; - - memcpy(stats, (device_stats_t *) device->specific, - sizeof(device_stats_t)); - - return EOK; -} - -/** Change the loopback state. - * - * @param[in] device The device structure. - * @param[in] state The new device state. - * - * @return New state if changed. - * @return EOK otherwise. - * - */ -static void change_state_message(netif_device_t *device, device_state_t state) -{ - if (device->state != state) { - device->state = state; - - const char *desc; - switch (state) { - case NETIF_ACTIVE: - desc = "active"; - break; - case NETIF_STOPPED: - desc = "stopped"; - break; - default: - desc = "unknown"; - } - - printf("%s: State changed to %s\n", NAME, desc); - } -} - -/** Create and return the loopback network interface structure. - * - * @param[in] device_id New devce identifier. - * @param[out] device Device structure. - * - * @return EOK on success. - * @return EXDEV if one loopback network interface already exists. - * @return ENOMEM if there is not enough memory left. - * - */ -static int lo_create(device_id_t device_id, netif_device_t **device) -{ - if (netif_device_map_count(&netif_globals.device_map) > 0) - return EXDEV; - - *device = (netif_device_t *) malloc(sizeof(netif_device_t)); - if (!*device) - return ENOMEM; - - (*device)->specific = (device_stats_t *) malloc(sizeof(device_stats_t)); - if (!(*device)->specific) { - free(*device); - return ENOMEM; - } - - null_device_stats((device_stats_t *) (*device)->specific); - (*device)->device_id = device_id; - (*device)->state = NETIF_STOPPED; - int index = netif_device_map_add(&netif_globals.device_map, - (*device)->device_id, *device); - - if (index < 0) { - free(*device); - free((*device)->specific); - *device = NULL; - return index; - } - - return EOK; -} - -int netif_initialize(void) -{ - return service_register(SERVICE_LO); -} - -int netif_probe_message(device_id_t device_id, int irq, void *io) -{ - /* Create a new device */ - netif_device_t *device; - int rc = lo_create(device_id, &device); - if (rc != EOK) - return rc; - - printf("%s: Device created (id: %d)\n", NAME, device->device_id); - return EOK; -} - -int netif_send_message(device_id_t device_id, packet_t *packet, services_t sender) -{ - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) - return EOK; - - if (device->state != NETIF_ACTIVE) { - netif_pq_release(packet_get_id(packet)); - return EFORWARD; - } - - packet_t *next = packet; - do { - ((device_stats_t *) device->specific)->send_packets++; - ((device_stats_t *) device->specific)->receive_packets++; - size_t length = packet_get_data_length(next); - ((device_stats_t *) device->specific)->send_bytes += length; - ((device_stats_t *) device->specific)->receive_bytes += length; - next = pq_next(next); - } while (next); - - async_sess_t *nil_sess = netif_globals.nil_sess; - fibril_rwlock_write_unlock(&netif_globals.lock); - - nil_received_msg(nil_sess, device_id, packet, sender); - - fibril_rwlock_write_lock(&netif_globals.lock); - return EOK; -} - -int netif_start_message(netif_device_t *device) -{ - change_state_message(device, NETIF_ACTIVE); - return device->state; -} - -int netif_stop_message(netif_device_t *device) -{ - change_state_message(device, NETIF_STOPPED); - return device->state; -} - -int main(int argc, char *argv[]) -{ - /* Start the module */ - return netif_module_start(); -} - -/** @} - */ Index: uspace/srv/net/nil/eth/eth.c =================================================================== --- uspace/srv/net/nil/eth/eth.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/nil/eth/eth.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Radim Vansa * All rights reserved. * @@ -36,4 +37,5 @@ */ +#include #include #include @@ -52,5 +54,4 @@ #include #include -#include #include #include @@ -58,4 +59,5 @@ #include #include +#include #include #include "eth.h" @@ -167,5 +169,5 @@ INT_MAP_IMPLEMENT(eth_protos, eth_proto_t); -int nil_device_state_msg_local(device_id_t device_id, sysarg_t state) +int nil_device_state_msg_local(nic_device_id_t device_id, sysarg_t state) { int index; @@ -196,11 +198,6 @@ fibril_rwlock_write_lock(ð_globals.protos_lock); eth_globals.net_sess = sess; - - eth_globals.broadcast_addr = - measured_string_create_bulk((uint8_t *) "\xFF\xFF\xFF\xFF\xFF\xFF", ETH_ADDR); - if (!eth_globals.broadcast_addr) { - rc = ENOMEM; - goto out; - } + memcpy(eth_globals.broadcast_addr, "\xFF\xFF\xFF\xFF\xFF\xFF", + ETH_ADDR); rc = eth_devices_initialize(ð_globals.devices); @@ -215,4 +212,5 @@ eth_devices_destroy(ð_globals.devices, free); } + out: fibril_rwlock_write_unlock(ð_globals.protos_lock); @@ -222,59 +220,18 @@ } -/** Process IPC messages from the registered device driver modules in an - * infinite loop. - * - * @param[in] iid Message identifier. - * @param[in,out] icall Message parameters. - * @param[in] arg Local argument. - * - */ -static void eth_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg) -{ - packet_t *packet; - int rc; - - while (true) { - switch (IPC_GET_IMETHOD(*icall)) { - case NET_NIL_DEVICE_STATE: - nil_device_state_msg_local(IPC_GET_DEVICE(*icall), - IPC_GET_STATE(*icall)); - async_answer_0(iid, EOK); - break; - case NET_NIL_RECEIVED: - rc = packet_translate_remote(eth_globals.net_sess, - &packet, IPC_GET_PACKET(*icall)); - if (rc == EOK) - rc = nil_received_msg_local(IPC_GET_DEVICE(*icall), - packet, 0); - - async_answer_0(iid, (sysarg_t) rc); - break; - default: - async_answer_0(iid, (sysarg_t) ENOTSUP); - } - - iid = async_get_call(icall); - } -} - -/** Registers new device or updates the MTU of an existing one. - * - * Determines the device local hardware address. - * - * @param[in] device_id The new device identifier. - * @param[in] service The device driver service. - * @param[in] mtu The device maximum transmission unit. - * @return EOK on success. - * @return EEXIST if the device with the different service exists. - * @return ENOMEM if there is not enough memory left. - * @return Other error codes as defined for the - * net_get_device_conf_req() function. - * @return Other error codes as defined for the - * netif_bind_service() function. - * @return Other error codes as defined for the - * netif_get_addr_req() function. - */ -static int eth_device_message(device_id_t device_id, services_t service, +/** Register new device or updates the MTU of an existing one. + * + * Determine the device local hardware address. + * + * @param[in] device_id New device identifier. + * @param[in] handle Device driver handle. + * @param[in] mtu Device maximum transmission unit. + * + * @return EOK on success. + * @return EEXIST if the device with the different service exists. + * @return ENOMEM if there is not enough memory left. + * + */ +static int eth_device_message(nic_device_id_t device_id, devman_handle_t handle, size_t mtu) { @@ -301,5 +258,5 @@ device = eth_devices_find(ð_globals.devices, device_id); if (device) { - if (device->service != service) { + if (device->handle != handle) { printf("Device %d already exists\n", device->device_id); fibril_rwlock_write_unlock(ð_globals.devices_lock); @@ -340,5 +297,5 @@ device->device_id = device_id; - device->service = service; + device->handle = handle; device->flags = 0; if ((mtu > 0) && (mtu <= ETH_MAX_TAGGED_CONTENT(device->flags))) @@ -377,6 +334,6 @@ /* Bind the device driver */ - device->sess = netif_bind_service(device->service, device->device_id, - SERVICE_ETHERNET, eth_receiver); + device->sess = devman_device_connect(EXCHANGE_SERIALIZE, handle, + IPC_FLAG_BLOCKING); if (device->sess == NULL) { fibril_rwlock_write_unlock(ð_globals.devices_lock); @@ -385,7 +342,8 @@ } + nic_connect_to_nil(device->sess, SERVICE_ETHERNET, device_id); + /* Get hardware address */ - rc = netif_get_addr_req(device->sess, device->device_id, &device->addr, - &device->addr_data); + rc = nic_get_address(device->sess, &device->addr); if (rc != EOK) { fibril_rwlock_write_unlock(ð_globals.devices_lock); @@ -399,16 +357,12 @@ if (index < 0) { fibril_rwlock_write_unlock(ð_globals.devices_lock); - free(device->addr); - free(device->addr_data); free(device); return index; } - printf("%s: Device registered (id: %d, service: %d: mtu: %zu, " - "mac: %02x:%02x:%02x:%02x:%02x:%02x, flags: 0x%x)\n", - NAME, device->device_id, device->service, device->mtu, - device->addr_data[0], device->addr_data[1], - device->addr_data[2], device->addr_data[3], - device->addr_data[4], device->addr_data[5], device->flags); + printf("%s: Device registered (id: %d, handle: %zu: mtu: %zu, " + "mac: " PRIMAC ", flags: 0x%x)\n", NAME, + device->device_id, device->handle, device->mtu, + ARGSMAC(device->addr.address), device->flags); fibril_rwlock_write_unlock(ð_globals.devices_lock); @@ -456,5 +410,5 @@ fcs = (eth_fcs_t *) data + length - sizeof(eth_fcs_t); length -= sizeof(eth_fcs_t); - } else if(type <= ETH_MAX_CONTENT) { + } else if (type <= ETH_MAX_CONTENT) { /* Translate "LSAP" values */ if ((header->lsap.dsap == ETH_LSAP_GLSAP) && @@ -462,5 +416,5 @@ /* Raw packet -- discard */ return NULL; - } else if((header->lsap.dsap == ETH_LSAP_SNAP) && + } else if ((header->lsap.dsap == ETH_LSAP_SNAP) && (header->lsap.ssap == ETH_LSAP_SNAP)) { /* @@ -469,12 +423,10 @@ */ type = ntohs(header->snap.ethertype); - prefix = sizeof(eth_header_t) + - sizeof(eth_header_lsap_t) + + prefix = sizeof(eth_header_t) + sizeof(eth_header_lsap_t) + sizeof(eth_header_snap_t); } else { /* IEEE 802.3 + 802.2 LSAP */ type = lsap_map(header->lsap.dsap); - prefix = sizeof(eth_header_t) + - sizeof(eth_header_lsap_t); + prefix = sizeof(eth_header_t) + sizeof(eth_header_lsap_t); } @@ -506,6 +458,5 @@ } -int nil_received_msg_local(device_id_t device_id, packet_t *packet, - services_t target) +int nil_received_msg_local(nic_device_id_t device_id, packet_t *packet) { eth_proto_t *proto; @@ -523,6 +474,6 @@ flags = device->flags; fibril_rwlock_read_unlock(ð_globals.devices_lock); - fibril_rwlock_read_lock(ð_globals.protos_lock); + do { next = pq_detach(packet); @@ -537,5 +488,5 @@ } packet = next; - } while(packet); + } while (packet); fibril_rwlock_read_unlock(ð_globals.protos_lock); @@ -554,5 +505,5 @@ * @return ENOENT if there is no such device. */ -static int eth_packet_space_message(device_id_t device_id, size_t *addr_len, +static int eth_packet_space_message(nic_device_id_t device_id, size_t *addr_len, size_t *prefix, size_t *content, size_t *suffix) { @@ -579,24 +530,22 @@ } -/** Returns the device hardware address. +/** Send the device hardware address. * * @param[in] device_id The device identifier. * @param[in] type Type of the desired address. - * @param[out] address The device hardware address. * @return EOK on success. * @return EBADMEM if the address parameter is NULL. * @return ENOENT if there no such device. */ -static int eth_addr_message(device_id_t device_id, eth_addr_type_t type, - measured_string_t **address) -{ - eth_device_t *device; - - if (!address) - return EBADMEM; - - if (type == ETH_BROADCAST_ADDR) { - *address = eth_globals.broadcast_addr; - } else { +static int eth_addr_message(nic_device_id_t device_id, eth_addr_type_t type) +{ + eth_device_t *device = NULL; + uint8_t *address; + size_t max_len; + ipc_callid_t callid; + + if (type == ETH_BROADCAST_ADDR) + address = eth_globals.broadcast_addr; + else { fibril_rwlock_read_lock(ð_globals.devices_lock); device = eth_devices_find(ð_globals.devices, device_id); @@ -605,9 +554,30 @@ return ENOENT; } - *address = device->addr; + + address = (uint8_t *) &device->addr.address; + } + + int rc = EOK; + if (!async_data_read_receive(&callid, &max_len)) { + rc = EREFUSED; + goto end; + } + + if (max_len < ETH_ADDR) { + async_data_read_finalize(callid, NULL, 0); + rc = ELIMIT; + goto end; + } + + rc = async_data_read_finalize(callid, address, ETH_ADDR); + if (rc != EOK) + goto end; + +end: + + if (type == ETH_LOCAL_ADDR) fibril_rwlock_read_unlock(ð_globals.devices_lock); - } - - return (*address) ? EOK : ENOENT; + + return rc; } @@ -659,5 +629,5 @@ } - printf("%s: Protocol registered (protocol: %d, service: %d)\n", + printf("%s: Protocol registered (protocol: %d, service: %#x)\n", NAME, proto->protocol, proto->service); @@ -697,6 +667,14 @@ if (i < 0) return i; + if (i != ETH_ADDR) return EINVAL; + + for (i = 0; i < ETH_ADDR; i++) { + if (src[i]) { + src_addr = src; + break; + } + } length = packet_get_data_length(packet); @@ -722,5 +700,5 @@ memcpy(header_dix->destination_address, dest, ETH_ADDR); src = &header_dix->destination_address[0]; - } else if(IS_8023_2_LSAP(flags)) { + } else if (IS_8023_2_LSAP(flags)) { header_lsap = PACKET_PREFIX(packet, eth_header_lsap_t); if (!header_lsap) @@ -735,5 +713,5 @@ memcpy(header_lsap->header.destination_address, dest, ETH_ADDR); src = &header_lsap->header.destination_address[0]; - } else if(IS_8023_2_SNAP(flags)) { + } else if (IS_8023_2_SNAP(flags)) { header = PACKET_PREFIX(packet, eth_header_snap_t); if (!header) @@ -746,5 +724,5 @@ header->lsap.ctrl = IEEE_8023_2_UI; - for (i = 0; i < 3; ++ i) + for (i = 0; i < 3; i++) header->snap.protocol[i] = 0; @@ -760,5 +738,5 @@ return ENOMEM; - for (i = 0; i < 7; ++ i) + for (i = 0; i < 7; i++) preamble->preamble[i] = ETH_PREAMBLE; @@ -787,5 +765,5 @@ * @return EINVAL if the service parameter is not known. */ -static int eth_send_message(device_id_t device_id, packet_t *packet, +static int eth_send_message(nic_device_id_t device_id, packet_t *packet, services_t sender) { @@ -813,5 +791,5 @@ do { rc = eth_prepare_packet(device->flags, next, - (uint8_t *) device->addr->value, ethertype, device->mtu); + (uint8_t *) &device->addr.address, ethertype, device->mtu); if (rc != EOK) { /* Release invalid packet */ @@ -825,20 +803,61 @@ next = pq_next(next); } - } while(next); + } while (next); /* Send packet queue */ - if (packet) { - netif_send_msg(device->sess, device_id, packet, - SERVICE_ETHERNET); - } - + if (packet) + nic_send_message(device->sess, packet_get_id(packet)); + fibril_rwlock_read_unlock(ð_globals.devices_lock); return EOK; } +static int eth_addr_changed(nic_device_id_t device_id) +{ + nic_address_t address; + size_t length; + ipc_callid_t data_callid; + if (!async_data_write_receive(&data_callid, &length)) { + async_answer_0(data_callid, EINVAL); + return EINVAL; + } + if (length > sizeof (nic_address_t)) { + async_answer_0(data_callid, ELIMIT); + return ELIMIT; + } + if (async_data_write_finalize(data_callid, &address, length) != EOK) { + return EINVAL; + } + + fibril_rwlock_write_lock(ð_globals.devices_lock); + /* An existing device? */ + eth_device_t *device = eth_devices_find(ð_globals.devices, device_id); + if (device) { + printf("Device %d changing address from " PRIMAC " to " PRIMAC "\n", + device_id, ARGSMAC(device->addr.address), ARGSMAC(address.address)); + memcpy(&device->addr, &address, sizeof (nic_address_t)); + fibril_rwlock_write_unlock(ð_globals.devices_lock); + + /* Notify all upper layer modules */ + fibril_rwlock_read_lock(ð_globals.protos_lock); + int index; + for (index = 0; index < eth_protos_count(ð_globals.protos); index++) { + eth_proto_t *proto = eth_protos_get_index(ð_globals.protos, index); + if (proto->sess != NULL) { + il_addr_changed_msg(proto->sess, device->device_id, + ETH_ADDR, address.address); + } + } + + fibril_rwlock_read_unlock(ð_globals.protos_lock); + return EOK; + } else { + return ENOENT; + } +} + int nil_module_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, size_t *answer_count) { - measured_string_t *address; packet_t *packet; size_t addrlen; @@ -861,5 +880,5 @@ case NET_NIL_DEVICE: return eth_device_message(IPC_GET_DEVICE(*call), - IPC_GET_SERVICE(*call), IPC_GET_MTU(*call)); + IPC_GET_DEVICE_HANDLE(*call), IPC_GET_MTU(*call)); case NET_NIL_SEND: rc = packet_translate_remote(eth_globals.net_sess, &packet, @@ -867,4 +886,5 @@ if (rc != EOK) return rc; + return eth_send_message(IPC_GET_DEVICE(*call), packet, IPC_GET_SERVICE(*call)); @@ -874,4 +894,5 @@ if (rc != EOK) return rc; + IPC_SET_ADDR(*answer, addrlen); IPC_SET_PREFIX(*answer, prefix); @@ -879,17 +900,40 @@ IPC_SET_SUFFIX(*answer, suffix); *answer_count = 4; + return EOK; case NET_NIL_ADDR: - rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_LOCAL_ADDR, - &address); + rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_LOCAL_ADDR); if (rc != EOK) return rc; - return measured_strings_reply(address, 1); + + IPC_SET_ADDR(*answer, ETH_ADDR); + *answer_count = 1; + + return EOK; case NET_NIL_BROADCAST_ADDR: - rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_BROADCAST_ADDR, - &address); + rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_BROADCAST_ADDR); if (rc != EOK) - return EOK; - return measured_strings_reply(address, 1); + return rc; + + IPC_SET_ADDR(*answer, ETH_ADDR); + *answer_count = 1; + + return EOK; + case NET_NIL_DEVICE_STATE: + nil_device_state_msg_local(IPC_GET_DEVICE(*call), IPC_GET_STATE(*call)); + async_answer_0(callid, EOK); + return EOK; + case NET_NIL_RECEIVED: + rc = packet_translate_remote(eth_globals.net_sess, &packet, + IPC_GET_ARG2(*call)); + if (rc == EOK) + rc = nil_received_msg_local(IPC_GET_ARG1(*call), packet); + + async_answer_0(callid, (sysarg_t) rc); + return rc; + case NET_NIL_ADDR_CHANGED: + rc = eth_addr_changed(IPC_GET_DEVICE(*call)); + async_answer_0(callid, (sysarg_t) rc); + return rc; } Index: uspace/srv/net/nil/eth/eth.h =================================================================== --- uspace/srv/net/nil/eth/eth.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/nil/eth/eth.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Radim Vansa * All rights reserved. * @@ -43,4 +44,5 @@ #include #include +#include /** Ethernet address length. */ @@ -220,7 +222,7 @@ struct eth_device { /** Device identifier. */ - device_id_t device_id; - /** Device driver service. */ - services_t service; + nic_device_id_t device_id; + /** Device handle */ + devman_handle_t handle; /** Driver session. */ async_sess_t *sess; @@ -236,8 +238,5 @@ /** Actual device hardware address. */ - measured_string_t *addr; - - /** Actual device hardware address data. */ - uint8_t *addr_data; + nic_address_t addr; }; @@ -270,5 +269,5 @@ /** Broadcast device hardware address. */ - measured_string_t *broadcast_addr; + uint8_t broadcast_addr[ETH_ADDR]; }; Index: uspace/srv/net/nil/nildummy/nildummy.c =================================================================== --- uspace/srv/net/nil/nildummy/nildummy.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/nil/nildummy/nildummy.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Radim Vansa * All rights reserved. * @@ -36,4 +37,5 @@ */ +#include #include #include @@ -50,5 +52,7 @@ #include #include -#include +#include +#include +#include #include #include "nildummy.h" @@ -65,5 +69,5 @@ DEVICE_MAP_IMPLEMENT(nildummy_devices, nildummy_device_t); -int nil_device_state_msg_local(device_id_t device_id, sysarg_t state) +int nil_device_state_msg_local(nic_device_id_t device_id, sysarg_t state) { fibril_rwlock_read_lock(&nildummy_globals.protos_lock); @@ -91,42 +95,4 @@ return rc; -} - -/** Process IPC messages from the registered device driver modules - * - * @param[in] iid Message identifier. - * @param[in,out] icall Message parameters. - * @param[in] arg Local argument. - * - */ -static void nildummy_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg) -{ - packet_t *packet; - int rc; - - while (true) { - switch (IPC_GET_IMETHOD(*icall)) { - case NET_NIL_DEVICE_STATE: - rc = nil_device_state_msg_local(IPC_GET_DEVICE(*icall), - IPC_GET_STATE(*icall)); - async_answer_0(iid, (sysarg_t) rc); - break; - - case NET_NIL_RECEIVED: - rc = packet_translate_remote(nildummy_globals.net_sess, - &packet, IPC_GET_PACKET(*icall)); - if (rc == EOK) - rc = nil_received_msg_local(IPC_GET_DEVICE(*icall), - packet, 0); - - async_answer_0(iid, (sysarg_t) rc); - break; - - default: - async_answer_0(iid, (sysarg_t) ENOTSUP); - } - - iid = async_get_call(icall); - } } @@ -148,6 +114,6 @@ * */ -static int nildummy_device_message(device_id_t device_id, services_t service, - size_t mtu) +static int nildummy_device_message(nic_device_id_t device_id, + devman_handle_t handle, size_t mtu) { fibril_rwlock_write_lock(&nildummy_globals.devices_lock); @@ -157,8 +123,8 @@ nildummy_devices_find(&nildummy_globals.devices, device_id); if (device) { - if (device->service != service) { - printf("Device %d already exists\n", device->device_id); - fibril_rwlock_write_unlock( - &nildummy_globals.devices_lock); + if (device->handle != handle) { + printf("Device %d exists, handles do not match\n", + device->device_id); + fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); return EEXIST; } @@ -170,6 +136,6 @@ device->mtu = NET_DEFAULT_MTU; - printf("Device %d already exists:\tMTU\t= %zu\n", - device->device_id, device->mtu); + printf("Device %d already exists (mtu: %zu)\n", device->device_id, + device->mtu); fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); @@ -192,13 +158,13 @@ device->device_id = device_id; - device->service = service; + device->handle = handle; if (mtu > 0) device->mtu = mtu; else device->mtu = NET_DEFAULT_MTU; - + /* Bind the device driver */ - device->sess = netif_bind_service(device->service, device->device_id, - SERVICE_ETHERNET, nildummy_receiver); + device->sess = devman_device_connect(EXCHANGE_SERIALIZE, handle, + IPC_FLAG_BLOCKING); if (device->sess == NULL) { fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); @@ -207,7 +173,8 @@ } + nic_connect_to_nil(device->sess, SERVICE_NILDUMMY, device_id); + /* Get hardware address */ - int rc = netif_get_addr_req(device->sess, device->device_id, - &device->addr, &device->addr_data); + int rc = nic_get_address(device->sess, &device->addr); if (rc != EOK) { fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); @@ -215,4 +182,6 @@ return rc; } + + device->addr_len = ETH_ADDR; /* Add to the cache */ @@ -221,12 +190,10 @@ if (index < 0) { fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); - free(device->addr); - free(device->addr_data); free(device); return index; } - printf("%s: Device registered (id: %d, service: %d, mtu: %zu)\n", - NAME, device->device_id, device->service, device->mtu); + printf("%s: Device registered (id: %d, mtu: %zu)\n", NAME, + device->device_id, device->mtu); fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); return EOK; @@ -243,8 +210,7 @@ * */ -static int nildummy_addr_message(device_id_t device_id, - measured_string_t **address) -{ - if (!address) +static int nildummy_addr_message(nic_device_id_t device_id, size_t *addrlen) +{ + if (!addrlen) return EBADMEM; @@ -258,9 +224,28 @@ } - *address = device->addr; + ipc_callid_t callid; + size_t max_len; + if (!async_data_read_receive(&callid, &max_len)) { + fibril_rwlock_read_unlock(&nildummy_globals.devices_lock); + return EREFUSED; + } + + if (max_len < device->addr_len) { + fibril_rwlock_read_unlock(&nildummy_globals.devices_lock); + async_data_read_finalize(callid, NULL, 0); + return ELIMIT; + } + + int rc = async_data_read_finalize(callid, + (uint8_t *) &device->addr.address, device->addr_len); + if (rc != EOK) { + fibril_rwlock_read_unlock(&nildummy_globals.devices_lock); + return rc; + } + + *addrlen = device->addr_len; fibril_rwlock_read_unlock(&nildummy_globals.devices_lock); - - return (*address) ? EOK : ENOENT; + return EOK; } @@ -278,6 +263,6 @@ * */ -static int nildummy_packet_space_message(device_id_t device_id, size_t *addr_len, - size_t *prefix, size_t *content, size_t *suffix) +static int nildummy_packet_space_message(nic_device_id_t device_id, + size_t *addr_len, size_t *prefix, size_t *content, size_t *suffix) { if ((!addr_len) || (!prefix) || (!content) || (!suffix)) @@ -303,6 +288,5 @@ } -int nil_received_msg_local(device_id_t device_id, packet_t *packet, - services_t target) +int nil_received_msg_local(nic_device_id_t device_id, packet_t *packet) { fibril_rwlock_read_lock(&nildummy_globals.protos_lock); @@ -340,5 +324,5 @@ nildummy_globals.proto.sess = sess; - printf("%s: Protocol registered (service: %d)\n", + printf("%s: Protocol registered (service: %#x)\n", NAME, nildummy_globals.proto.service); @@ -358,5 +342,5 @@ * */ -static int nildummy_send_message(device_id_t device_id, packet_t *packet, +static int nildummy_send_message(nic_device_id_t device_id, packet_t *packet, services_t sender) { @@ -372,6 +356,5 @@ /* Send packet queue */ if (packet) - netif_send_msg(device->sess, device_id, packet, - SERVICE_NILDUMMY); + nic_send_message(device->sess, packet_get_id(packet)); fibril_rwlock_read_unlock(&nildummy_globals.devices_lock); @@ -383,5 +366,4 @@ ipc_call_t *answer, size_t *answer_count) { - measured_string_t *address; packet_t *packet; size_t addrlen; @@ -404,5 +386,5 @@ case NET_NIL_DEVICE: return nildummy_device_message(IPC_GET_DEVICE(*call), - IPC_GET_SERVICE(*call), IPC_GET_MTU(*call)); + IPC_GET_DEVICE_HANDLE(*call), IPC_GET_MTU(*call)); case NET_NIL_SEND: @@ -427,14 +409,26 @@ case NET_NIL_ADDR: - rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &address); + case NET_NIL_BROADCAST_ADDR: + rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &addrlen); if (rc != EOK) return rc; - return measured_strings_reply(address, 1); - - case NET_NIL_BROADCAST_ADDR: - rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &address); - if (rc != EOK) - return rc; - return measured_strings_reply(address, 1); + + IPC_SET_ADDR(*answer, addrlen); + *answer_count = 1; + return rc; + case NET_NIL_DEVICE_STATE: + rc = nil_device_state_msg_local(IPC_GET_DEVICE(*call), + IPC_GET_STATE(*call)); + async_answer_0(callid, (sysarg_t) rc); + return rc; + + case NET_NIL_RECEIVED: + rc = packet_translate_remote(nildummy_globals.net_sess, &packet, + IPC_GET_ARG2(*call)); + if (rc == EOK) + rc = nil_received_msg_local(IPC_GET_ARG1(*call), packet); + + async_answer_0(callid, (sysarg_t) rc); + return rc; } Index: uspace/srv/net/nil/nildummy/nildummy.h =================================================================== --- uspace/srv/net/nil/nildummy/nildummy.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/nil/nildummy/nildummy.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Radim Vansa * All rights reserved. * @@ -41,4 +42,5 @@ #include #include +#include #include #include @@ -76,9 +78,7 @@ struct nildummy_device { /** Device identifier. */ - device_id_t device_id; - - /** Device driver service. */ - services_t service; - + nic_device_id_t device_id; + /** Device driver handle. */ + devman_handle_t handle; /** Driver session. */ async_sess_t *sess; @@ -88,8 +88,7 @@ /** Actual device hardware address. */ - measured_string_t *addr; - - /** Actual device hardware address data. */ - uint8_t *addr_data; + nic_address_t addr; + /** Actual device hardware address length. */ + size_t addr_len; }; Index: uspace/srv/net/tl/icmp/icmp.c =================================================================== --- uspace/srv/net/tl/icmp/icmp.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/tl/icmp/icmp.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -753,5 +753,5 @@ return rc; - rc = icmp_echo(icmp_id, icmp_seq, ICMP_GET_SIZE(*call), + rc = icmp_echo(icmp_id, icmp_seq, ICMP_GET_SIZE(*call), ICMP_GET_TIMEOUT(*call), ICMP_GET_TTL(*call), ICMP_GET_TOS(*call), ICMP_GET_DONT_FRAGMENT(*call), Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/tl/tcp/tcp.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -169,5 +169,5 @@ static int tcp_release_after_timeout(void *); -static int tcp_process_packet(device_id_t, packet_t *, services_t); +static int tcp_process_packet(nic_device_id_t, packet_t *, services_t); static int tcp_connect_core(socket_core_t *, socket_cores_t *, struct sockaddr *, socklen_t); @@ -177,5 +177,5 @@ size_t); static packet_t *tcp_get_packets_to_send(socket_core_t *, tcp_socket_data_t *); -static void tcp_send_packets(device_id_t, packet_t *); +static void tcp_send_packets(nic_device_id_t, packet_t *); static void tcp_process_acknowledgement(socket_core_t *, tcp_socket_data_t *, @@ -205,5 +205,5 @@ static void tcp_queue_received_end_of_data(socket_core_t *socket); -static int tcp_received_msg(device_id_t, packet_t *, services_t, services_t); +static int tcp_received_msg(nic_device_id_t, packet_t *, services_t, services_t); static int tcp_process_client_messages(async_sess_t *, ipc_callid_t, ipc_call_t); @@ -220,5 +220,5 @@ tcp_globals_t tcp_globals; -int tcp_received_msg(device_id_t device_id, packet_t *packet, +int tcp_received_msg(nic_device_id_t device_id, packet_t *packet, services_t receiver, services_t error) { @@ -238,5 +238,5 @@ } -int tcp_process_packet(device_id_t device_id, packet_t *packet, services_t error) +int tcp_process_packet(nic_device_id_t device_id, packet_t *packet, services_t error) { size_t length; @@ -1251,5 +1251,5 @@ bzero(socket_data, sizeof(*socket_data)); socket_data->state = TCP_SOCKET_INITIAL; - socket_data->device_id = DEVICE_INVALID_ID; + socket_data->device_id = NIC_DEVICE_INVALID_ID; socket_data->window = NET_DEFAULT_TCP_WINDOW; socket_data->treshold = socket_data->window; @@ -1335,5 +1335,5 @@ } if (tl_get_ip_packet_dimension(tcp_globals.ip_sess, - &tcp_globals.dimensions, DEVICE_INVALID_ID, + &tcp_globals.dimensions, NIC_DEVICE_INVALID_ID, &packet_dimension) == EOK) { SOCKET_SET_DATA_FRAGMENT_SIZE(answer, @@ -1651,5 +1651,4 @@ /* Sent packet? */ packet = pq_find(socket_data->outgoing, sequence_number); - printf("retransmit %d\n", packet_get_id(packet)); if (packet) { pq_get_order(packet, NULL, &data_length); @@ -1790,5 +1789,4 @@ /* Send the packet */ - printf("connecting %d\n", packet_get_id(packet)); tcp_send_packets(socket_data->device_id, packet); @@ -2004,5 +2002,5 @@ } -void tcp_send_packets(device_id_t device_id, packet_t *packet) +void tcp_send_packets(nic_device_id_t device_id, packet_t *packet) { packet_t *next; Index: uspace/srv/net/tl/tcp/tcp.h =================================================================== --- uspace/srv/net/tl/tcp/tcp.h (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/tl/tcp/tcp.h (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -182,5 +182,5 @@ /** Device identifier. */ - device_id_t device_id; + nic_device_id_t device_id; /** Index: uspace/srv/net/tl/udp/udp.c =================================================================== --- uspace/srv/net/tl/udp/udp.c (revision 8367d1d9f98b6155fea9c37ae61d6b4a04f542c2) +++ uspace/srv/net/tl/udp/udp.c (revision d7ff048e607498881d4ec1ce9b1a4c54d0713689) @@ -124,5 +124,5 @@ * ip_client_process_packet() function. */ -static int udp_process_packet(device_id_t device_id, packet_t *packet, +static int udp_process_packet(nic_device_id_t device_id, packet_t *packet, services_t error) { @@ -322,5 +322,5 @@ * udp_process_packet() function. */ -static int udp_received_msg(device_id_t device_id, packet_t *packet, +static int udp_received_msg(nic_device_id_t device_id, packet_t *packet, services_t receiver, services_t error) { @@ -499,5 +499,5 @@ void *ip_header; size_t headerlen; - device_id_t device_id; + nic_device_id_t device_id; packet_dimension_t *packet_dimension; size_t size; @@ -617,7 +617,6 @@ htons(flip_checksum(compact_checksum(checksum))); free(ip_header); - } else { - device_id = DEVICE_INVALID_ID; - } + } else + device_id = NIC_DEVICE_INVALID_ID; /* Prepare the first packet fragment */ @@ -806,5 +805,5 @@ size = MAX_UDP_FRAGMENT_SIZE; if (tl_get_ip_packet_dimension(udp_globals.ip_sess, - &udp_globals.dimensions, DEVICE_INVALID_ID, + &udp_globals.dimensions, NIC_DEVICE_INVALID_ID, &packet_dimension) == EOK) { if (packet_dimension->content < size)