Changeset 00aece0 in mainline for uspace/drv/bus/usb/uhci/hc.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/drv/bus/usb/uhci/hc.c (modified) (14 diffs)

uspace/drv/bus/usb/uhci/hc.c

@@ -41 +41 @@
 
 #include "hc.h"
+#include "uhci_batch.h"
 
 #define UHCI_INTR_ALLOW_INTERRUPTS \
@@ -47 +48 @@
     (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)
 
-static const irq_cmd_t uhci_irq_commands[] =
-{
+static const irq_pio_range_t uhci_irq_pio_ranges[] = {
+        {
+                .base = 0,      /* filled later */
+                .size = sizeof(uhci_regs_t)
+        }
+};
+
+static const irq_cmd_t uhci_irq_commands[] = {
         { .cmd = CMD_PIO_READ_16, .dstarg = 1, .addr = NULL/*filled later*/},
         { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2,
@@ -57 +64 @@
 };
 
+static void hc_init_hw(const hc_t *instance);
+static int hc_init_mem_structures(hc_t *instance);
 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_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 
 static int hc_interrupt_emulator(void *arg);
@@ -65 +73 @@
 
 /*----------------------------------------------------------------------------*/
+/** Get number of PIO ranges used in IRQ code.
+ * @return Number of ranges.
+ */
+size_t hc_irq_pio_range_count(void)
+{
+        return sizeof(uhci_irq_pio_ranges) / sizeof(irq_pio_range_t);
+}
+/*----------------------------------------------------------------------------*/
 /** Get number of commands used in IRQ code.
  * @return Number of commands.
@@ -73 +89 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Generate IRQ code commands.
- * @param[out] cmds Place to store the commands.
- * @param[in] cmd_size Size of the place (bytes).
+/** Generate IRQ code.
+ * @param[out] ranges PIO ranges buffer.
+ * @param[in] ranges_size Size of the ranges buffer (bytes).
+ * @param[out] cmds Commands buffer.
+ * @param[in] cmds_size Size of the commands buffer (bytes).
  * @param[in] regs Physical address of device's registers.
  * @param[in] reg_size Size of the register area (bytes).
@@ -81 +99 @@
  * @return Error code.
  */
-int hc_get_irq_commands(
-    irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size)
-{
-        if (cmd_size < sizeof(uhci_irq_commands)
-            || reg_size < sizeof(uhci_regs_t))
+int
+hc_get_irq_code(irq_pio_range_t ranges[], size_t ranges_size, irq_cmd_t cmds[],
+    size_t cmds_size, uintptr_t regs, size_t reg_size)
+{
+        if ((ranges_size < sizeof(uhci_irq_pio_ranges)) ||
+            (cmds_size < sizeof(uhci_irq_commands)) ||
+            (reg_size < sizeof(uhci_regs_t)))
                 return EOVERFLOW;
 
-        uhci_regs_t *registers = (uhci_regs_t*)regs;
+        memcpy(ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges));
+        ranges[0].base = regs;
 
         memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
-
-        cmds[0].addr = (void*)&registers->usbsts;
-        cmds[3].addr = (void*)&registers->usbsts;
-        return EOK;
+        uhci_regs_t *registers = (uhci_regs_t *) regs;
+        cmds[0].addr = &registers->usbsts;
+        cmds[3].addr = &registers->usbsts;
+
+        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);
+        /* Lower 2 bits are transaction error and transaction complete */
+        if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {
+                LIST_INITIALIZE(done);
+                transfer_list_remove_finished(
+                    &instance->transfers_interrupt, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_control_slow, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_control_full, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_bulk_full, &done);
+
+                while (!list_empty(&done)) {
+                        link_t *item = list_first(&done);
+                        list_remove(item);
+                        uhci_transfer_batch_t *batch =
+                            uhci_transfer_batch_from_link(item);
+                        uhci_transfer_batch_finish_dispose(batch);
+                }
+        }
+        /* Resume interrupts are not supported */
+        if (status & UHCI_STATUS_RESUME) {
+                usb_log_error("Resume interrupt!\n");
+        }
+
+        /* Bits 4 and 5 indicate hc error */
+        if (status & (UHCI_STATUS_PROCESS_ERROR | UHCI_STATUS_SYSTEM_ERROR)) {
+                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);
+                }
+        }
 }
 /*----------------------------------------------------------------------------*/
@@ -137 +216 @@
             str_error(ret));
 
+#undef CHECK_RET_RETURN
+
+        hcd_init(&instance->generic, USB_SPEED_FULL,
+            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
+
+        instance->generic.private_data = instance;
+        instance->generic.schedule = hc_schedule;
+        instance->generic.ep_add_hook = NULL;
+
         hc_init_hw(instance);
         if (!interrupts) {
@@ -146 +234 @@
 
         return EOK;
-#undef CHECK_RET_DEST_FUN_RETURN
 }
 /*----------------------------------------------------------------------------*/
@@ -154 +241 @@
  * For magic values see UHCI Design Guide
  */
-void hc_init_hw(hc_t *instance)
+void hc_init_hw(const hc_t *instance)
 {
         assert(instance);
@@ -198 +285 @@
  *
  * 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)
@@ -205 +291 @@
 {
         assert(instance);
-#define CHECK_RET_RETURN(ret, message...) \
-        if (ret != EOK) { \
-                usb_log_error(message); \
-                return ret; \
-        } else (void) 0
+
+        /* Init USB frame list page */
+        instance->frame_list = get_page();
+        if (!instance->frame_list) {
+                return ENOMEM;
+        }
+        usb_log_debug("Initialized frame list at %p.\n", instance->frame_list);
 
         /* Init transfer lists */
         int ret = hc_init_transfer_lists(instance);
-        CHECK_RET_RETURN(ret, "Failed to initialize transfer lists.\n");
+        if (ret != EOK) {
+                usb_log_error("Failed to initialize transfer lists.\n");
+                return_page(instance->frame_list);
+                return ENOMEM;
+        }
         usb_log_debug("Initialized transfer lists.\n");
 
-        /* Init device keeper */
-        usb_device_keeper_init(&instance->manager);
-        usb_log_debug("Initialized device keeper.\n");
-
-        ret = usb_endpoint_manager_init(&instance->ep_manager,
-            BANDWIDTH_AVAILABLE_USB11);
-        CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n",
-            str_error(ret));
-
-        /* Init USB frame list page*/
-        instance->frame_list = get_page();
-        if (!instance->frame_list) {
-                usb_log_error("Failed to get frame list page.\n");
-                usb_endpoint_manager_destroy(&instance->ep_manager);
-                return ENOMEM;
-        }
-        usb_log_debug("Initialized frame list at %p.\n", instance->frame_list);
 
         /* Set all frames to point to the first queue head */
         const uint32_t queue = LINK_POINTER_QH(
                 addr_to_phys(instance->transfers_interrupt.queue_head));
-        unsigned i = 0;
-        for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
+
+        for (unsigned i = 0; i < UHCI_FRAME_LIST_COUNT; ++i) {
                 instance->frame_list[i] = queue;
         }
 
         return EOK;
-#undef CHECK_RET_RETURN
 }
 /*----------------------------------------------------------------------------*/
@@ -316 +390 @@
  * Checks for bandwidth availability and appends the batch to the proper queue.
  */
-int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch)
-{
+int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
+{
+        assert(hcd);
+        hc_t *instance = hcd->private_data;
         assert(instance);
         assert(batch);
+        uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);
+        if (!uhci_batch) {
+                usb_log_error("Failed to create UHCI transfer structures.\n");
+                return ENOMEM;
+        }
 
         transfer_list_t *list =
             instance->transfers[batch->ep->speed][batch->ep->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);
-        /* Lower 2 bits are transaction error and transaction complete */
-        if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {
-                LIST_INITIALIZE(done);
-                transfer_list_remove_finished(
-                    &instance->transfers_interrupt, &done);
-                transfer_list_remove_finished(
-                    &instance->transfers_control_slow, &done);
-                transfer_list_remove_finished(
-                    &instance->transfers_control_full, &done);
-                transfer_list_remove_finished(
-                    &instance->transfers_bulk_full, &done);
-
-                while (!list_empty(&done)) {
-                        link_t *item = list_first(&done);
-                        list_remove(item);
-                        usb_transfer_batch_t *batch =
-                            list_get_instance(item, usb_transfer_batch_t, link);
-                        usb_transfer_batch_finish(batch);
-                }
-        }
-        /* Resume interrupts are not supported */
-        if (status & UHCI_STATUS_RESUME) {
-                usb_log_error("Resume interrupt!\n");
-        }
-
-        /* Bits 4 and 5 indicate hc error */
-        if (status & (UHCI_STATUS_PROCESS_ERROR | UHCI_STATUS_SYSTEM_ERROR)) {
-                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);
-                }
-        }
+        transfer_list_add_batch(list, uhci_batch);
+
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -403 +427 @@
                 if (status != 0)
                         usb_log_debug2("UHCI status: %x.\n", status);
-// Qemu fails to report stalled communication
-// see https://bugs.launchpad.net/qemu/+bug/757654
-// This is a simple workaround to force queue processing every time
-        //      status |= 1;
                 hc_interrupt(instance, status);
                 async_usleep(UHCI_INT_EMULATOR_TIMEOUT);
@@ -412 +432 @@
         return EOK;
 }
-/*---------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------*/
 /** Debug function, checks consistency of memory structures.
  *