Index: uspace/drv/bus/usb/usbhub/main.c =================================================================== --- uspace/drv/bus/usb/usbhub/main.c (revision fbe148ee3735664ea35954a309d7dbabc6164d7c) +++ uspace/drv/bus/usb/usbhub/main.c (revision 54d1ad9a396b4ef26e783ae3f06a210eae9793b5) @@ -47,5 +47,6 @@ * For more information see section 11.15.1 of USB 1.1 specification. */ -static usb_endpoint_description_t hub_status_change_endpoint_description = { +static const usb_endpoint_description_t hub_status_change_endpoint_description = +{ .transfer_type = USB_TRANSFER_INTERRUPT, .direction = USB_DIRECTION_IN, @@ -56,11 +57,8 @@ }; -/** - * USB hub driver operations - * - * The most important one is device_add, which is set to usb_hub_device_add. - */ -static usb_driver_ops_t usb_hub_driver_ops = { +/** USB hub driver operations. */ +static const usb_driver_ops_t usb_hub_driver_ops = { .device_add = usb_hub_device_add, +// .device_rem = usb_hub_device_remove, .device_gone = usb_hub_device_gone, }; @@ -72,10 +70,9 @@ }; /** Static usb hub driver information. */ -static usb_driver_t usb_hub_driver = { +static const usb_driver_t usb_hub_driver = { .name = NAME, .ops = &usb_hub_driver_ops, .endpoints = usb_hub_endpoints }; - int main(int argc, char *argv[]) Index: uspace/drv/bus/usb/usbhub/port.h =================================================================== --- uspace/drv/bus/usb/usbhub/port.h (revision fbe148ee3735664ea35954a309d7dbabc6164d7c) +++ uspace/drv/bus/usb/usbhub/port.h (revision 54d1ad9a396b4ef26e783ae3f06a210eae9793b5) @@ -44,5 +44,7 @@ /** Information about single port on a hub. */ typedef struct { + /* Port number as reporteed in descriptors. */ size_t port_number; + /** Device communication pipe. */ usb_pipe_t *control_pipe; /** Mutex needed not only by CV for checking port reset. */ Index: uspace/drv/bus/usb/usbhub/usbhub.c =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.c (revision fbe148ee3735664ea35954a309d7dbabc6164d7c) +++ uspace/drv/bus/usb/usbhub/usbhub.c (revision 54d1ad9a396b4ef26e783ae3f06a210eae9793b5) @@ -74,9 +74,133 @@ static void usb_hub_polling_terminated_callback(usb_device_t *device, bool was_error, void *data); -/** - * Initialize hub device driver fibril + +/** + * Initialize hub device driver structure. * * 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_device_add(usb_device_t *usb_dev) +{ + assert(usb_dev); + /* Create driver soft-state structure */ + usb_hub_dev_t *hub_dev = + usb_device_data_alloc(usb_dev, sizeof(usb_hub_dev_t)); + if (hub_dev == NULL) { + usb_log_error("Failed to create hub driver structure.\n"); + return ENOMEM; + } + hub_dev->usb_device = usb_dev; + hub_dev->pending_ops_count = 0; + hub_dev->running = false; + fibril_mutex_initialize(&hub_dev->pending_ops_mutex); + fibril_condvar_initialize(&hub_dev->pending_ops_cv); + + /* Create hc connection */ + usb_log_debug("Initializing USB wire abstraction.\n"); + int opResult = usb_hc_connection_initialize_from_device( + &hub_dev->connection, hub_dev->usb_device->ddf_dev); + if (opResult != EOK) { + usb_log_error("Could not initialize connection to device: %s\n", + str_error(opResult)); + 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)); + return opResult; + } + + /* Get port count and create attached_devices. */ + opResult = usb_hub_process_hub_specific_info(hub_dev); + if (opResult != EOK) { + usb_log_error("Could process hub specific info, %s\n", + str_error(opResult)); + return opResult; + } + + /* Create hub control function. */ + usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n"); + hub_dev->hub_fun = ddf_fun_create(hub_dev->usb_device->ddf_dev, + fun_exposed, HUB_FNC_NAME); + if (hub_dev->hub_fun == NULL) { + usb_log_error("Failed to create hub function.\n"); + return ENOMEM; + } + + /* Bind hub control function. */ + opResult = ddf_fun_bind(hub_dev->hub_fun); + if (opResult != EOK) { + usb_log_error("Failed to bind hub function: %s.\n", + str_error(opResult)); + ddf_fun_destroy(hub_dev->hub_fun); + return opResult; + } + + /* Start hub operation. */ + opResult = usb_device_auto_poll(hub_dev->usb_device, 0, + hub_port_changes_callback, ((hub_dev->port_count + 1 + 8) / 8), + usb_hub_polling_terminated_callback, hub_dev); + if (opResult != EOK) { + /* Function is already bound */ + ddf_fun_unbind(hub_dev->hub_fun); + ddf_fun_destroy(hub_dev->hub_fun); + usb_log_error("Failed to create polling fibril: %s.\n", + str_error(opResult)); + return opResult; + } + hub_dev->running = true; + usb_log_info("Controlling hub '%s' (%zu ports).\n", + hub_dev->usb_device->ddf_dev->name, hub_dev->port_count); + + return EOK; +} +/*----------------------------------------------------------------------------*/ +/** + * Turn off power to all ports. + * + * @param usb_dev generic usb device information + * @return error code + */ +int usb_hub_device_remove(usb_device_t *usb_dev) +{ + assert(usb_dev); + usb_hub_dev_t *hub_dev = usb_dev->driver_data; + assert(hub_dev); + //TODO: Cascade the call here. + //TODO: Enable after cascading is implemented. + return ENOTSUP; + if (!hub_dev->power_switched) { + /* That is all we can do. */ + return EOK; + } + int ret = EOK; + usb_log_info("Hub is about to be removed, powering down all ports.\n"); + for (size_t port = 0; port < hub_dev->port_count; ++port) { + usb_log_debug("Powering down port %zu.\n", port); + int pret = usb_hub_port_clear_feature( + &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER); + if (pret != EOK) { + usb_log_error("Cannot power down port %zu: %s.\n", + hub_dev->ports[port].port_number, str_error(pret)); + ret = pret; + } else { + if (!hub_dev->per_port_power) { + usb_log_debug("Ganged power switching mode, " + "one port is enough.\n"); + break; + } + } + } + return ret; +} +/*----------------------------------------------------------------------------*/ +/** + * Remove all attached devices * @param usb_dev generic usb device information * @return error code @@ -120,88 +244,4 @@ } /*----------------------------------------------------------------------------*/ -/** - * Initialize hub device driver fibril - * - * 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_device_add(usb_device_t *usb_dev) -{ - assert(usb_dev); - /* Create driver soft-state structure */ - usb_hub_dev_t *hub_dev = - usb_device_data_alloc(usb_dev, sizeof(usb_hub_dev_t)); - if (hub_dev == NULL) { - usb_log_error("Failed to create hun driver structure.\n"); - return ENOMEM; - } - hub_dev->usb_device = usb_dev; - hub_dev->pending_ops_count = 0; - hub_dev->running = false; - fibril_mutex_initialize(&hub_dev->pending_ops_mutex); - fibril_condvar_initialize(&hub_dev->pending_ops_cv); - - /* Create hc connection */ - usb_log_debug("Initializing USB wire abstraction.\n"); - int opResult = usb_hc_connection_initialize_from_device( - &hub_dev->connection, hub_dev->usb_device->ddf_dev); - if (opResult != EOK) { - usb_log_error("Could not initialize connection to device: %s\n", - str_error(opResult)); - 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)); - return opResult; - } - - /* Get port count and create attached_devices. */ - opResult = usb_hub_process_hub_specific_info(hub_dev); - if (opResult != EOK) { - usb_log_error("Could process hub specific info, %s\n", - str_error(opResult)); - return opResult; - } - - usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n"); - hub_dev->hub_fun = ddf_fun_create(hub_dev->usb_device->ddf_dev, - fun_exposed, HUB_FNC_NAME); - if (hub_dev->hub_fun == NULL) { - usb_log_error("Failed to create hub function.\n"); - return ENOMEM; - } - - opResult = ddf_fun_bind(hub_dev->hub_fun); - if (opResult != EOK) { - usb_log_error("Failed to bind hub function: %s.\n", - str_error(opResult)); - ddf_fun_destroy(hub_dev->hub_fun); - return opResult; - } - - opResult = usb_device_auto_poll(hub_dev->usb_device, 0, - hub_port_changes_callback, ((hub_dev->port_count + 1 + 8) / 8), - usb_hub_polling_terminated_callback, hub_dev); - if (opResult != EOK) { - /* Function is already bound */ - ddf_fun_unbind(hub_dev->hub_fun); - ddf_fun_destroy(hub_dev->hub_fun); - usb_log_error("Failed to create polling fibril: %s.\n", - str_error(opResult)); - return opResult; - } - hub_dev->running = true; - usb_log_info("Controlling hub '%s' (%zu ports).\n", - hub_dev->usb_device->ddf_dev->name, hub_dev->port_count); - - return EOK; -} -/*----------------------------------------------------------------------------*/ /** Callback for polling hub for changes. * @@ -284,29 +324,32 @@ } - const bool is_power_switched = + hub_dev->power_switched = !(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.characteristics - & HUB_CHAR_POWER_PER_PORT_FLAG; - - for (size_t port = 0; port < hub_dev->port_count; ++port) { - usb_log_debug("Powering port %zu.\n", port); - opResult = usb_hub_port_set_feature( - &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER); - if (opResult != EOK) { - usb_log_error("Cannot power on port %zu: %s.\n", - port, str_error(opResult)); - } else { - if (!per_port_power) { - usb_log_debug( - "Ganged power switching mode, " - "one port is enough.\n"); - break; - } + hub_dev->per_port_power = + descriptor.characteristics & HUB_CHAR_POWER_PER_PORT_FLAG; + + if (!hub_dev->power_switched) { + usb_log_info( + "Power switching not supported, ports always powered.\n"); + return EOK; + } + + usb_log_info("Hub port power switching enabled.\n"); + + for (size_t port = 0; port < hub_dev->port_count; ++port) { + usb_log_debug("Powering port %zu.\n", port); + const int ret = usb_hub_port_set_feature( + &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER); + + if (ret != EOK) { + usb_log_error("Cannot power on port %zu: %s.\n", + hub_dev->ports[port].port_number, str_error(ret)); + } else { + if (!hub_dev->per_port_power) { + usb_log_debug("Ganged power switching, " + "one port is enough.\n"); + break; } } - } else { - usb_log_debug("Power not switched, ports always powered\n"); } return EOK; @@ -375,28 +418,25 @@ 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. */ - for (size_t port = 0; port < hub_dev->port_count; ++port) { - const int opResult = usb_hub_port_set_feature( - &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER); - // TODO: consider power policy here - if (opResult != EOK) { - usb_log_warning( - "HUB OVER-CURRENT GONE: Cannot power on " - "port %zu; %s\n", - port, str_error(opResult)); - } - } - } - const int opResult = usb_request_clear_feature( - &hub_dev->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)); - } + return; + } + + /* Ports are always powered. */ + if (!hub_dev->power_switched) + return; + + /* Over-current condition is gone, it is safe to turn the ports on. */ + for (size_t port = 0; port < hub_dev->port_count; ++port) { + const int ret = usb_hub_port_set_feature( + &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER); + if (ret != EOK) { + usb_log_warning("HUB OVER-CURRENT GONE: Cannot power on" + " port %zu: %s\n", hub_dev->ports[port].port_number, + str_error(ret)); + } else { + if (!hub_dev->per_port_power) + return; + } + } + } /*----------------------------------------------------------------------------*/ @@ -434,4 +474,13 @@ if (status & USB_HUB_STATUS_C_OVER_CURRENT) { usb_hub_over_current(hub_dev, status); + /* Ack change in hub OC flag */ + const int ret = usb_request_clear_feature( + &hub_dev->usb_device->ctrl_pipe, USB_REQUEST_TYPE_CLASS, + USB_REQUEST_RECIPIENT_DEVICE, + USB_HUB_FEATURE_C_HUB_OVER_CURRENT, 0); + if (ret != EOK) { + usb_log_error("Failed to clear hub over-current " + "change flag: %s.\n", str_error(opResult)); + } } @@ -450,12 +499,11 @@ * Just ACK the change. */ - const int opResult = usb_request_clear_feature( + const int ret = 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)); + usb_log_error("Failed to clear hub power change " + "flag: %s.\n", str_error(ret)); } } Index: uspace/drv/bus/usb/usbhub/usbhub.h =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.h (revision fbe148ee3735664ea35954a309d7dbabc6164d7c) +++ uspace/drv/bus/usb/usbhub/usbhub.h (revision 54d1ad9a396b4ef26e783ae3f06a210eae9793b5) @@ -77,7 +77,12 @@ /** Status indicator */ bool running; + /** Hub supports port power switching. */ + bool power_switched; + /** Each port is switched individually. */ + bool per_port_power; }; int usb_hub_device_add(usb_device_t *usb_dev); +int usb_hub_device_remove(usb_device_t *usb_dev); int usb_hub_device_gone(usb_device_t *usb_dev);