Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rb9d910f rb375bb8  
    3333 */
    3434#include <errno.h>
     35#include <str_error.h>
    3536#include <adt/list.h>
     37#include <libarch/ddi.h>
    3638
    3739#include <usb/debug.h>
    3840#include <usb/usb.h>
     41#include <usb/ddfiface.h>
     42#include <usb_iface.h>
    3943
    4044#include "uhci.h"
     45#include "iface.h"
     46
    4147static irq_cmd_t uhci_cmds[] = {
    4248        {
    4349                .cmd = CMD_PIO_READ_16,
    44                 .addr = (void*)0xc022,
     50                .addr = NULL, /* patched for every instance */
    4551                .dstarg = 1
    4652        },
    4753        {
    4854                .cmd = CMD_PIO_WRITE_16,
    49                 .addr = (void*)0xc022,
     55                .addr = NULL, /* pathed for every instance */
    5056                .value = 0x1f
    5157        },
    … …  
    5561};
    5662
     63static int usb_iface_get_address(ddf_fun_t *fun, devman_handle_t handle,
     64    usb_address_t *address)
     65{
     66        assert(fun);
     67        uhci_t *hc = fun_to_uhci(fun);
     68        assert(hc);
     69
     70        usb_address_t addr = device_keeper_find(&hc->device_manager,
     71            handle);
     72        if (addr < 0) {
     73                return addr;
     74        }
     75
     76        if (address != NULL) {
     77                *address = addr;
     78        }
     79
     80        return EOK;
     81}
     82/*----------------------------------------------------------------------------*/
     83static usb_iface_t hc_usb_iface = {
     84        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
     85        .get_address = usb_iface_get_address
     86};
     87/*----------------------------------------------------------------------------*/
     88static ddf_dev_ops_t uhci_ops = {
     89        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
     90        .interfaces[USBHC_DEV_IFACE] = &uhci_iface,
     91};
     92/*----------------------------------------------------------------------------*/
    5793static int uhci_init_transfer_lists(uhci_t *instance);
    5894static int uhci_init_mem_structures(uhci_t *instance);
    … …  
    65101        bool low_speed, usb_transfer_type_t, size_t size);
    66102
    67 #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...) \
    68110        if (ret != EOK) { \
    69111                usb_log_error(message); \
     112                if (instance->ddf_instance) \
     113                        ddf_fun_destroy(instance->ddf_instance); \
    70114                return ret; \
    71115        } else (void) 0
    72116
    73 int uhci_init(uhci_t *instance, void *regs, size_t reg_size)
    74 {
    75         assert(reg_size >= sizeof(regs_t));
     117        /* Create UHCI function. */
     118        instance->ddf_instance = ddf_fun_create(dev, fun_exposed, "uhci");
     119        ret = (instance->ddf_instance == NULL) ? ENOMEM : EOK;
     120        CHECK_RET_DEST_FUN_RETURN(ret,
     121            "Failed to create UHCI device function.\n");
     122
     123        instance->ddf_instance->ops = &uhci_ops;
     124        instance->ddf_instance->driver_data = instance;
     125
     126        ret = ddf_fun_bind(instance->ddf_instance);
     127        CHECK_RET_DEST_FUN_RETURN(ret,
     128            "Failed(%d) to bind UHCI device function: %s.\n",
     129            ret, str_error(ret));
    76130
    77131        /* allow access to hc control registers */
    78132        regs_t *io;
    79         int ret = pio_enable(regs, reg_size, (void**)&io);
    80         CHECK_RET_RETURN(ret, "Failed to gain access to registers at %p.\n", io);
     133        ret = pio_enable(regs, reg_size, (void**)&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);
    81137        instance->registers = io;
    82         usb_log_debug("Device registers accessible.\n");
     138        usb_log_debug("Device registers at %p(%u) accessible.\n",
     139            io, reg_size);
    83140
    84141        ret = uhci_init_mem_structures(instance);
    85         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");
    86144
    87145        uhci_init_hw(instance);
    88 
    89         instance->cleaner = fibril_create(uhci_interrupt_emulator, instance);
    90 //      fibril_add_ready(instance->cleaner);
     146        instance->cleaner =
     147            fibril_create(uhci_interrupt_emulator, instance);
     148        fibril_add_ready(instance->cleaner);
    91149
    92150        instance->debug_checker = fibril_create(uhci_debug_checker, instance);
    93151        fibril_add_ready(instance->debug_checker);
    94152
    95         return EOK;
     153        usb_log_info("Started UHCI driver.\n");
     154        return EOK;
     155#undef CHECK_RET_DEST_FUN_RETURN
    96156}
    97157/*----------------------------------------------------------------------------*/
    98158void uhci_init_hw(uhci_t *instance)
    99159{
     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); }
    100171
    101172        /* set framelist pointer */
    … …  
    105176        /* enable all interrupts, but resume interrupt */
    106177        pio_write_16(&instance->registers->usbintr,
    107                   UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
     178            UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
    108179
    109180        /* Start the hc with large(64B) packet FSBR */
    110181        pio_write_16(&instance->registers->usbcmd,
    111182            UHCI_CMD_RUN_STOP | UHCI_CMD_MAX_PACKET | UHCI_CMD_CONFIGURE);
    112         usb_log_debug("Started UHCI HC.\n");
    113183}
    114184/*----------------------------------------------------------------------------*/
    … …  
    116186{
    117187        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
    118195
    119196        /* init interrupt code */
    120         irq_cmd_t *interrupt_commands = malloc(sizeof(uhci_cmds));
    121         if (interrupt_commands == NULL) {
    122                 return ENOMEM;
    123         }
    124         memcpy(interrupt_commands, uhci_cmds, sizeof(uhci_cmds));
    125         interrupt_commands[0].addr = (void*)&instance->registers->usbsts;
    126         interrupt_commands[1].addr = (void*)&instance->registers->usbsts;
    127         instance->interrupt_code.cmds = interrupt_commands;
    128         instance->interrupt_code.cmdcount =
    129             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        }
    130209
    131210        /* init transfer lists */
    132         int ret = uhci_init_transfer_lists(instance);
    133         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");
    134213        usb_log_debug("Initialized transfer lists.\n");
    135214
    … …  
    137216        instance->frame_list = get_page();
    138217        ret = instance ? EOK : ENOMEM;
    139         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");
    140219        usb_log_debug("Initialized frame list.\n");
    141220
    … …  
    144223          instance->transfers_interrupt.queue_head_pa
    145224          | LINK_POINTER_QUEUE_HEAD_FLAG;
     225
    146226        unsigned i = 0;
    147227        for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
    … …  
    150230
    151231        /* init address keeper(libusb) */
    152         usb_address_keeping_init(&instance->address_manager, USB11_ADDRESS_MAX);
    153         usb_log_debug("Initialized address manager.\n");
    154 
    155         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
    156237}
    157238/*----------------------------------------------------------------------------*/
    … …  
    159240{
    160241        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
    161251
    162252        /* initialize TODO: check errors */
    163253        int ret;
    164254        ret = transfer_list_init(&instance->transfers_bulk_full, "BULK_FULL");
    165         assert(ret == EOK);
     255        CHECK_RET_CLEAR_RETURN(ret, "Failed to init BULK list.");
     256
    166257        ret = transfer_list_init(&instance->transfers_control_full, "CONTROL_FULL");
    167         assert(ret == EOK);
     258        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL FULL list.");
     259
    168260        ret = transfer_list_init(&instance->transfers_control_slow, "CONTROL_SLOW");
    169         assert(ret == EOK);
     261        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL SLOW list.");
     262
    170263        ret = transfer_list_init(&instance->transfers_interrupt, "INTERRUPT");
    171         assert(ret == EOK);
     264        CHECK_RET_CLEAR_RETURN(ret, "Failed to init INTERRUPT list.");
    172265
    173266        transfer_list_set_next(&instance->transfers_control_full,
    … …  
    196289
    197290        return EOK;
     291#undef CHECK_RET_CLEAR_RETURN
    198292}
    199293/*----------------------------------------------------------------------------*/
    … …  
    202296        assert(instance);
    203297        assert(batch);
    204         const int low_speed = (batch->speed == LOW_SPEED);
     298        const int low_speed = (batch->speed == USB_SPEED_LOW);
    205299        if (!allowed_usb_packet(
    206300            low_speed, batch->transfer_type, batch->max_packet_size)) {
    207301                usb_log_warning("Invalid USB packet specified %s SPEED %d %zu.\n",
    208                           low_speed ? "LOW" : "FULL" , batch->transfer_type,
     302                    low_speed ? "LOW" : "FULL" , batch->transfer_type,
    209303                    batch->max_packet_size);
    210304                return ENOTSUP;
    … …  
    223317{
    224318        assert(instance);
    225         if ((status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) == 0)
    226                 return;
    227         usb_log_debug("UHCI interrupt: %X.\n", status);
    228         transfer_list_check(&instance->transfers_interrupt);
    229         transfer_list_check(&instance->transfers_control_slow);
    230         transfer_list_check(&instance->transfers_control_full);
    231         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);
    232323}
    233324/*----------------------------------------------------------------------------*/
    … …  
    238329        assert(instance);
    239330
    240         while(1) {
     331        while (1) {
    241332                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;
    242336                uhci_interrupt(instance, status);
    243                 async_usleep(UHCI_CLEANER_TIMEOUT);
     337                pio_write_16(&instance->registers->usbsts, 0x1f);
     338                async_usleep(UHCI_CLEANER_TIMEOUT * 5);
    244339        }
    245340        return EOK;
    … …  
    250345        uhci_t *instance = (uhci_t*)arg;
    251346        assert(instance);
     347
     348#define QH(queue) \
     349        instance->transfers_##queue.queue_head
     350
    252351        while (1) {
    253352                const uint16_t cmd = pio_read_16(&instance->registers->usbcmd);
    254353                const uint16_t sts = pio_read_16(&instance->registers->usbsts);
    255                 const uint16_t intr = pio_read_16(&instance->registers->usbintr);
    256                 usb_log_debug("Command: %X Status: %X Interrupts: %x\n",
    257                     cmd, sts, intr);
    258 
    259                 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;
    260364                if (frame_list != addr_to_phys(instance->frame_list)) {
    261365                        usb_log_debug("Framelist address: %p vs. %p.\n",
    262                                 frame_list, addr_to_phys(instance->frame_list));
    263                 }
     366                            frame_list, addr_to_phys(instance->frame_list));
     367                }
     368
    264369                int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff;
    265370                usb_log_debug2("Framelist item: %d \n", frnum );
    266371
    267                 queue_head_t* qh = instance->transfers_interrupt.queue_head;
    268 
    269                 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) {
    270375                        usb_log_debug("Interrupt QH: %p vs. %p.\n",
    271                                 instance->frame_list[frnum] & (~0xf), addr_to_phys(qh));
    272                 }
    273 
    274                 if ((qh->next_queue & (~0xf))
    275                   != (uintptr_t)addr_to_phys(instance->transfers_control_slow.queue_head)) {
    276                         usb_log_debug("Control Slow QH: %p vs. %p.\n", qh->next_queue & (~0xf),
    277                                 addr_to_phys(instance->transfers_control_slow.queue_head));
    278                 }
    279                 qh = instance->transfers_control_slow.queue_head;
    280 
    281                 if ((qh->next_queue & (~0xf))
    282                   != (uintptr_t)addr_to_phys(instance->transfers_control_full.queue_head)) {
    283                         usb_log_debug("Control Full QH: %p vs. %p.\n", qh->next_queue & (~0xf),
    284                                 addr_to_phys(instance->transfers_control_full.queue_head));\
    285                 }
    286                 qh = instance->transfers_control_full.queue_head;
    287 
    288                 if ((qh->next_queue & (~0xf))
    289                   != (uintptr_t)addr_to_phys(instance->transfers_bulk_full.queue_head)) {
    290                         usb_log_debug("Bulk QH: %p vs. %p.\n", qh->next_queue & (~0xf),
    291                                 addr_to_phys(instance->transfers_bulk_full.queue_head));
    292                 }
    293 /*
    294         uint16_t cmd = pio_read_16(&instance->registers->usbcmd);
    295         cmd |= UHCI_CMD_RUN_STOP;
    296         pio_write_16(&instance->registers->usbcmd, cmd);
    297 */
     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                }
    298399                async_usleep(UHCI_DEBUGER_TIMEOUT);
    299400        }
    300401        return 0;
     402#undef QH
    301403}
    302404/*----------------------------------------------------------------------------*/
    303405bool allowed_usb_packet(
    304         bool low_speed, usb_transfer_type_t transfer, size_t size)
     406    bool low_speed, usb_transfer_type_t transfer, size_t size)
    305407{
    306408        /* see USB specification chapter 5.5-5.8 for magic numbers used here */
    307         switch(transfer) {
    308                 case USB_TRANSFER_ISOCHRONOUS:
    309                         return (!low_speed && size < 1024);
    310                 case USB_TRANSFER_INTERRUPT:
    311                         return size <= (low_speed ? 8 : 64);
    312                 case USB_TRANSFER_CONTROL: /* device specifies its own max size */
    313                         return (size <= (low_speed ? 8 : 64));
    314                 case USB_TRANSFER_BULK: /* device specifies its own max size */
    315                         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);
    316419        }
    317420        return false;
Note: See TracChangeset for help on using the changeset viewer.