Changes in uspace/drv/uhci-hcd/uhci.c [b9d910f:1ae51ae] in mainline

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (10 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -33 +33 @@
  */
 #include <errno.h>
+#include <str_error.h>
 #include <adt/list.h>
+#include <libarch/ddi.h>
 
 #include <usb/debug.h>
 #include <usb/usb.h>
+#include <usb/ddfiface.h>
+#include <usb_iface.h>
 
 #include "uhci.h"
+#include "iface.h"
+
 static irq_cmd_t uhci_cmds[] = {
         {
                 .cmd = CMD_PIO_READ_16,
-                .addr = (void*)0xc022,
+                .addr = NULL, /* patched for every instance */
                 .dstarg = 1
         },
         {
                 .cmd = CMD_PIO_WRITE_16,
-                .addr = (void*)0xc022,
+                .addr = NULL, /* pathed for every instance */
                 .value = 0x1f
         },
@@ -53 +59 @@
                 .cmd = CMD_ACCEPT
         }
+};
+
+static int usb_iface_get_address(ddf_fun_t *fun, devman_handle_t handle,
+    usb_address_t *address)
+{
+        assert(fun);
+        uhci_t *hc = fun_to_uhci(fun);
+        assert(hc);
+
+        usb_address_t addr = device_keeper_find(&hc->device_manager,
+            handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        if (address != NULL) {
+                *address = addr;
+        }
+
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static usb_iface_t hc_usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
+        .get_address = usb_iface_get_address
+};
+/*----------------------------------------------------------------------------*/
+static ddf_dev_ops_t uhci_ops = {
+        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
+        .interfaces[USBHC_DEV_IFACE] = &uhci_iface,
 };
 
@@ -71 +107 @@
         } else (void) 0
 
-int uhci_init(uhci_t *instance, void *regs, size_t reg_size)
+int uhci_init(uhci_t *instance, ddf_dev_t *dev, void *regs, size_t reg_size)
 {
         assert(reg_size >= sizeof(regs_t));
+        int ret;
+
+        /*
+         * Create UHCI function.
+         */
+        instance->ddf_instance = ddf_fun_create(dev, fun_exposed, "uhci");
+        if (instance->ddf_instance == NULL) {
+                usb_log_error("Failed to create UHCI device function.\n");
+                return ENOMEM;
+        }
+        instance->ddf_instance->ops = &uhci_ops;
+        instance->ddf_instance->driver_data = instance;
+
+        ret = ddf_fun_bind(instance->ddf_instance);
+        CHECK_RET_RETURN(ret, "Failed to bind UHCI device function: %s.\n",
+            str_error(ret));
 
         /* allow access to hc control registers */
         regs_t *io;
-        int ret = pio_enable(regs, reg_size, (void**)&io);
+        ret = pio_enable(regs, reg_size, (void**)&io);
         CHECK_RET_RETURN(ret, "Failed to gain access to registers at %p.\n", io);
         instance->registers = io;
@@ -88 +140 @@
 
         instance->cleaner = fibril_create(uhci_interrupt_emulator, instance);
-//      fibril_add_ready(instance->cleaner);
+        fibril_add_ready(instance->cleaner);
 
         instance->debug_checker = fibril_create(uhci_debug_checker, instance);
@@ -98 +150 @@
 void uhci_init_hw(uhci_t *instance)
 {
+        /* reset everything, who knows what touched it before us */
+        pio_write_16(&instance->registers->usbcmd, UHCI_CMD_GLOBAL_RESET);
+        async_usleep(10000); /* 10ms according to USB spec */
+        pio_write_16(&instance->registers->usbcmd, 0);
+
+        /* reset hc, all states and counters */
+        pio_write_16(&instance->registers->usbcmd, UHCI_CMD_HCRESET);
+        while ((pio_read_16(&instance->registers->usbcmd) & UHCI_CMD_HCRESET) != 0)
+                { async_usleep(10); }
 
         /* set framelist pointer */
@@ -150 +211 @@
 
         /* init address keeper(libusb) */
-        usb_address_keeping_init(&instance->address_manager, USB11_ADDRESS_MAX);
-        usb_log_debug("Initialized address manager.\n");
+        device_keeper_init(&instance->device_manager);
+        usb_log_debug("Initialized device manager.\n");
 
         return EOK;
@@ -202 +263 @@
         assert(instance);
         assert(batch);
-        const int low_speed = (batch->speed == LOW_SPEED);
+        const int low_speed = (batch->speed == USB_SPEED_LOW);
         if (!allowed_usb_packet(
             low_speed, batch->transfer_type, batch->max_packet_size)) {
@@ -223 +284 @@
 {
         assert(instance);
-        if ((status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) == 0)
-                return;
-        usb_log_debug("UHCI interrupt: %X.\n", status);
-        transfer_list_check(&instance->transfers_interrupt);
-        transfer_list_check(&instance->transfers_control_slow);
-        transfer_list_check(&instance->transfers_control_full);
-        transfer_list_check(&instance->transfers_bulk_full);
+//      if ((status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) == 0)
+//              return;
+//      usb_log_debug2("UHCI interrupt: %X.\n", status);
+        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);
 }
 /*----------------------------------------------------------------------------*/
@@ -238 +299 @@
         assert(instance);
 
-        while(1) {
+        while (1) {
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
+                if (status != 0)
+                        usb_log_debug2("UHCI status: %x.\n", status);
+                status |= 1;
                 uhci_interrupt(instance, status);
-                async_usleep(UHCI_CLEANER_TIMEOUT);
+                pio_write_16(&instance->registers->usbsts, 0x1f);
+                async_usleep(UHCI_CLEANER_TIMEOUT * 5);
         }
         return EOK;
@@ -254 +319 @@
                 const uint16_t sts = pio_read_16(&instance->registers->usbsts);
                 const uint16_t intr = pio_read_16(&instance->registers->usbintr);
-                usb_log_debug("Command: %X Status: %X Interrupts: %x\n",
-                    cmd, sts, intr);
-
-                uintptr_t frame_list = pio_read_32(&instance->registers->flbaseadd);
+                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",