Changeset 8c877b2 in mainline for uspace/drv/uhci-hcd/uhci.c


Ignore:
Timestamp:
2011-03-04T13:05:35Z (14 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d49728c
Parents:
dff940f8 (diff), 9a422574 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge with \usb\development

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/uhci-hcd/uhci.c

    rdff940f8 r8c877b2  
    4848        {
    4949                .cmd = CMD_PIO_READ_16,
    50                 .addr = (void*)0xc022,
     50                .addr = NULL, /* patched for every instance */
    5151                .dstarg = 1
    5252        },
    5353        {
    5454                .cmd = CMD_PIO_WRITE_16,
    55                 .addr = (void*)0xc022,
     55                .addr = NULL, /* pathed for every instance */
    5656                .value = 0x1f
    5757        },
    … …  
    6868        assert(hc);
    6969
    70         usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
     70        usb_address_t addr = device_keeper_find(&hc->device_manager,
    7171            handle);
    7272        if (addr < 0) {
    … …  
    8080        return EOK;
    8181}
    82 
    83 
     82/*----------------------------------------------------------------------------*/
    8483static usb_iface_t hc_usb_iface = {
    8584        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
    … …  
    8988static ddf_dev_ops_t uhci_ops = {
    9089        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
    91         .interfaces[USBHC_DEV_IFACE] = &uhci_iface
     90        .interfaces[USBHC_DEV_IFACE] = &uhci_iface,
    9291};
    93 
     92/*----------------------------------------------------------------------------*/
    9493static int uhci_init_transfer_lists(uhci_t *instance);
    9594static int uhci_init_mem_structures(uhci_t *instance);
    … …  
    102101        bool low_speed, usb_transfer_type_t, size_t size);
    103102
    104 #define CHECK_RET_RETURN(ret, message...) \
     103
     104int uhci_init(uhci_t *instance, ddf_dev_t *dev, void *regs, size_t reg_size)
     105{
     106        assert(reg_size >= sizeof(regs_t));
     107        int ret;
     108
     109#define CHECK_RET_DEST_FUN_RETURN(ret, message...) \
    105110        if (ret != EOK) { \
    106111                usb_log_error(message); \
     112                if (instance->ddf_instance) \
     113                        ddf_fun_destroy(instance->ddf_instance); \
    107114                return ret; \
    108115        } else (void) 0
    109116
    110 int uhci_init(uhci_t *instance, ddf_dev_t *dev, void *regs, size_t reg_size)
    111 {
    112         assert(reg_size >= sizeof(regs_t));
    113         int ret;
    114 
    115         /*
    116          * Create UHCI function.
    117          */
     117        /* Create UHCI function. */
    118118        instance->ddf_instance = ddf_fun_create(dev, fun_exposed, "uhci");
    119         if (instance->ddf_instance == NULL) {
    120                 usb_log_error("Failed to create UHCI device function.\n");
    121                 return ENOMEM;
    122         }
     119        ret = (instance->ddf_instance == NULL) ? ENOMEM : EOK;
     120        CHECK_RET_DEST_FUN_RETURN(ret,
     121            "Failed to create UHCI device function.\n");
     122
    123123        instance->ddf_instance->ops = &uhci_ops;
    124124        instance->ddf_instance->driver_data = instance;
    125125
    126126        ret = ddf_fun_bind(instance->ddf_instance);
    127         CHECK_RET_RETURN(ret, "Failed to bind UHCI device function: %s.\n",
    128             str_error(ret));
     127        CHECK_RET_DEST_FUN_RETURN(ret,
     128            "Failed(%d) to bind UHCI device function: %s.\n",
     129            ret, str_error(ret));
    129130
    130131        /* allow access to hc control registers */
    131132        regs_t *io;
    132133        ret = pio_enable(regs, reg_size, (void**)&io);
    133         CHECK_RET_RETURN(ret, "Failed to gain access to registers at %p.\n", io);
     134        CHECK_RET_DEST_FUN_RETURN(ret,
     135            "Failed(%d) to gain access to registers at %p: %s.\n",
     136            ret, str_error(ret), io);
    134137        instance->registers = io;
    135         usb_log_debug("Device registers accessible.\n");
     138        usb_log_debug("Device registers at %p(%u) accessible.\n",
     139            io, reg_size);
    136140
    137141        ret = uhci_init_mem_structures(instance);
    138         CHECK_RET_RETURN(ret, "Failed to initialize memory structures.\n");
     142        CHECK_RET_DEST_FUN_RETURN(ret,
     143            "Failed to initialize UHCI memory structures.\n");
    139144
    140145        uhci_init_hw(instance);
    141 
    142         instance->cleaner = fibril_create(uhci_interrupt_emulator, instance);
    143 //      fibril_add_ready(instance->cleaner);
     146        instance->cleaner =
     147            fibril_create(uhci_interrupt_emulator, instance);
     148        fibril_add_ready(instance->cleaner);
    144149
    145150        instance->debug_checker = fibril_create(uhci_debug_checker, instance);
    146151        fibril_add_ready(instance->debug_checker);
    147152
    148         return EOK;
     153        usb_log_info("Started UHCI driver.\n");
     154        return EOK;
     155#undef CHECK_RET_DEST_FUN_RETURN
    149156}
    150157/*----------------------------------------------------------------------------*/
    151158void uhci_init_hw(uhci_t *instance)
    152159{
     160        assert(instance);
     161
     162        /* reset everything, who knows what touched it before us */
     163        pio_write_16(&instance->registers->usbcmd, UHCI_CMD_GLOBAL_RESET);
     164        async_usleep(10000); /* 10ms according to USB spec */
     165        pio_write_16(&instance->registers->usbcmd, 0);
     166
     167        /* reset hc, all states and counters */
     168        pio_write_16(&instance->registers->usbcmd, UHCI_CMD_HCRESET);
     169        while ((pio_read_16(&instance->registers->usbcmd) & UHCI_CMD_HCRESET) != 0)
     170                { async_usleep(10); }
    153171
    154172        /* set framelist pointer */
    … …  
    158176        /* enable all interrupts, but resume interrupt */
    159177        pio_write_16(&instance->registers->usbintr,
    160                   UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
     178            UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
    161179
    162180        /* Start the hc with large(64B) packet FSBR */
    163181        pio_write_16(&instance->registers->usbcmd,
    164182            UHCI_CMD_RUN_STOP | UHCI_CMD_MAX_PACKET | UHCI_CMD_CONFIGURE);
    165         usb_log_debug("Started UHCI HC.\n");
    166183}
    167184/*----------------------------------------------------------------------------*/
    … …  
    169186{
    170187        assert(instance);
     188#define CHECK_RET_DEST_CMDS_RETURN(ret, message...) \
     189        if (ret != EOK) { \
     190                usb_log_error(message); \
     191                if (instance->interrupt_code.cmds != NULL) \
     192                        free(instance->interrupt_code.cmds); \
     193                return ret; \
     194        } else (void) 0
    171195
    172196        /* init interrupt code */
    173         irq_cmd_t *interrupt_commands = malloc(sizeof(uhci_cmds));
    174         if (interrupt_commands == NULL) {
    175                 return ENOMEM;
    176         }
    177         memcpy(interrupt_commands, uhci_cmds, sizeof(uhci_cmds));
    178         interrupt_commands[0].addr = (void*)&instance->registers->usbsts;
    179         interrupt_commands[1].addr = (void*)&instance->registers->usbsts;
    180         instance->interrupt_code.cmds = interrupt_commands;
    181         instance->interrupt_code.cmdcount =
    182             sizeof(uhci_cmds) / sizeof(irq_cmd_t);
     197        instance->interrupt_code.cmds = malloc(sizeof(uhci_cmds));
     198        int ret = (instance->interrupt_code.cmds == NULL) ? ENOMEM : EOK;
     199        CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to allocate interrupt cmds space.\n");
     200
     201        {
     202                irq_cmd_t *interrupt_commands = instance->interrupt_code.cmds;
     203                memcpy(interrupt_commands, uhci_cmds, sizeof(uhci_cmds));
     204                interrupt_commands[0].addr = (void*)&instance->registers->usbsts;
     205                interrupt_commands[1].addr = (void*)&instance->registers->usbsts;
     206                instance->interrupt_code.cmdcount =
     207                    sizeof(uhci_cmds) / sizeof(irq_cmd_t);
     208        }
    183209
    184210        /* init transfer lists */
    185         int ret = uhci_init_transfer_lists(instance);
    186         CHECK_RET_RETURN(ret, "Failed to initialize transfer lists.\n");
     211        ret = uhci_init_transfer_lists(instance);
     212        CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to initialize transfer lists.\n");
    187213        usb_log_debug("Initialized transfer lists.\n");
    188214
    … …  
    190216        instance->frame_list = get_page();
    191217        ret = instance ? EOK : ENOMEM;
    192         CHECK_RET_RETURN(ret, "Failed to get frame list page.\n");
     218        CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to get frame list page.\n");
    193219        usb_log_debug("Initialized frame list.\n");
    194220
    … …  
    197223          instance->transfers_interrupt.queue_head_pa
    198224          | LINK_POINTER_QUEUE_HEAD_FLAG;
     225
    199226        unsigned i = 0;
    200227        for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
    … …  
    203230
    204231        /* init address keeper(libusb) */
    205         usb_address_keeping_init(&instance->address_manager, USB11_ADDRESS_MAX);
    206         usb_log_debug("Initialized address manager.\n");
    207 
    208         return EOK;
     232        device_keeper_init(&instance->device_manager);
     233        usb_log_debug("Initialized device manager.\n");
     234
     235        return EOK;
     236#undef CHECK_RET_DEST_CMDS_RETURN
    209237}
    210238/*----------------------------------------------------------------------------*/
    … …  
    212240{
    213241        assert(instance);
     242#define CHECK_RET_CLEAR_RETURN(ret, message...) \
     243        if (ret != EOK) { \
     244                usb_log_error(message); \
     245                transfer_list_fini(&instance->transfers_bulk_full); \
     246                transfer_list_fini(&instance->transfers_control_full); \
     247                transfer_list_fini(&instance->transfers_control_slow); \
     248                transfer_list_fini(&instance->transfers_interrupt); \
     249                return ret; \
     250        } else (void) 0
    214251
    215252        /* initialize TODO: check errors */
    216253        int ret;
    217254        ret = transfer_list_init(&instance->transfers_bulk_full, "BULK_FULL");
    218         assert(ret == EOK);
     255        CHECK_RET_CLEAR_RETURN(ret, "Failed to init BULK list.");
     256
    219257        ret = transfer_list_init(&instance->transfers_control_full, "CONTROL_FULL");
    220         assert(ret == EOK);
     258        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL FULL list.");
     259
    221260        ret = transfer_list_init(&instance->transfers_control_slow, "CONTROL_SLOW");
    222         assert(ret == EOK);
     261        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL SLOW list.");
     262
    223263        ret = transfer_list_init(&instance->transfers_interrupt, "INTERRUPT");
    224         assert(ret == EOK);
     264        CHECK_RET_CLEAR_RETURN(ret, "Failed to init INTERRUPT list.");
    225265
    226266        transfer_list_set_next(&instance->transfers_control_full,
    … …  
    249289
    250290        return EOK;
     291#undef CHECK_RET_CLEAR_RETURN
    251292}
    252293/*----------------------------------------------------------------------------*/
    … …  
    255296        assert(instance);
    256297        assert(batch);
    257         const int low_speed = (batch->speed == LOW_SPEED);
     298        const int low_speed = (batch->speed == USB_SPEED_LOW);
    258299        if (!allowed_usb_packet(
    259300            low_speed, batch->transfer_type, batch->max_packet_size)) {
    260301                usb_log_warning("Invalid USB packet specified %s SPEED %d %zu.\n",
    261                           low_speed ? "LOW" : "FULL" , batch->transfer_type,
     302                    low_speed ? "LOW" : "FULL" , batch->transfer_type,
    262303                    batch->max_packet_size);
    263304                return ENOTSUP;
    … …  
    276317{
    277318        assert(instance);
    278         if ((status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) == 0)
    279                 return;
    280         usb_log_debug("UHCI interrupt: %X.\n", status);
    281         transfer_list_check(&instance->transfers_interrupt);
    282         transfer_list_check(&instance->transfers_control_slow);
    283         transfer_list_check(&instance->transfers_control_full);
    284         transfer_list_check(&instance->transfers_bulk_full);
     319        transfer_list_remove_finished(&instance->transfers_interrupt);
     320        transfer_list_remove_finished(&instance->transfers_control_slow);
     321        transfer_list_remove_finished(&instance->transfers_control_full);
     322        transfer_list_remove_finished(&instance->transfers_bulk_full);
    285323}
    286324/*----------------------------------------------------------------------------*/
    … …  
    291329        assert(instance);
    292330
    293         while(1) {
     331        while (1) {
    294332                uint16_t status = pio_read_16(&instance->registers->usbsts);
     333                if (status != 0)
     334                        usb_log_debug2("UHCI status: %x.\n", status);
     335                status |= 1;
    295336                uhci_interrupt(instance, status);
    296                 async_usleep(UHCI_CLEANER_TIMEOUT);
     337                pio_write_16(&instance->registers->usbsts, 0x1f);
     338                async_usleep(UHCI_CLEANER_TIMEOUT * 5);
    297339        }
    298340        return EOK;
    … …  
    303345        uhci_t *instance = (uhci_t*)arg;
    304346        assert(instance);
     347
     348#define QH(queue) \
     349        instance->transfers_##queue.queue_head
     350
    305351        while (1) {
    306352                const uint16_t cmd = pio_read_16(&instance->registers->usbcmd);
    307353                const uint16_t sts = pio_read_16(&instance->registers->usbsts);
    308                 const uint16_t intr = pio_read_16(&instance->registers->usbintr);
    309                 usb_log_debug("Command: %X Status: %X Interrupts: %x\n",
    310                     cmd, sts, intr);
    311 
    312                 uintptr_t frame_list = pio_read_32(&instance->registers->flbaseadd);
     354                const uint16_t intr =
     355                    pio_read_16(&instance->registers->usbintr);
     356
     357                if (((cmd & UHCI_CMD_RUN_STOP) != 1) || (sts != 0)) {
     358                        usb_log_debug2("Command: %X Status: %X Intr: %x\n",
     359                            cmd, sts, intr);
     360                }
     361
     362                uintptr_t frame_list =
     363                    pio_read_32(&instance->registers->flbaseadd) & ~0xfff;
    313364                if (frame_list != addr_to_phys(instance->frame_list)) {
    314365                        usb_log_debug("Framelist address: %p vs. %p.\n",
    315                                 frame_list, addr_to_phys(instance->frame_list));
    316                 }
     366                            frame_list, addr_to_phys(instance->frame_list));
     367                }
     368
    317369                int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff;
    318370                usb_log_debug2("Framelist item: %d \n", frnum );
    319371
    320                 queue_head_t* qh = instance->transfers_interrupt.queue_head;
    321 
    322                 if ((instance->frame_list[frnum] & (~0xf)) != (uintptr_t)addr_to_phys(qh)) {
     372                uintptr_t expected_pa = instance->frame_list[frnum] & (~0xf);
     373                uintptr_t real_pa = addr_to_phys(QH(interrupt));
     374                if (expected_pa != real_pa) {
    323375                        usb_log_debug("Interrupt QH: %p vs. %p.\n",
    324                                 instance->frame_list[frnum] & (~0xf), addr_to_phys(qh));
    325                 }
    326 
    327                 if ((qh->next_queue & (~0xf))
    328                   != (uintptr_t)addr_to_phys(instance->transfers_control_slow.queue_head)) {
    329                         usb_log_debug("Control Slow QH: %p vs. %p.\n", qh->next_queue & (~0xf),
    330                                 addr_to_phys(instance->transfers_control_slow.queue_head));
    331                 }
    332                 qh = instance->transfers_control_slow.queue_head;
    333 
    334                 if ((qh->next_queue & (~0xf))
    335                   != (uintptr_t)addr_to_phys(instance->transfers_control_full.queue_head)) {
    336                         usb_log_debug("Control Full QH: %p vs. %p.\n", qh->next_queue & (~0xf),
    337                                 addr_to_phys(instance->transfers_control_full.queue_head));\
    338                 }
    339                 qh = instance->transfers_control_full.queue_head;
    340 
    341                 if ((qh->next_queue & (~0xf))
    342                   != (uintptr_t)addr_to_phys(instance->transfers_bulk_full.queue_head)) {
    343                         usb_log_debug("Bulk QH: %p vs. %p.\n", qh->next_queue & (~0xf),
    344                                 addr_to_phys(instance->transfers_bulk_full.queue_head));
    345                 }
    346 /*
    347         uint16_t cmd = pio_read_16(&instance->registers->usbcmd);
    348         cmd |= UHCI_CMD_RUN_STOP;
    349         pio_write_16(&instance->registers->usbcmd, cmd);
    350 */
     376                            expected_pa, real_pa);
     377                }
     378
     379                expected_pa = QH(interrupt)->next_queue & (~0xf);
     380                real_pa = addr_to_phys(QH(control_slow));
     381                if (expected_pa != real_pa) {
     382                        usb_log_debug("Control Slow QH: %p vs. %p.\n",
     383                            expected_pa, real_pa);
     384                }
     385
     386                expected_pa = QH(control_slow)->next_queue & (~0xf);
     387                real_pa = addr_to_phys(QH(control_full));
     388                if (expected_pa != real_pa) {
     389                        usb_log_debug("Control Full QH: %p vs. %p.\n",
     390                            expected_pa, real_pa);
     391                }
     392
     393                expected_pa = QH(control_full)->next_queue & (~0xf);
     394                real_pa = addr_to_phys(QH(bulk_full));
     395                if (expected_pa != real_pa ) {
     396                        usb_log_debug("Bulk QH: %p vs. %p.\n",
     397                            expected_pa, real_pa);
     398                }
    351399                async_usleep(UHCI_DEBUGER_TIMEOUT);
    352400        }
    353401        return 0;
     402#undef QH
    354403}
    355404/*----------------------------------------------------------------------------*/
    356405bool allowed_usb_packet(
    357         bool low_speed, usb_transfer_type_t transfer, size_t size)
     406    bool low_speed, usb_transfer_type_t transfer, size_t size)
    358407{
    359408        /* see USB specification chapter 5.5-5.8 for magic numbers used here */
    360         switch(transfer) {
    361                 case USB_TRANSFER_ISOCHRONOUS:
    362                         return (!low_speed && size < 1024);
    363                 case USB_TRANSFER_INTERRUPT:
    364                         return size <= (low_speed ? 8 : 64);
    365                 case USB_TRANSFER_CONTROL: /* device specifies its own max size */
    366                         return (size <= (low_speed ? 8 : 64));
    367                 case USB_TRANSFER_BULK: /* device specifies its own max size */
    368                         return (!low_speed && size <= 64);
     409        switch(transfer)
     410        {
     411        case USB_TRANSFER_ISOCHRONOUS:
     412                return (!low_speed && size < 1024);
     413        case USB_TRANSFER_INTERRUPT:
     414                return size <= (low_speed ? 8 : 64);
     415        case USB_TRANSFER_CONTROL: /* device specifies its own max size */
     416                return (size <= (low_speed ? 8 : 64));
     417        case USB_TRANSFER_BULK: /* device specifies its own max size */
     418                return (!low_speed && size <= 64);
    369419        }
    370420        return false;
Note: See TracChangeset for help on using the changeset viewer.