Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rb375bb8 rb9d910f  
    3333 */
    3434#include <errno.h>
    35 #include <str_error.h>
    3635#include <adt/list.h>
    37 #include <libarch/ddi.h>
    3836
    3937#include <usb/debug.h>
    4038#include <usb/usb.h>
    41 #include <usb/ddfiface.h>
    42 #include <usb_iface.h>
    4339
    4440#include "uhci.h"
    45 #include "iface.h"
    46 
    4741static irq_cmd_t uhci_cmds[] = {
    4842        {
    4943                .cmd = CMD_PIO_READ_16,
    50                 .addr = NULL, /* patched for every instance */
     44                .addr = (void*)0xc022,
    5145                .dstarg = 1
    5246        },
    5347        {
    5448                .cmd = CMD_PIO_WRITE_16,
    55                 .addr = NULL, /* pathed for every instance */
     49                .addr = (void*)0xc022,
    5650                .value = 0x1f
    5751        },
    … …  
    6155};
    6256
    63 static 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 /*----------------------------------------------------------------------------*/
    83 static 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 /*----------------------------------------------------------------------------*/
    88 static ddf_dev_ops_t uhci_ops = {
    89         .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
    90         .interfaces[USBHC_DEV_IFACE] = &uhci_iface,
    91 };
    92 /*----------------------------------------------------------------------------*/
    9357static int uhci_init_transfer_lists(uhci_t *instance);
    9458static int uhci_init_mem_structures(uhci_t *instance);
    … …  
    10165        bool low_speed, usb_transfer_type_t, size_t size);
    10266
    103 
    104 int 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...) \
     67#define CHECK_RET_RETURN(ret, message...) \
    11068        if (ret != EOK) { \
    11169                usb_log_error(message); \
    112                 if (instance->ddf_instance) \
    113                         ddf_fun_destroy(instance->ddf_instance); \
    11470                return ret; \
    11571        } else (void) 0
    11672
    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));
     73int uhci_init(uhci_t *instance, void *regs, size_t reg_size)
     74{
     75        assert(reg_size >= sizeof(regs_t));
    13076
    13177        /* allow access to hc control registers */
    13278        regs_t *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);
     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);
    13781        instance->registers = io;
    138         usb_log_debug("Device registers at %p(%u) accessible.\n",
    139             io, reg_size);
     82        usb_log_debug("Device registers accessible.\n");
    14083
    14184        ret = uhci_init_mem_structures(instance);
    142         CHECK_RET_DEST_FUN_RETURN(ret,
    143             "Failed to initialize UHCI memory structures.\n");
     85        CHECK_RET_RETURN(ret, "Failed to initialize memory structures.\n");
    14486
    14587        uhci_init_hw(instance);
    146         instance->cleaner =
    147             fibril_create(uhci_interrupt_emulator, instance);
    148         fibril_add_ready(instance->cleaner);
     88
     89        instance->cleaner = fibril_create(uhci_interrupt_emulator, instance);
     90//      fibril_add_ready(instance->cleaner);
    14991
    15092        instance->debug_checker = fibril_create(uhci_debug_checker, instance);
    15193        fibril_add_ready(instance->debug_checker);
    15294
    153         usb_log_info("Started UHCI driver.\n");
    154         return EOK;
    155 #undef CHECK_RET_DEST_FUN_RETURN
     95        return EOK;
    15696}
    15797/*----------------------------------------------------------------------------*/
    15898void uhci_init_hw(uhci_t *instance)
    15999{
    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); }
    171100
    172101        /* set framelist pointer */
    … …  
    176105        /* enable all interrupts, but resume interrupt */
    177106        pio_write_16(&instance->registers->usbintr,
    178             UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
     107                  UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
    179108
    180109        /* Start the hc with large(64B) packet FSBR */
    181110        pio_write_16(&instance->registers->usbcmd,
    182111            UHCI_CMD_RUN_STOP | UHCI_CMD_MAX_PACKET | UHCI_CMD_CONFIGURE);
     112        usb_log_debug("Started UHCI HC.\n");
    183113}
    184114/*----------------------------------------------------------------------------*/
    … …  
    186116{
    187117        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
    195118
    196119        /* init interrupt code */
    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         }
     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);
    209130
    210131        /* init transfer lists */
    211         ret = uhci_init_transfer_lists(instance);
    212         CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to initialize transfer lists.\n");
     132        int ret = uhci_init_transfer_lists(instance);
     133        CHECK_RET_RETURN(ret, "Failed to initialize transfer lists.\n");
    213134        usb_log_debug("Initialized transfer lists.\n");
    214135
    … …  
    216137        instance->frame_list = get_page();
    217138        ret = instance ? EOK : ENOMEM;
    218         CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to get frame list page.\n");
     139        CHECK_RET_RETURN(ret, "Failed to get frame list page.\n");
    219140        usb_log_debug("Initialized frame list.\n");
    220141
    … …  
    223144          instance->transfers_interrupt.queue_head_pa
    224145          | LINK_POINTER_QUEUE_HEAD_FLAG;
    225 
    226146        unsigned i = 0;
    227147        for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
    … …  
    230150
    231151        /* init address keeper(libusb) */
    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
     152        usb_address_keeping_init(&instance->address_manager, USB11_ADDRESS_MAX);
     153        usb_log_debug("Initialized address manager.\n");
     154
     155        return EOK;
    237156}
    238157/*----------------------------------------------------------------------------*/
    … …  
    240159{
    241160        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
    251161
    252162        /* initialize TODO: check errors */
    253163        int ret;
    254164        ret = transfer_list_init(&instance->transfers_bulk_full, "BULK_FULL");
    255         CHECK_RET_CLEAR_RETURN(ret, "Failed to init BULK list.");
    256 
     165        assert(ret == EOK);
    257166        ret = transfer_list_init(&instance->transfers_control_full, "CONTROL_FULL");
    258         CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL FULL list.");
    259 
     167        assert(ret == EOK);
    260168        ret = transfer_list_init(&instance->transfers_control_slow, "CONTROL_SLOW");
    261         CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL SLOW list.");
    262 
     169        assert(ret == EOK);
    263170        ret = transfer_list_init(&instance->transfers_interrupt, "INTERRUPT");
    264         CHECK_RET_CLEAR_RETURN(ret, "Failed to init INTERRUPT list.");
     171        assert(ret == EOK);
    265172
    266173        transfer_list_set_next(&instance->transfers_control_full,
    … …  
    289196
    290197        return EOK;
    291 #undef CHECK_RET_CLEAR_RETURN
    292198}
    293199/*----------------------------------------------------------------------------*/
    … …  
    296202        assert(instance);
    297203        assert(batch);
    298         const int low_speed = (batch->speed == USB_SPEED_LOW);
     204        const int low_speed = (batch->speed == LOW_SPEED);
    299205        if (!allowed_usb_packet(
    300206            low_speed, batch->transfer_type, batch->max_packet_size)) {
    301207                usb_log_warning("Invalid USB packet specified %s SPEED %d %zu.\n",
    302                     low_speed ? "LOW" : "FULL" , batch->transfer_type,
     208                          low_speed ? "LOW" : "FULL" , batch->transfer_type,
    303209                    batch->max_packet_size);
    304210                return ENOTSUP;
    … …  
    317223{
    318224        assert(instance);
    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);
     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);
    323232}
    324233/*----------------------------------------------------------------------------*/
    … …  
    329238        assert(instance);
    330239
    331         while (1) {
     240        while(1) {
    332241                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;
    336242                uhci_interrupt(instance, status);
    337                 pio_write_16(&instance->registers->usbsts, 0x1f);
    338                 async_usleep(UHCI_CLEANER_TIMEOUT * 5);
     243                async_usleep(UHCI_CLEANER_TIMEOUT);
    339244        }
    340245        return EOK;
    … …  
    345250        uhci_t *instance = (uhci_t*)arg;
    346251        assert(instance);
    347 
    348 #define QH(queue) \
    349         instance->transfers_##queue.queue_head
    350 
    351252        while (1) {
    352253                const uint16_t cmd = pio_read_16(&instance->registers->usbcmd);
    353254                const uint16_t sts = pio_read_16(&instance->registers->usbsts);
    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;
     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);
    364260                if (frame_list != addr_to_phys(instance->frame_list)) {
    365261                        usb_log_debug("Framelist address: %p vs. %p.\n",
    366                             frame_list, addr_to_phys(instance->frame_list));
    367                 }
    368 
     262                                frame_list, addr_to_phys(instance->frame_list));
     263                }
    369264                int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff;
    370265                usb_log_debug2("Framelist item: %d \n", frnum );
    371266
    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) {
     267                queue_head_t* qh = instance->transfers_interrupt.queue_head;
     268
     269                if ((instance->frame_list[frnum] & (~0xf)) != (uintptr_t)addr_to_phys(qh)) {
    375270                        usb_log_debug("Interrupt QH: %p vs. %p.\n",
    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                 }
     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*/
    399298                async_usleep(UHCI_DEBUGER_TIMEOUT);
    400299        }
    401300        return 0;
    402 #undef QH
    403301}
    404302/*----------------------------------------------------------------------------*/
    405303bool allowed_usb_packet(
    406     bool low_speed, usb_transfer_type_t transfer, size_t size)
     304        bool low_speed, usb_transfer_type_t transfer, size_t size)
    407305{
    408306        /* see USB specification chapter 5.5-5.8 for magic numbers used here */
    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);
     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);
    419316        }
    420317        return false;
Note: See TracChangeset for help on using the changeset viewer.