Index: uspace/drv/usbhub/Makefile =================================================================== --- uspace/drv/usbhub/Makefile (revision 9f9b31ad6dd7b525ca41c274a515ef607f17e03b) +++ uspace/drv/usbhub/Makefile (revision 578a25473f8e3994840079948eef787f62b04e52) @@ -34,4 +34,5 @@ SOURCES = \ main.c \ + ports.c \ utils.c \ usbhub.c \ Index: uspace/drv/usbhub/ports.c =================================================================== --- uspace/drv/usbhub/ports.c (revision 578a25473f8e3994840079948eef787f62b04e52) +++ uspace/drv/usbhub/ports.c (revision 578a25473f8e3994840079948eef787f62b04e52) @@ -0,0 +1,283 @@ +/* + * 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 "port_status.h" +#include +#include +#include +#include +#include + +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; +} + +struct add_device_phase1 { + usb_hub_info_t *hub; + size_t port; + usb_speed_t speed; +}; + +static int enable_port_callback(int port_no, void *arg) +{ + usb_hub_info_t *hub = (usb_hub_info_t *) 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); + + /* Clear the port reset change. */ + rc = usb_hub_clear_port_feature(hub->control_pipe, + port_no, USB_HUB_FEATURE_C_PORT_RESET); + if (rc != EOK) { + usb_log_error("Failed to clear port %d reset feature: %s.\n", + port_no, str_error(rc)); + return rc; + } + + return EOK; +} + +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; + } + + data->hub->ports[data->port].attached_device.handle = child_handle; + data->hub->ports[data->port].attached_device.address = new_address; + + 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); + + return EOK; +} + +static int add_device_phase1_new_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_add_ready(fibril); + + return EOK; +} + +static void process_port_change(usb_hub_info_t *hub, size_t port) +{ + int rc; + + usb_port_status_t port_status; + + rc = get_port_status(&hub->usb_device->ctrl_pipe, port, &port_status); + if (rc != EOK) { + usb_log_error("Failed to get port %zu status: %s.\n", + port, str_error(rc)); + return; + } + + /* + * Check exact nature of the change. + */ + usb_log_debug("Port %zu change status: %x.\n", port, + (unsigned int) port_status); + + if (usb_port_connect_change(&port_status)) { + bool device_connected = usb_port_dev_connected(&port_status); + usb_log_debug("Connection change on port %zu: %s.\n", port, + device_connected ? "device attached" : "device removed"); + + if (device_connected) { + rc = add_device_phase1_new_fibril(hub, port, + usb_port_speed(&port_status)); + if (rc != EOK) { + usb_log_error( + "Cannot handle change on port %zu: %s.\n", + str_error(rc)); + } + } else { + usb_hub_removed_device(hub, port); + } + } + + if (usb_port_overcurrent_change(&port_status)) { + if (usb_port_over_current(&port_status)) { + usb_log_warning("Overcurrent on port %zu.\n", port); + usb_hub_over_current(hub, port); + } else { + usb_log_debug("Overcurrent on port %zu autoresolved.\n", + port); + } + } + + if (usb_port_reset_completed(&port_status)) { + usb_log_debug("Port %zu reset complete.\n", port); + if (usb_port_enabled(&port_status)) { + /* Finalize device adding. */ + usb_hub_port_t *the_port = hub->ports + port; + fibril_mutex_lock(&the_port->reset_mutex); + the_port->reset_completed = 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", + port); + } + } + + usb_port_set_connect_change(&port_status, false); + usb_port_set_reset(&port_status, false); + usb_port_set_reset_completed(&port_status, false); + usb_port_set_dev_connected(&port_status, false); + if (port_status >> 16) { + usb_log_warning("Unsupported change on port %zu: %x.\n", + port, (unsigned int) port_status); + } +} + +bool hub_port_changes_callback(usb_device_t *dev, + uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) +{ + usb_hub_info_t *hub = (usb_hub_info_t *) arg; + + /* FIXME: check that we received enough bytes. */ + if (change_bitmap_size == 0) { + goto leave; + } + + size_t port; + for (port = 1; port < hub->port_count + 1; port++) { + bool change = (change_bitmap[port / 8] >> (port % 8)) % 2; + if (change) { + process_port_change(hub, port); + } + } + + +leave: + /* FIXME: proper interval. */ + async_usleep(1000 * 1000 * 10 ); + + return true; +} + + +/** + * @} + */ Index: uspace/drv/usbhub/ports.h =================================================================== --- uspace/drv/usbhub/ports.h (revision 578a25473f8e3994840079948eef787f62b04e52) +++ uspace/drv/usbhub/ports.h (revision 578a25473f8e3994840079948eef787f62b04e52) @@ -0,0 +1,68 @@ +/* + * 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 +#include +#include + +#include + +#include +#include + +typedef struct { + fibril_mutex_t reset_mutex; + fibril_condvar_t reset_cv; + usb_hc_attached_device_t attached_device; + bool reset_completed; +} usb_hub_port_t; + +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); +} + +bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t, void *); + + +#endif +/** + * @} + */ Index: uspace/drv/usbhub/usbhub.c =================================================================== --- uspace/drv/usbhub/usbhub.c (revision 9f9b31ad6dd7b525ca41c274a515ef607f17e03b) +++ uspace/drv/usbhub/usbhub.c (revision 578a25473f8e3994840079948eef787f62b04e52) @@ -54,10 +54,11 @@ -static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port, - usb_speed_t speed); +//static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port, +// usb_speed_t speed); static int usb_hub_trigger_connecting_non_removable_devices( usb_hub_info_t * hub, usb_hub_descriptor_t * descriptor); +#if 0 /** * control loop running in hub`s fibril @@ -81,4 +82,5 @@ return 0; } +#endif @@ -152,10 +154,8 @@ usb_log_debug("setting port count to %d\n",descriptor->ports_count); hub_info->port_count = descriptor->ports_count; - hub_info->attached_devs = (usb_hc_attached_device_t*) - malloc((hub_info->port_count+1) * sizeof(usb_hc_attached_device_t)); - int i; - for(i=0;iport_count+1;++i){ - hub_info->attached_devs[i].handle=0; - hub_info->attached_devs[i].address=0; + hub_info->ports = malloc(sizeof(usb_hub_port_t) * (hub_info->port_count+1)); + size_t port; + for (port = 0; port < hub_info->port_count + 1; port++) { + usb_hub_port_init(&hub_info->ports[port]); } //handle non-removable devices @@ -259,16 +259,44 @@ assert(rc == EOK); - //create fibril for the hub control loop - fid_t fid = fibril_create(usb_hub_control_loop, hub_info); - if (fid == 0) { - usb_log_error("failed to start monitoring fibril for new hub.\n"); - return ENOMEM; - } - fibril_add_ready(fid); - usb_log_debug("Hub fibril created.\n"); + /* + * The processing will require opened control pipe and connection + * to the host controller. + * It is waste of resources but let's hope there will be less + * hubs than the phone limit. + * FIXME: with some proper locking over pipes and session + * auto destruction, this could work better. + */ + rc = usb_pipe_start_session(&usb_dev->ctrl_pipe); + if (rc != EOK) { + usb_log_error("Failed to start session on control pipe: %s.\n", + str_error(rc)); + goto leave; + } + rc = usb_hc_connection_open(&hub_info->connection); + if (rc != EOK) { + usb_pipe_end_session(&usb_dev->ctrl_pipe); + usb_log_error("Failed to open connection to HC: %s.\n", + str_error(rc)); + goto leave; + } + + rc = usb_device_auto_poll(hub_info->usb_device, 0, + hub_port_changes_callback, ((hub_info->port_count+1) / 8) + 1, + NULL, 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' (%d ports).\n", hub_info->usb_device->ddf_dev->name, hub_info->port_count); return EOK; + +leave: + free(hub_info); + + return rc; } @@ -399,4 +427,5 @@ } +#if 0 /** * Reset the port with new device and reserve the default address. @@ -440,5 +469,7 @@ return; } - +#endif + +#if 0 /** * Finalize adding new device after port reset @@ -529,4 +560,5 @@ new_device_address, child_handle); } +#endif /** @@ -539,5 +571,5 @@ * @param port port number, starting from 1 */ -static void usb_hub_removed_device( +void usb_hub_removed_device( usb_hub_info_t * hub,uint16_t port) { @@ -552,5 +584,5 @@ //close address - if(hub->attached_devs[port].address!=0){ + if(hub->ports[port].attached_device.address >= 0){ /*uncomment this code to use it when DDF allows device removal opResult = usb_hc_unregister_device( @@ -579,5 +611,5 @@ * @param port port number, starting from 1 */ -static void usb_hub_over_current( usb_hub_info_t * hub, +void usb_hub_over_current( usb_hub_info_t * hub, uint16_t port){ int opResult; @@ -590,4 +622,5 @@ } +#if 0 /** * Process interrupts on given hub port @@ -737,5 +770,5 @@ return EOK; } - +#endif Index: uspace/drv/usbhub/usbhub.h =================================================================== --- uspace/drv/usbhub/usbhub.h (revision 9f9b31ad6dd7b525ca41c274a515ef607f17e03b) +++ uspace/drv/usbhub/usbhub.h (revision 578a25473f8e3994840079948eef787f62b04e52) @@ -47,12 +47,15 @@ #include +#include "ports.h" + + /** Information about attached hub. */ typedef struct { /** Number of ports. */ - int port_count; + size_t port_count; - /** attached device handles, for each port one */ - usb_hc_attached_device_t * attached_devs; + /** Ports. */ + usb_hub_port_t *ports; /** connection to hcd */ @@ -100,4 +103,6 @@ int usb_hub_check_hub_changes(usb_hub_info_t * hub_info_param); +void usb_hub_removed_device(usb_hub_info_t *, uint16_t); +void usb_hub_over_current(usb_hub_info_t *, uint16_t); int usb_hub_add_device(usb_device_t * usb_dev);