Changeset f58154c5 in mainline for uspace/drv/uhci-hcd

Timestamp:

2011-05-18T10:59:50Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

17fc40c

Parents:

b2995c3 (diff), aeca5a3 (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:

Minor fixes and comments

UHCI: use provided barrier defines (buffer allocator should be able to use cacheable memory)
libusb: make usb enumeration routine follow USB spec more closely (wait periods)
OHCI: handle hw errors
OHCI: use provided barrier defines (buffer allocator should be able to use cacheable memory)
OHCI: reduce maximum buffer size for one transaction, this relaxes requirements on allocator providing hw accessible buffers.(memory does not have to be continuous) The only requirement that stays is the 32bit pointers limit.

Location:

uspace/drv/uhci-hcd

Files:

• batch.c (modified) (3 diffs)
• transfer_list.c (modified) (4 diffs)
• utils/malloc32.h (modified) (1 diff)

uspace/drv/uhci-hcd/batch.c

@@ -45 +45 @@
 #define DEFAULT_ERROR_COUNT 3
 
+/** UHCI specific data required for USB transfer */
 typedef struct uhci_transfer_batch {
+        /** Queue head
+         * This QH is used to maintain UHCI schedule structure and the element
+         * pointer points to the first TD of this batch.
+         */
         qh_t *qh;
+        /** List of TDs needed for the transfer */
         td_t *tds;
+        /** Number of TDs used by the transfer */
+        size_t td_count;
+        /** Data buffer, must be accessible by the UHCI hw */
         void *device_buffer;
-        size_t td_count;
 } uhci_transfer_batch_t;
 /*----------------------------------------------------------------------------*/
-static void uhci_transfer_batch_dispose(void *uhci_batch)
-{
-        uhci_transfer_batch_t *instance = uhci_batch;
-        assert(instance);
-        free32(instance->device_buffer);
-        free(instance);
-}
-/*----------------------------------------------------------------------------*/
-
 static void batch_control(usb_transfer_batch_t *instance,
     usb_packet_id data_stage, usb_packet_id status_stage);
 static void batch_data(usb_transfer_batch_t *instance, usb_packet_id pid);
-
+/*----------------------------------------------------------------------------*/
+/** Safely destructs uhci_transfer_batch_t structure
+ *
+ * @param[in] uhci_batch Instance to destroy.
+ */
+static void uhci_transfer_batch_dispose(void *uhci_batch)
+{
+        uhci_transfer_batch_t *instance = uhci_batch;
+        assert(instance);
+        free32(instance->device_buffer);
+        free(instance);
+}
+/*----------------------------------------------------------------------------*/
 /** Allocate memory and initialize internal data structure.
  *
@@ -173 +184 @@
                 instance->error = td_status(&data->tds[i]);
                 if (instance->error != EOK) {
-                        usb_log_debug("Batch(%p) found error TD(%zu):%" PRIx32 ".\n",
-                            instance, i, data->tds[i].status);
+                        usb_log_debug("Batch(%p) found error TD(%zu):%"
+                            PRIx32 ".\n", instance, i, data->tds[i].status);
                         td_print_status(&data->tds[i]);
 
@@ -397 +408 @@
 /*----------------------------------------------------------------------------*/
 /** Provides access to QH data structure.
+ *
  * @param[in] instance Batch pointer to use.
  * @return Pointer to the QH used by the batch.

uspace/drv/uhci-hcd/transfer_list.c

@@ -34 +34 @@
 #include <errno.h>
 #include <usb/debug.h>
+#include <arch/barrier.h>
 
 #include "transfer_list.h"
@@ -71 +72 @@
  * @param[in] instance Memory place to use.
  *
- * Frees memory for internal qh_t structure.
+ * Frees memory of the internal qh_t structure.
  */
 void transfer_list_fini(transfer_list_t *instance)
@@ -126 +127 @@
         assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
 
+        /* Make sure all data in the batch are written */
+        write_barrier();
+
         /* keep link */
         batch_qh(batch)->next = last_qh->next;
         qh_set_next_qh(last_qh, batch_qh(batch));
 
-        asm volatile ("": : :"memory");
+        /* Make sure the pointer is updated */
+        write_barrier();
 
         /* Add to the driver list */
@@ -222 +227 @@
             == addr_to_phys(batch_qh(batch)));
         prev_qh->next = batch_qh(batch)->next;
-        asm volatile ("": : :"memory");
+
+        /* Make sure the pointer is updated */
+        write_barrier();
+
         /* Remove from the batch list */
         list_remove(&batch->link);

uspace/drv/uhci-hcd/utils/malloc32.h

@@ -74 +74 @@
         if (size <= SLAB_ELEMENT_SIZE)
                 return slab_malloc_g();
-        assert(false);
+        usb_log_warning("Requested %zu bytes, current allocator can't handle "
+            "that amount, pray that the standard malloc will suffice.", size);
         return memalign(UHCI_STRCUTURES_ALIGNMENT, size);
 }