Index: uspace/drv/uhci-hcd/Makefile =================================================================== --- uspace/drv/uhci-hcd/Makefile (revision c56c5b5b306dd05373aa73c0404742419a4e0cae) +++ uspace/drv/uhci-hcd/Makefile (revision c01cd32983241e62b21a5da0077ac54000bc035e) @@ -37,5 +37,5 @@ transfer_list.c \ uhci.c \ - uhci_hc.c \ + hc.c \ uhci_rh.c \ uhci_struct/transfer_descriptor.c \ Index: uspace/drv/uhci-hcd/batch.c =================================================================== --- uspace/drv/uhci-hcd/batch.c (revision c56c5b5b306dd05373aa73c0404742419a4e0cae) +++ uspace/drv/uhci-hcd/batch.c (revision c01cd32983241e62b21a5da0077ac54000bc035e) @@ -40,5 +40,4 @@ #include "batch.h" #include "transfer_list.h" -#include "uhci_hc.h" #include "utils/malloc32.h" #include "uhci_struct/transfer_descriptor.h" Index: uspace/drv/uhci-hcd/hc.c =================================================================== --- uspace/drv/uhci-hcd/hc.c (revision c01cd32983241e62b21a5da0077ac54000bc035e) +++ uspace/drv/uhci-hcd/hc.c (revision c01cd32983241e62b21a5da0077ac54000bc035e) @@ -0,0 +1,499 @@ +/* + * 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 drvusbuhcihc + * @{ + */ +/** @file + * @brief UHCI Host controller driver routines + */ +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "hc.h" + +static irq_cmd_t uhci_cmds[] = { + { + .cmd = CMD_PIO_READ_16, + .addr = NULL, /* patched for every instance */ + .dstarg = 1 + }, + { + .cmd = CMD_PIO_WRITE_16, + .addr = NULL, /* pathed for every instance */ + .value = 0x1f + }, + { + .cmd = CMD_ACCEPT + } +}; +/*----------------------------------------------------------------------------*/ +static int hc_init_transfer_lists(hc_t *instance); +static int hc_init_mem_structures(hc_t *instance); +static void hc_init_hw(hc_t *instance); + +static int hc_interrupt_emulator(void *arg); +static int hc_debug_checker(void *arg); + +static bool allowed_usb_packet( + bool low_speed, usb_transfer_type_t transfer, size_t size); +/*----------------------------------------------------------------------------*/ +/** Initialize UHCI hcd driver structure + * + * @param[in] instance Memory place to initialize. + * @param[in] fun DDF function. + * @param[in] regs Address of I/O control registers. + * @param[in] size Size of I/O control registers. + * @return Error code. + * @note Should be called only once on any structure. + * + * Initializes memory structures, starts up hw, and launches debugger and + * interrupt fibrils. + */ +int hc_init(hc_t *instance, ddf_fun_t *fun, + void *regs, size_t reg_size, bool interrupts) +{ + assert(reg_size >= sizeof(regs_t)); + int ret; + +#define CHECK_RET_DEST_FUN_RETURN(ret, message...) \ + if (ret != EOK) { \ + usb_log_error(message); \ + if (instance->ddf_instance) \ + ddf_fun_destroy(instance->ddf_instance); \ + return ret; \ + } else (void) 0 + + instance->hw_interrupts = interrupts; + instance->hw_failures = 0; + + /* Setup UHCI function. */ + instance->ddf_instance = fun; + + /* allow access to hc control registers */ + regs_t *io; + ret = pio_enable(regs, reg_size, (void**)&io); + CHECK_RET_DEST_FUN_RETURN(ret, + "Failed(%d) to gain access to registers at %p: %s.\n", + ret, str_error(ret), io); + instance->registers = io; + usb_log_debug("Device registers at %p(%u) accessible.\n", + io, reg_size); + + ret = hc_init_mem_structures(instance); + CHECK_RET_DEST_FUN_RETURN(ret, + "Failed to initialize UHCI memory structures.\n"); + + hc_init_hw(instance); + if (!interrupts) { + instance->cleaner = + fibril_create(hc_interrupt_emulator, instance); + fibril_add_ready(instance->cleaner); + } else { + /* TODO: enable interrupts here */ + } + + instance->debug_checker = + fibril_create(hc_debug_checker, instance); +// fibril_add_ready(instance->debug_checker); + + return EOK; +#undef CHECK_RET_DEST_FUN_RETURN +} +/*----------------------------------------------------------------------------*/ +/** Initialize UHCI hc hw resources. + * + * @param[in] instance UHCI structure to use. + * For magic values see UHCI Design Guide + */ +void hc_init_hw(hc_t *instance) +{ + assert(instance); + regs_t *registers = instance->registers; + + /* Reset everything, who knows what touched it before us */ + pio_write_16(®isters->usbcmd, UHCI_CMD_GLOBAL_RESET); + async_usleep(10000); /* 10ms according to USB spec */ + pio_write_16(®isters->usbcmd, 0); + + /* Reset hc, all states and counters */ + pio_write_16(®isters->usbcmd, UHCI_CMD_HCRESET); + do { async_usleep(10); } + while ((pio_read_16(®isters->usbcmd) & UHCI_CMD_HCRESET) != 0); + + /* Set frame to exactly 1ms */ + pio_write_8(®isters->sofmod, 64); + + /* Set frame list pointer */ + const uint32_t pa = addr_to_phys(instance->frame_list); + pio_write_32(®isters->flbaseadd, pa); + + if (instance->hw_interrupts) { + /* Enable all interrupts, but resume interrupt */ + pio_write_16(&instance->registers->usbintr, + UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET); + } + + uint16_t status = pio_read_16(®isters->usbcmd); + if (status != 0) + usb_log_warning("Previous command value: %x.\n", status); + + /* Start the hc with large(64B) packet FSBR */ + pio_write_16(®isters->usbcmd, + UHCI_CMD_RUN_STOP | UHCI_CMD_MAX_PACKET | UHCI_CMD_CONFIGURE); +} +/*----------------------------------------------------------------------------*/ +/** Initialize UHCI hc memory structures. + * + * @param[in] instance UHCI structure to use. + * @return Error code + * @note Should be called only once on any structure. + * + * Structures: + * - interrupt code (I/O addressses are customized per instance) + * - transfer lists (queue heads need to be accessible by the hw) + * - frame list page (needs to be one UHCI hw accessible 4K page) + */ +int hc_init_mem_structures(hc_t *instance) +{ + assert(instance); +#define CHECK_RET_DEST_CMDS_RETURN(ret, message...) \ + if (ret != EOK) { \ + usb_log_error(message); \ + if (instance->interrupt_code.cmds != NULL) \ + free(instance->interrupt_code.cmds); \ + return ret; \ + } else (void) 0 + + /* Init interrupt code */ + instance->interrupt_code.cmds = malloc(sizeof(uhci_cmds)); + int ret = (instance->interrupt_code.cmds == NULL) ? ENOMEM : EOK; + CHECK_RET_DEST_CMDS_RETURN(ret, + "Failed to allocate interrupt cmds space.\n"); + + { + irq_cmd_t *interrupt_commands = instance->interrupt_code.cmds; + memcpy(interrupt_commands, uhci_cmds, sizeof(uhci_cmds)); + interrupt_commands[0].addr = + (void*)&instance->registers->usbsts; + interrupt_commands[1].addr = + (void*)&instance->registers->usbsts; + instance->interrupt_code.cmdcount = + sizeof(uhci_cmds) / sizeof(irq_cmd_t); + } + + /* Init transfer lists */ + ret = hc_init_transfer_lists(instance); + CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to init transfer lists.\n"); + usb_log_debug("Initialized transfer lists.\n"); + + /* Init USB frame list page*/ + instance->frame_list = get_page(); + ret = instance ? EOK : ENOMEM; + CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to get frame list page.\n"); + usb_log_debug("Initialized frame list.\n"); + + /* Set all frames to point to the first queue head */ + const uint32_t queue = + instance->transfers_interrupt.queue_head_pa + | LINK_POINTER_QUEUE_HEAD_FLAG; + + unsigned i = 0; + for(; i < UHCI_FRAME_LIST_COUNT; ++i) { + instance->frame_list[i] = queue; + } + + /* Init device keeper*/ + usb_device_keeper_init(&instance->device_manager); + usb_log_debug("Initialized device manager.\n"); + + return EOK; +#undef CHECK_RET_DEST_CMDS_RETURN +} +/*----------------------------------------------------------------------------*/ +/** Initialize UHCI hc transfer lists. + * + * @param[in] instance UHCI structure to use. + * @return Error code + * @note Should be called only once on any structure. + * + * Initializes transfer lists and sets them in one chain to support proper + * USB scheduling. Sets pointer table for quick access. + */ +int hc_init_transfer_lists(hc_t *instance) +{ + assert(instance); +#define CHECK_RET_CLEAR_RETURN(ret, message...) \ + if (ret != EOK) { \ + usb_log_error(message); \ + transfer_list_fini(&instance->transfers_bulk_full); \ + transfer_list_fini(&instance->transfers_control_full); \ + transfer_list_fini(&instance->transfers_control_slow); \ + transfer_list_fini(&instance->transfers_interrupt); \ + return ret; \ + } else (void) 0 + + /* initialize TODO: check errors */ + int ret; + ret = transfer_list_init(&instance->transfers_bulk_full, "BULK_FULL"); + CHECK_RET_CLEAR_RETURN(ret, "Failed to init BULK list."); + + ret = transfer_list_init( + &instance->transfers_control_full, "CONTROL_FULL"); + CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL FULL list."); + + ret = transfer_list_init( + &instance->transfers_control_slow, "CONTROL_SLOW"); + CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL SLOW list."); + + ret = transfer_list_init(&instance->transfers_interrupt, "INTERRUPT"); + CHECK_RET_CLEAR_RETURN(ret, "Failed to init INTERRUPT list."); + + transfer_list_set_next(&instance->transfers_control_full, + &instance->transfers_bulk_full); + transfer_list_set_next(&instance->transfers_control_slow, + &instance->transfers_control_full); + transfer_list_set_next(&instance->transfers_interrupt, + &instance->transfers_control_slow); + + /*FSBR*/ +#ifdef FSBR + transfer_list_set_next(&instance->transfers_bulk_full, + &instance->transfers_control_full); +#endif + + /* Assign pointers to be used during scheduling */ + instance->transfers[USB_SPEED_FULL][USB_TRANSFER_INTERRUPT] = + &instance->transfers_interrupt; + instance->transfers[USB_SPEED_LOW][USB_TRANSFER_INTERRUPT] = + &instance->transfers_interrupt; + instance->transfers[USB_SPEED_FULL][USB_TRANSFER_CONTROL] = + &instance->transfers_control_full; + instance->transfers[USB_SPEED_LOW][USB_TRANSFER_CONTROL] = + &instance->transfers_control_slow; + instance->transfers[USB_SPEED_FULL][USB_TRANSFER_BULK] = + &instance->transfers_bulk_full; + + return EOK; +#undef CHECK_RET_CLEAR_RETURN +} +/*----------------------------------------------------------------------------*/ +/** Schedule batch for execution. + * + * @param[in] instance UHCI structure to use. + * @param[in] batch Transfer batch to schedule. + * @return Error code + * + * Checks for bandwidth availability and appends the batch to the proper queue. + */ +int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch) +{ + assert(instance); + assert(batch); + const int low_speed = (batch->speed == USB_SPEED_LOW); + if (!allowed_usb_packet( + low_speed, batch->transfer_type, batch->max_packet_size)) { + usb_log_warning( + "Invalid USB packet specified %s SPEED %d %zu.\n", + low_speed ? "LOW" : "FULL" , batch->transfer_type, + batch->max_packet_size); + return ENOTSUP; + } + /* TODO: check available bandwidth here */ + + transfer_list_t *list = + instance->transfers[batch->speed][batch->transfer_type]; + assert(list); + transfer_list_add_batch(list, batch); + + return EOK; +} +/*----------------------------------------------------------------------------*/ +/** Take action based on the interrupt cause. + * + * @param[in] instance UHCI structure to use. + * @param[in] status Value of the status register at the time of interrupt. + * + * Interrupt might indicate: + * - transaction completed, either by triggering IOC, SPD, or an error + * - some kind of device error + * - resume from suspend state (not implemented) + */ +void hc_interrupt(hc_t *instance, uint16_t status) +{ + assert(instance); + /* TODO: Resume interrupts are not supported */ + /* Lower 2 bits are transaction error and transaction complete */ + if (status & 0x3) { + transfer_list_remove_finished(&instance->transfers_interrupt); + transfer_list_remove_finished(&instance->transfers_control_slow); + transfer_list_remove_finished(&instance->transfers_control_full); + transfer_list_remove_finished(&instance->transfers_bulk_full); + } + /* bits 4 and 5 indicate hc error */ + if (status & 0x18) { + usb_log_error("UHCI hardware failure!.\n"); + ++instance->hw_failures; + transfer_list_abort_all(&instance->transfers_interrupt); + transfer_list_abort_all(&instance->transfers_control_slow); + transfer_list_abort_all(&instance->transfers_control_full); + transfer_list_abort_all(&instance->transfers_bulk_full); + + if (instance->hw_failures < UHCI_ALLOWED_HW_FAIL) { + /* reinitialize hw, this triggers virtual disconnect*/ + hc_init_hw(instance); + } else { + usb_log_fatal("Too many UHCI hardware failures!.\n"); + hc_fini(instance); + } + } +} +/*----------------------------------------------------------------------------*/ +/** Polling function, emulates interrupts. + * + * @param[in] arg UHCI hc structure to use. + * @return EOK (should never return) + */ +int hc_interrupt_emulator(void* arg) +{ + usb_log_debug("Started interrupt emulator.\n"); + hc_t *instance = (hc_t*)arg; + assert(instance); + + while (1) { + /* read and ack interrupts */ + uint16_t status = pio_read_16(&instance->registers->usbsts); + pio_write_16(&instance->registers->usbsts, 0x1f); + if (status != 0) + usb_log_debug2("UHCI status: %x.\n", status); + hc_interrupt(instance, status); + async_usleep(UHCI_CLEANER_TIMEOUT); + } + return EOK; +} +/*---------------------------------------------------------------------------*/ +/** Debug function, checks consistency of memory structures. + * + * @param[in] arg UHCI structure to use. + * @return EOK (should never return) + */ +int hc_debug_checker(void *arg) +{ + hc_t *instance = (hc_t*)arg; + assert(instance); + +#define QH(queue) \ + instance->transfers_##queue.queue_head + + while (1) { + const uint16_t cmd = pio_read_16(&instance->registers->usbcmd); + const uint16_t sts = pio_read_16(&instance->registers->usbsts); + const uint16_t intr = + pio_read_16(&instance->registers->usbintr); + + if (((cmd & UHCI_CMD_RUN_STOP) != 1) || (sts != 0)) { + usb_log_debug2("Command: %X Status: %X Intr: %x\n", + cmd, sts, intr); + } + + uintptr_t frame_list = + pio_read_32(&instance->registers->flbaseadd) & ~0xfff; + if (frame_list != addr_to_phys(instance->frame_list)) { + usb_log_debug("Framelist address: %p vs. %p.\n", + frame_list, addr_to_phys(instance->frame_list)); + } + + int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff; + + uintptr_t expected_pa = instance->frame_list[frnum] + & LINK_POINTER_ADDRESS_MASK; + uintptr_t real_pa = addr_to_phys(QH(interrupt)); + if (expected_pa != real_pa) { + usb_log_debug("Interrupt QH: %p(frame: %d) vs. %p.\n", + expected_pa, frnum, real_pa); + } + + expected_pa = QH(interrupt)->next & LINK_POINTER_ADDRESS_MASK; + real_pa = addr_to_phys(QH(control_slow)); + if (expected_pa != real_pa) { + usb_log_debug("Control Slow QH: %p vs. %p.\n", + expected_pa, real_pa); + } + + expected_pa = QH(control_slow)->next & LINK_POINTER_ADDRESS_MASK; + real_pa = addr_to_phys(QH(control_full)); + if (expected_pa != real_pa) { + usb_log_debug("Control Full QH: %p vs. %p.\n", + expected_pa, real_pa); + } + + expected_pa = QH(control_full)->next & LINK_POINTER_ADDRESS_MASK; + real_pa = addr_to_phys(QH(bulk_full)); + if (expected_pa != real_pa ) { + usb_log_debug("Bulk QH: %p vs. %p.\n", + expected_pa, real_pa); + } + async_usleep(UHCI_DEBUGER_TIMEOUT); + } + return EOK; +#undef QH +} +/*----------------------------------------------------------------------------*/ +/** Check transfer packets, for USB validity + * + * @param[in] low_speed Transfer speed. + * @param[in] transfer Transer type + * @param[in] size Maximum size of used packets + * @return True if transaction is allowed by USB specs, false otherwise + */ +bool allowed_usb_packet( + bool low_speed, usb_transfer_type_t transfer, size_t size) +{ + /* see USB specification chapter 5.5-5.8 for magic numbers used here */ + switch(transfer) + { + case USB_TRANSFER_ISOCHRONOUS: + return (!low_speed && size < 1024); + case USB_TRANSFER_INTERRUPT: + return size <= (low_speed ? 8 : 64); + case USB_TRANSFER_CONTROL: /* device specifies its own max size */ + return (size <= (low_speed ? 8 : 64)); + case USB_TRANSFER_BULK: /* device specifies its own max size */ + return (!low_speed && size <= 64); + } + return false; +} +/** + * @} + */ Index: uspace/drv/uhci-hcd/hc.h =================================================================== --- uspace/drv/uhci-hcd/hc.h (revision c01cd32983241e62b21a5da0077ac54000bc035e) +++ uspace/drv/uhci-hcd/hc.h (revision c01cd32983241e62b21a5da0077ac54000bc035e) @@ -0,0 +1,131 @@ +/* + * 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 drvusbuhcihc + * @{ + */ +/** @file + * @brief UHCI host controller driver structure + */ +#ifndef DRV_UHCI_UHCI_HC_H +#define DRV_UHCI_UHCI_HC_H + +#include +#include +#include +#include + +#include +#include + +#include "batch.h" +#include "transfer_list.h" + +typedef struct uhci_regs { + uint16_t usbcmd; +#define UHCI_CMD_MAX_PACKET (1 << 7) +#define UHCI_CMD_CONFIGURE (1 << 6) +#define UHCI_CMD_DEBUG (1 << 5) +#define UHCI_CMD_FORCE_GLOBAL_RESUME (1 << 4) +#define UHCI_CMD_FORCE_GLOBAL_SUSPEND (1 << 3) +#define UHCI_CMD_GLOBAL_RESET (1 << 2) +#define UHCI_CMD_HCRESET (1 << 1) +#define UHCI_CMD_RUN_STOP (1 << 0) + + uint16_t usbsts; +#define UHCI_STATUS_HALTED (1 << 5) +#define UHCI_STATUS_PROCESS_ERROR (1 << 4) +#define UHCI_STATUS_SYSTEM_ERROR (1 << 3) +#define UHCI_STATUS_RESUME (1 << 2) +#define UHCI_STATUS_ERROR_INTERRUPT (1 << 1) +#define UHCI_STATUS_INTERRUPT (1 << 0) + + uint16_t usbintr; +#define UHCI_INTR_SHORT_PACKET (1 << 3) +#define UHCI_INTR_COMPLETE (1 << 2) +#define UHCI_INTR_RESUME (1 << 1) +#define UHCI_INTR_CRC (1 << 0) + + uint16_t frnum; + uint32_t flbaseadd; + uint8_t sofmod; +} regs_t; + +#define UHCI_FRAME_LIST_COUNT 1024 +#define UHCI_CLEANER_TIMEOUT 10000 +#define UHCI_DEBUGER_TIMEOUT 5000000 +#define UHCI_ALLOWED_HW_FAIL 5 + +typedef struct hc { + usb_device_keeper_t device_manager; + + regs_t *registers; + + link_pointer_t *frame_list; + + transfer_list_t transfers_bulk_full; + transfer_list_t transfers_control_full; + transfer_list_t transfers_control_slow; + transfer_list_t transfers_interrupt; + + transfer_list_t *transfers[2][4]; + + irq_code_t interrupt_code; + + fid_t cleaner; + fid_t debug_checker; + bool hw_interrupts; + unsigned hw_failures; + + ddf_fun_t *ddf_instance; +} hc_t; + +int hc_init(hc_t *instance, ddf_fun_t *fun, + void *regs, size_t reg_size, bool interupts); + +int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch); + +void hc_interrupt(hc_t *instance, uint16_t status); + +/** Safely dispose host controller internal structures + * + * @param[in] instance Host controller structure to use. + */ +static inline void hc_fini(hc_t *instance) { /* TODO: implement*/ }; + +/** Get and cast pointer to the driver data + * + * @param[in] fun DDF function pointer + * @return cast pointer to driver_data + */ +static inline hc_t * fun_to_hc(ddf_fun_t *fun) + { return (hc_t*)fun->driver_data; } +#endif +/** + * @} + */ Index: uspace/drv/uhci-hcd/iface.c =================================================================== --- uspace/drv/uhci-hcd/iface.c (revision c56c5b5b306dd05373aa73c0404742419a4e0cae) +++ uspace/drv/uhci-hcd/iface.c (revision c01cd32983241e62b21a5da0077ac54000bc035e) @@ -40,5 +40,5 @@ #include "iface.h" -#include "uhci_hc.h" +#include "hc.h" /** Reserve default address interface function @@ -52,5 +52,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); usb_log_debug("Default address request with speed %d.\n", speed); @@ -67,5 +67,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); usb_log_debug("Default address release.\n"); @@ -85,5 +85,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); assert(address); @@ -108,5 +108,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); usb_log_debug("Address bind %d-%d.\n", address, handle); @@ -124,5 +124,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); usb_log_debug("Address release %d.\n", address); @@ -147,5 +147,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); @@ -160,5 +160,5 @@ return ENOMEM; batch_interrupt_out(batch); - const int ret = uhci_hc_schedule(hc, batch); + const int ret = hc_schedule(hc, batch); if (ret != EOK) { batch_dispose(batch); @@ -184,5 +184,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); @@ -196,5 +196,5 @@ return ENOMEM; batch_interrupt_in(batch); - const int ret = uhci_hc_schedule(hc, batch); + const int ret = hc_schedule(hc, batch); if (ret != EOK) { batch_dispose(batch); @@ -220,5 +220,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); @@ -233,5 +233,5 @@ return ENOMEM; batch_bulk_out(batch); - const int ret = uhci_hc_schedule(hc, batch); + const int ret = hc_schedule(hc, batch); if (ret != EOK) { batch_dispose(batch); @@ -257,5 +257,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); @@ -269,5 +269,5 @@ return ENOMEM; batch_bulk_in(batch); - const int ret = uhci_hc_schedule(hc, batch); + const int ret = hc_schedule(hc, batch); if (ret != EOK) { batch_dispose(batch); @@ -296,5 +296,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); @@ -312,5 +312,5 @@ usb_device_keeper_reset_if_need(&hc->device_manager, target, setup_data); batch_control_write(batch); - const int ret = uhci_hc_schedule(hc, batch); + const int ret = hc_schedule(hc, batch); if (ret != EOK) { batch_dispose(batch); @@ -339,5 +339,5 @@ { assert(fun); - uhci_hc_t *hc = fun_to_uhci_hc(fun); + hc_t *hc = fun_to_hc(fun); assert(hc); usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); @@ -351,13 +351,13 @@ return ENOMEM; batch_control_read(batch); - const int ret = uhci_hc_schedule(hc, batch); - if (ret != EOK) { - batch_dispose(batch); - return ret; - } - return EOK; -} -/*----------------------------------------------------------------------------*/ -usbhc_iface_t uhci_hc_iface = { + const int ret = hc_schedule(hc, batch); + if (ret != EOK) { + batch_dispose(batch); + return ret; + } + return EOK; +} +/*----------------------------------------------------------------------------*/ +usbhc_iface_t hc_iface = { .reserve_default_address = reserve_default_address, .release_default_address = release_default_address, Index: uspace/drv/uhci-hcd/iface.h =================================================================== --- uspace/drv/uhci-hcd/iface.h (revision c56c5b5b306dd05373aa73c0404742419a4e0cae) +++ uspace/drv/uhci-hcd/iface.h (revision c01cd32983241e62b21a5da0077ac54000bc035e) @@ -38,5 +38,5 @@ #include -extern usbhc_iface_t uhci_hc_iface; +extern usbhc_iface_t hc_iface; #endif Index: uspace/drv/uhci-hcd/uhci.c =================================================================== --- uspace/drv/uhci-hcd/uhci.c (revision c56c5b5b306dd05373aa73c0404742419a4e0cae) +++ uspace/drv/uhci-hcd/uhci.c (revision c01cd32983241e62b21a5da0077ac54000bc035e) @@ -54,8 +54,8 @@ { assert(dev); - uhci_hc_t *hc = &((uhci_t*)dev->driver_data)->hc; + hc_t *hc = &((uhci_t*)dev->driver_data)->hc; uint16_t status = IPC_GET_ARG1(*call); assert(hc); - uhci_hc_interrupt(hc, status); + hc_interrupt(hc, status); } /*----------------------------------------------------------------------------*/ @@ -107,7 +107,7 @@ }; /*----------------------------------------------------------------------------*/ -static ddf_dev_ops_t uhci_hc_ops = { +static ddf_dev_ops_t hc_ops = { .interfaces[USB_DEV_IFACE] = &usb_iface, - .interfaces[USBHC_DEV_IFACE] = &uhci_hc_iface, /* see iface.h/c */ + .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */ }; /*----------------------------------------------------------------------------*/ @@ -190,8 +190,8 @@ "Failed(%d) to create HC function.\n", ret); - ret = uhci_hc_init(&instance->hc, instance->hc_fun, + ret = hc_init(&instance->hc, instance->hc_fun, (void*)io_reg_base, io_reg_size, interrupts); CHECK_RET_DEST_FUN_RETURN(ret, "Failed(%d) to init uhci-hcd.\n", ret); - instance->hc_fun->ops = &uhci_hc_ops; + instance->hc_fun->ops = &hc_ops; instance->hc_fun->driver_data = &instance->hc; ret = ddf_fun_bind(instance->hc_fun); @@ -208,5 +208,5 @@ if (instance->rh_fun) \ ddf_fun_destroy(instance->rh_fun); \ - uhci_hc_fini(&instance->hc); \ + hc_fini(&instance->hc); \ return ret; \ } Index: uspace/drv/uhci-hcd/uhci.h =================================================================== --- uspace/drv/uhci-hcd/uhci.h (revision c56c5b5b306dd05373aa73c0404742419a4e0cae) +++ uspace/drv/uhci-hcd/uhci.h (revision c01cd32983241e62b21a5da0077ac54000bc035e) @@ -38,5 +38,5 @@ #include -#include "uhci_hc.h" +#include "hc.h" #include "uhci_rh.h" @@ -45,5 +45,5 @@ ddf_fun_t *rh_fun; - uhci_hc_t hc; + hc_t hc; uhci_rh_t rh; } uhci_t; Index: pace/drv/uhci-hcd/uhci_hc.c =================================================================== --- uspace/drv/uhci-hcd/uhci_hc.c (revision c56c5b5b306dd05373aa73c0404742419a4e0cae) +++ (revision ) @@ -1,499 +1,0 @@ -/* - * 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 drvusbuhcihc - * @{ - */ -/** @file - * @brief UHCI Host controller driver routines - */ -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "uhci_hc.h" - -static irq_cmd_t uhci_cmds[] = { - { - .cmd = CMD_PIO_READ_16, - .addr = NULL, /* patched for every instance */ - .dstarg = 1 - }, - { - .cmd = CMD_PIO_WRITE_16, - .addr = NULL, /* pathed for every instance */ - .value = 0x1f - }, - { - .cmd = CMD_ACCEPT - } -}; -/*----------------------------------------------------------------------------*/ -static int uhci_hc_init_transfer_lists(uhci_hc_t *instance); -static int uhci_hc_init_mem_structures(uhci_hc_t *instance); -static void uhci_hc_init_hw(uhci_hc_t *instance); - -static int uhci_hc_interrupt_emulator(void *arg); -static int uhci_hc_debug_checker(void *arg); - -static bool allowed_usb_packet( - bool low_speed, usb_transfer_type_t transfer, size_t size); -/*----------------------------------------------------------------------------*/ -/** Initialize UHCI hcd driver structure - * - * @param[in] instance Memory place to initialize. - * @param[in] fun DDF function. - * @param[in] regs Address of I/O control registers. - * @param[in] size Size of I/O control registers. - * @return Error code. - * @note Should be called only once on any structure. - * - * Initializes memory structures, starts up hw, and launches debugger and - * interrupt fibrils. - */ -int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun, - void *regs, size_t reg_size, bool interrupts) -{ - assert(reg_size >= sizeof(regs_t)); - int ret; - -#define CHECK_RET_DEST_FUN_RETURN(ret, message...) \ - if (ret != EOK) { \ - usb_log_error(message); \ - if (instance->ddf_instance) \ - ddf_fun_destroy(instance->ddf_instance); \ - return ret; \ - } else (void) 0 - - instance->hw_interrupts = interrupts; - instance->hw_failures = 0; - - /* Setup UHCI function. */ - instance->ddf_instance = fun; - - /* allow access to hc control registers */ - regs_t *io; - ret = pio_enable(regs, reg_size, (void**)&io); - CHECK_RET_DEST_FUN_RETURN(ret, - "Failed(%d) to gain access to registers at %p: %s.\n", - ret, str_error(ret), io); - instance->registers = io; - usb_log_debug("Device registers at %p(%u) accessible.\n", - io, reg_size); - - ret = uhci_hc_init_mem_structures(instance); - CHECK_RET_DEST_FUN_RETURN(ret, - "Failed to initialize UHCI memory structures.\n"); - - uhci_hc_init_hw(instance); - if (!interrupts) { - instance->cleaner = - fibril_create(uhci_hc_interrupt_emulator, instance); - fibril_add_ready(instance->cleaner); - } else { - /* TODO: enable interrupts here */ - } - - instance->debug_checker = - fibril_create(uhci_hc_debug_checker, instance); -// fibril_add_ready(instance->debug_checker); - - return EOK; -#undef CHECK_RET_DEST_FUN_RETURN -} -/*----------------------------------------------------------------------------*/ -/** Initialize UHCI hc hw resources. - * - * @param[in] instance UHCI structure to use. - * For magic values see UHCI Design Guide - */ -void uhci_hc_init_hw(uhci_hc_t *instance) -{ - assert(instance); - regs_t *registers = instance->registers; - - /* Reset everything, who knows what touched it before us */ - pio_write_16(®isters->usbcmd, UHCI_CMD_GLOBAL_RESET); - async_usleep(10000); /* 10ms according to USB spec */ - pio_write_16(®isters->usbcmd, 0); - - /* Reset hc, all states and counters */ - pio_write_16(®isters->usbcmd, UHCI_CMD_HCRESET); - do { async_usleep(10); } - while ((pio_read_16(®isters->usbcmd) & UHCI_CMD_HCRESET) != 0); - - /* Set frame to exactly 1ms */ - pio_write_8(®isters->sofmod, 64); - - /* Set frame list pointer */ - const uint32_t pa = addr_to_phys(instance->frame_list); - pio_write_32(®isters->flbaseadd, pa); - - if (instance->hw_interrupts) { - /* Enable all interrupts, but resume interrupt */ - pio_write_16(&instance->registers->usbintr, - UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET); - } - - uint16_t status = pio_read_16(®isters->usbcmd); - if (status != 0) - usb_log_warning("Previous command value: %x.\n", status); - - /* Start the hc with large(64B) packet FSBR */ - pio_write_16(®isters->usbcmd, - UHCI_CMD_RUN_STOP | UHCI_CMD_MAX_PACKET | UHCI_CMD_CONFIGURE); -} -/*----------------------------------------------------------------------------*/ -/** Initialize UHCI hc memory structures. - * - * @param[in] instance UHCI structure to use. - * @return Error code - * @note Should be called only once on any structure. - * - * Structures: - * - interrupt code (I/O addressses are customized per instance) - * - transfer lists (queue heads need to be accessible by the hw) - * - frame list page (needs to be one UHCI hw accessible 4K page) - */ -int uhci_hc_init_mem_structures(uhci_hc_t *instance) -{ - assert(instance); -#define CHECK_RET_DEST_CMDS_RETURN(ret, message...) \ - if (ret != EOK) { \ - usb_log_error(message); \ - if (instance->interrupt_code.cmds != NULL) \ - free(instance->interrupt_code.cmds); \ - return ret; \ - } else (void) 0 - - /* Init interrupt code */ - instance->interrupt_code.cmds = malloc(sizeof(uhci_cmds)); - int ret = (instance->interrupt_code.cmds == NULL) ? ENOMEM : EOK; - CHECK_RET_DEST_CMDS_RETURN(ret, - "Failed to allocate interrupt cmds space.\n"); - - { - irq_cmd_t *interrupt_commands = instance->interrupt_code.cmds; - memcpy(interrupt_commands, uhci_cmds, sizeof(uhci_cmds)); - interrupt_commands[0].addr = - (void*)&instance->registers->usbsts; - interrupt_commands[1].addr = - (void*)&instance->registers->usbsts; - instance->interrupt_code.cmdcount = - sizeof(uhci_cmds) / sizeof(irq_cmd_t); - } - - /* Init transfer lists */ - ret = uhci_hc_init_transfer_lists(instance); - CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to init transfer lists.\n"); - usb_log_debug("Initialized transfer lists.\n"); - - /* Init USB frame list page*/ - instance->frame_list = get_page(); - ret = instance ? EOK : ENOMEM; - CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to get frame list page.\n"); - usb_log_debug("Initialized frame list.\n"); - - /* Set all frames to point to the first queue head */ - const uint32_t queue = - instance->transfers_interrupt.queue_head_pa - | LINK_POINTER_QUEUE_HEAD_FLAG; - - unsigned i = 0; - for(; i < UHCI_FRAME_LIST_COUNT; ++i) { - instance->frame_list[i] = queue; - } - - /* Init device keeper*/ - usb_device_keeper_init(&instance->device_manager); - usb_log_debug("Initialized device manager.\n"); - - return EOK; -#undef CHECK_RET_DEST_CMDS_RETURN -} -/*----------------------------------------------------------------------------*/ -/** Initialize UHCI hc transfer lists. - * - * @param[in] instance UHCI structure to use. - * @return Error code - * @note Should be called only once on any structure. - * - * Initializes transfer lists and sets them in one chain to support proper - * USB scheduling. Sets pointer table for quick access. - */ -int uhci_hc_init_transfer_lists(uhci_hc_t *instance) -{ - assert(instance); -#define CHECK_RET_CLEAR_RETURN(ret, message...) \ - if (ret != EOK) { \ - usb_log_error(message); \ - transfer_list_fini(&instance->transfers_bulk_full); \ - transfer_list_fini(&instance->transfers_control_full); \ - transfer_list_fini(&instance->transfers_control_slow); \ - transfer_list_fini(&instance->transfers_interrupt); \ - return ret; \ - } else (void) 0 - - /* initialize TODO: check errors */ - int ret; - ret = transfer_list_init(&instance->transfers_bulk_full, "BULK_FULL"); - CHECK_RET_CLEAR_RETURN(ret, "Failed to init BULK list."); - - ret = transfer_list_init( - &instance->transfers_control_full, "CONTROL_FULL"); - CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL FULL list."); - - ret = transfer_list_init( - &instance->transfers_control_slow, "CONTROL_SLOW"); - CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL SLOW list."); - - ret = transfer_list_init(&instance->transfers_interrupt, "INTERRUPT"); - CHECK_RET_CLEAR_RETURN(ret, "Failed to init INTERRUPT list."); - - transfer_list_set_next(&instance->transfers_control_full, - &instance->transfers_bulk_full); - transfer_list_set_next(&instance->transfers_control_slow, - &instance->transfers_control_full); - transfer_list_set_next(&instance->transfers_interrupt, - &instance->transfers_control_slow); - - /*FSBR*/ -#ifdef FSBR - transfer_list_set_next(&instance->transfers_bulk_full, - &instance->transfers_control_full); -#endif - - /* Assign pointers to be used during scheduling */ - instance->transfers[USB_SPEED_FULL][USB_TRANSFER_INTERRUPT] = - &instance->transfers_interrupt; - instance->transfers[USB_SPEED_LOW][USB_TRANSFER_INTERRUPT] = - &instance->transfers_interrupt; - instance->transfers[USB_SPEED_FULL][USB_TRANSFER_CONTROL] = - &instance->transfers_control_full; - instance->transfers[USB_SPEED_LOW][USB_TRANSFER_CONTROL] = - &instance->transfers_control_slow; - instance->transfers[USB_SPEED_FULL][USB_TRANSFER_BULK] = - &instance->transfers_bulk_full; - - return EOK; -#undef CHECK_RET_CLEAR_RETURN -} -/*----------------------------------------------------------------------------*/ -/** Schedule batch for execution. - * - * @param[in] instance UHCI structure to use. - * @param[in] batch Transfer batch to schedule. - * @return Error code - * - * Checks for bandwidth availability and appends the batch to the proper queue. - */ -int uhci_hc_schedule(uhci_hc_t *instance, usb_transfer_batch_t *batch) -{ - assert(instance); - assert(batch); - const int low_speed = (batch->speed == USB_SPEED_LOW); - if (!allowed_usb_packet( - low_speed, batch->transfer_type, batch->max_packet_size)) { - usb_log_warning( - "Invalid USB packet specified %s SPEED %d %zu.\n", - low_speed ? "LOW" : "FULL" , batch->transfer_type, - batch->max_packet_size); - return ENOTSUP; - } - /* TODO: check available bandwidth here */ - - transfer_list_t *list = - instance->transfers[batch->speed][batch->transfer_type]; - assert(list); - transfer_list_add_batch(list, batch); - - return EOK; -} -/*----------------------------------------------------------------------------*/ -/** Take action based on the interrupt cause. - * - * @param[in] instance UHCI structure to use. - * @param[in] status Value of the status register at the time of interrupt. - * - * Interrupt might indicate: - * - transaction completed, either by triggering IOC, SPD, or an error - * - some kind of device error - * - resume from suspend state (not implemented) - */ -void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status) -{ - assert(instance); - /* TODO: Resume interrupts are not supported */ - /* Lower 2 bits are transaction error and transaction complete */ - if (status & 0x3) { - transfer_list_remove_finished(&instance->transfers_interrupt); - transfer_list_remove_finished(&instance->transfers_control_slow); - transfer_list_remove_finished(&instance->transfers_control_full); - transfer_list_remove_finished(&instance->transfers_bulk_full); - } - /* bits 4 and 5 indicate hc error */ - if (status & 0x18) { - usb_log_error("UHCI hardware failure!.\n"); - ++instance->hw_failures; - transfer_list_abort_all(&instance->transfers_interrupt); - transfer_list_abort_all(&instance->transfers_control_slow); - transfer_list_abort_all(&instance->transfers_control_full); - transfer_list_abort_all(&instance->transfers_bulk_full); - - if (instance->hw_failures < UHCI_ALLOWED_HW_FAIL) { - /* reinitialize hw, this triggers virtual disconnect*/ - uhci_hc_init_hw(instance); - } else { - usb_log_fatal("Too many UHCI hardware failures!.\n"); - uhci_hc_fini(instance); - } - } -} -/*----------------------------------------------------------------------------*/ -/** Polling function, emulates interrupts. - * - * @param[in] arg UHCI hc structure to use. - * @return EOK (should never return) - */ -int uhci_hc_interrupt_emulator(void* arg) -{ - usb_log_debug("Started interrupt emulator.\n"); - uhci_hc_t *instance = (uhci_hc_t*)arg; - assert(instance); - - while (1) { - /* read and ack interrupts */ - uint16_t status = pio_read_16(&instance->registers->usbsts); - pio_write_16(&instance->registers->usbsts, 0x1f); - if (status != 0) - usb_log_debug2("UHCI status: %x.\n", status); - uhci_hc_interrupt(instance, status); - async_usleep(UHCI_CLEANER_TIMEOUT); - } - return EOK; -} -/*---------------------------------------------------------------------------*/ -/** Debug function, checks consistency of memory structures. - * - * @param[in] arg UHCI structure to use. - * @return EOK (should never return) - */ -int uhci_hc_debug_checker(void *arg) -{ - uhci_hc_t *instance = (uhci_hc_t*)arg; - assert(instance); - -#define QH(queue) \ - instance->transfers_##queue.queue_head - - while (1) { - const uint16_t cmd = pio_read_16(&instance->registers->usbcmd); - const uint16_t sts = pio_read_16(&instance->registers->usbsts); - const uint16_t intr = - pio_read_16(&instance->registers->usbintr); - - if (((cmd & UHCI_CMD_RUN_STOP) != 1) || (sts != 0)) { - usb_log_debug2("Command: %X Status: %X Intr: %x\n", - cmd, sts, intr); - } - - uintptr_t frame_list = - pio_read_32(&instance->registers->flbaseadd) & ~0xfff; - if (frame_list != addr_to_phys(instance->frame_list)) { - usb_log_debug("Framelist address: %p vs. %p.\n", - frame_list, addr_to_phys(instance->frame_list)); - } - - int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff; - - uintptr_t expected_pa = instance->frame_list[frnum] - & LINK_POINTER_ADDRESS_MASK; - uintptr_t real_pa = addr_to_phys(QH(interrupt)); - if (expected_pa != real_pa) { - usb_log_debug("Interrupt QH: %p(frame: %d) vs. %p.\n", - expected_pa, frnum, real_pa); - } - - expected_pa = QH(interrupt)->next & LINK_POINTER_ADDRESS_MASK; - real_pa = addr_to_phys(QH(control_slow)); - if (expected_pa != real_pa) { - usb_log_debug("Control Slow QH: %p vs. %p.\n", - expected_pa, real_pa); - } - - expected_pa = QH(control_slow)->next & LINK_POINTER_ADDRESS_MASK; - real_pa = addr_to_phys(QH(control_full)); - if (expected_pa != real_pa) { - usb_log_debug("Control Full QH: %p vs. %p.\n", - expected_pa, real_pa); - } - - expected_pa = QH(control_full)->next & LINK_POINTER_ADDRESS_MASK; - real_pa = addr_to_phys(QH(bulk_full)); - if (expected_pa != real_pa ) { - usb_log_debug("Bulk QH: %p vs. %p.\n", - expected_pa, real_pa); - } - async_usleep(UHCI_DEBUGER_TIMEOUT); - } - return EOK; -#undef QH -} -/*----------------------------------------------------------------------------*/ -/** Check transfer packets, for USB validity - * - * @param[in] low_speed Transfer speed. - * @param[in] transfer Transer type - * @param[in] size Maximum size of used packets - * @return True if transaction is allowed by USB specs, false otherwise - */ -bool allowed_usb_packet( - bool low_speed, usb_transfer_type_t transfer, size_t size) -{ - /* see USB specification chapter 5.5-5.8 for magic numbers used here */ - switch(transfer) - { - case USB_TRANSFER_ISOCHRONOUS: - return (!low_speed && size < 1024); - case USB_TRANSFER_INTERRUPT: - return size <= (low_speed ? 8 : 64); - case USB_TRANSFER_CONTROL: /* device specifies its own max size */ - return (size <= (low_speed ? 8 : 64)); - case USB_TRANSFER_BULK: /* device specifies its own max size */ - return (!low_speed && size <= 64); - } - return false; -} -/** - * @} - */ Index: pace/drv/uhci-hcd/uhci_hc.h =================================================================== --- uspace/drv/uhci-hcd/uhci_hc.h (revision c56c5b5b306dd05373aa73c0404742419a4e0cae) +++ (revision ) @@ -1,131 +1,0 @@ -/* - * 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 drvusbuhcihc - * @{ - */ -/** @file - * @brief UHCI host controller driver structure - */ -#ifndef DRV_UHCI_UHCI_HC_H -#define DRV_UHCI_UHCI_HC_H - -#include -#include -#include -#include - -#include -#include - -#include "batch.h" -#include "transfer_list.h" - -typedef struct uhci_regs { - uint16_t usbcmd; -#define UHCI_CMD_MAX_PACKET (1 << 7) -#define UHCI_CMD_CONFIGURE (1 << 6) -#define UHCI_CMD_DEBUG (1 << 5) -#define UHCI_CMD_FORCE_GLOBAL_RESUME (1 << 4) -#define UHCI_CMD_FORCE_GLOBAL_SUSPEND (1 << 3) -#define UHCI_CMD_GLOBAL_RESET (1 << 2) -#define UHCI_CMD_HCRESET (1 << 1) -#define UHCI_CMD_RUN_STOP (1 << 0) - - uint16_t usbsts; -#define UHCI_STATUS_HALTED (1 << 5) -#define UHCI_STATUS_PROCESS_ERROR (1 << 4) -#define UHCI_STATUS_SYSTEM_ERROR (1 << 3) -#define UHCI_STATUS_RESUME (1 << 2) -#define UHCI_STATUS_ERROR_INTERRUPT (1 << 1) -#define UHCI_STATUS_INTERRUPT (1 << 0) - - uint16_t usbintr; -#define UHCI_INTR_SHORT_PACKET (1 << 3) -#define UHCI_INTR_COMPLETE (1 << 2) -#define UHCI_INTR_RESUME (1 << 1) -#define UHCI_INTR_CRC (1 << 0) - - uint16_t frnum; - uint32_t flbaseadd; - uint8_t sofmod; -} regs_t; - -#define UHCI_FRAME_LIST_COUNT 1024 -#define UHCI_CLEANER_TIMEOUT 10000 -#define UHCI_DEBUGER_TIMEOUT 5000000 -#define UHCI_ALLOWED_HW_FAIL 5 - -typedef struct uhci_hc { - usb_device_keeper_t device_manager; - - regs_t *registers; - - link_pointer_t *frame_list; - - transfer_list_t transfers_bulk_full; - transfer_list_t transfers_control_full; - transfer_list_t transfers_control_slow; - transfer_list_t transfers_interrupt; - - transfer_list_t *transfers[2][4]; - - irq_code_t interrupt_code; - - fid_t cleaner; - fid_t debug_checker; - bool hw_interrupts; - unsigned hw_failures; - - ddf_fun_t *ddf_instance; -} uhci_hc_t; - -int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun, - void *regs, size_t reg_size, bool interupts); - -int uhci_hc_schedule(uhci_hc_t *instance, usb_transfer_batch_t *batch); - -void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status); - -/** Safely dispose host controller internal structures - * - * @param[in] instance Host controller structure to use. - */ -static inline void uhci_hc_fini(uhci_hc_t *instance) { /* TODO: implement*/ }; - -/** Get and cast pointer to the driver data - * - * @param[in] fun DDF function pointer - * @return cast pointer to driver_data - */ -static inline uhci_hc_t * fun_to_uhci_hc(ddf_fun_t *fun) - { return (uhci_hc_t*)fun->driver_data; } -#endif -/** - * @} - */ Index: uspace/drv/uhci-hcd/uhci_rh.c =================================================================== --- uspace/drv/uhci-hcd/uhci_rh.c (revision c56c5b5b306dd05373aa73c0404742419a4e0cae) +++ uspace/drv/uhci-hcd/uhci_rh.c (revision c01cd32983241e62b21a5da0077ac54000bc035e) @@ -40,5 +40,4 @@ #include "uhci_rh.h" -#include "uhci_hc.h" /** Root hub initialization