Changes in / [0fd82c9:039c66c] in mainline

Location:

uspace/drv/uhci-hcd

Files:

• batch.c (modified) (3 diffs)
• batch.h (modified) (1 diff)
• transfer_list.c (modified) (2 diffs)
• transfer_list.h (modified) (1 diff)
• uhci_hc.c (modified) (4 diffs)
• uhci_hc.h (modified) (2 diffs)
• uhci_struct/transfer_descriptor.c (modified) (1 diff)

uspace/drv/uhci-hcd/batch.c

@@ -153 +153 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Mark batch as failed and continue with next step.
- *
- * @param[in] instance Batch structure to use.
- *
- */
-void batch_abort(batch_t *instance)
-{
-        assert(instance);
-        instance->error = EIO;
-        instance->next_step(instance);
-}
-/*----------------------------------------------------------------------------*/
 /** Check batch TDs for activity.
  *
@@ -263 +251 @@
         assert(instance);
         /* We are data out, we are supposed to provide data */
-        memcpy(instance->transport_buffer, instance->buffer,
-            instance->buffer_size);
+        memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
         batch_data(instance, USB_PID_OUT);
         instance->next_step = batch_call_out_and_dispose;
@@ -294 +281 @@
         assert(instance);
         /* We are data out, we are supposed to provide data */
-        memcpy(instance->transport_buffer, instance->buffer,
-            instance->buffer_size);
+        memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
         batch_data(instance, USB_PID_OUT);
         instance->next_step = batch_call_out_and_dispose;

uspace/drv/uhci-hcd/batch.h

@@ -69 +69 @@
 } batch_t;
 
-batch_t * batch_get(
-    ddf_fun_t *fun,
-                usb_target_t target,
-    usb_transfer_type_t transfer_type,
-                size_t max_packet_size,
-    usb_speed_t speed,
-                char *buffer,
-                size_t size,
-                char *setup_buffer,
-                size_t setup_size,
+batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
+    usb_transfer_type_t transfer_type, size_t max_packet_size,
+    usb_speed_t speed, char *buffer, size_t size,
+                char *setup_buffer, size_t setup_size,
     usbhc_iface_transfer_in_callback_t func_in,
-    usbhc_iface_transfer_out_callback_t func_out,
-                void *arg,
+    usbhc_iface_transfer_out_callback_t func_out, void *arg,
                 device_keeper_t *manager
                 );
 
 void batch_dispose(batch_t *instance);
-
-void batch_abort(batch_t *instance);
 
 bool batch_is_complete(batch_t *instance);

uspace/drv/uhci-hcd/transfer_list.c

@@ -129 +129 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Check list for finished batches.
- *
- * @param[in] instance List to use.
- * @return Error code
- *
- * Creates a local list of finished batches and calls next_step on each and
- * every one. This is safer because next_step may theoretically access
- * this transfer list leading to the deadlock if its done inline.
- */
-void transfer_list_remove_finished(transfer_list_t *instance)
-{
-        assert(instance);
-
-        LIST_INITIALIZE(done);
-
-        fibril_mutex_lock(&instance->guard);
-        link_t *current = instance->batch_list.next;
-        while (current != &instance->batch_list) {
-                link_t *next = current->next;
-                batch_t *batch = list_get_instance(current, batch_t, link);
-
-                if (batch_is_complete(batch)) {
-                        /* Save for post-processing */
-                        transfer_list_remove_batch(instance, batch);
-                        list_append(current, &done);
-                }
-                current = next;
-        }
-        fibril_mutex_unlock(&instance->guard);
-
-        while (!list_empty(&done)) {
-                link_t *item = done.next;
-                list_remove(item);
-                batch_t *batch = list_get_instance(item, batch_t, link);
-                batch->next_step(batch);
-        }
-}
-/*----------------------------------------------------------------------------*/
-/** Walk the list and abort all batches.
- *
- * @param[in] instance List to use.
- */
-void transfer_list_abort_all(transfer_list_t *instance)
-{
-        fibril_mutex_lock(&instance->guard);
-        while (list_empty(&instance->batch_list)) {
-                link_t *current = instance->batch_list.next;
-                batch_t *batch = list_get_instance(current, batch_t, link);
-                transfer_list_remove_batch(instance, batch);
-                batch_abort(batch);
-        }
-        fibril_mutex_unlock(&instance->guard);
-}
-/*----------------------------------------------------------------------------*/
 /** Remove a transfer batch from the list and queue.
  *
@@ -217 +163 @@
             batch, pos, instance->name, batch->qh->next);
 }
+/*----------------------------------------------------------------------------*/
+/** Check list for finished batches.
+ *
+ * @param[in] instance List to use.
+ * @return Error code
+ *
+ * Creates a local list of finished batches and calls next_step on each and
+ * every one. This is safer because next_step may theoretically access
+ * this transfer list leading to the deadlock if its done inline.
+ */
+void transfer_list_remove_finished(transfer_list_t *instance)
+{
+        assert(instance);
+
+        LIST_INITIALIZE(done);
+
+        fibril_mutex_lock(&instance->guard);
+        link_t *current = instance->batch_list.next;
+        while (current != &instance->batch_list) {
+                link_t *next = current->next;
+                batch_t *batch = list_get_instance(current, batch_t, link);
+
+                if (batch_is_complete(batch)) {
+                        /* Save for post-processing */
+                        transfer_list_remove_batch(instance, batch);
+                        list_append(current, &done);
+                }
+                current = next;
+        }
+        fibril_mutex_unlock(&instance->guard);
+
+        while (!list_empty(&done)) {
+                link_t *item = done.next;
+                list_remove(item);
+                batch_t *batch = list_get_instance(item, batch_t, link);
+                batch->next_step(batch);
+        }
+}
 /**
  * @}

uspace/drv/uhci-hcd/transfer_list.h

@@ -66 +66 @@
 void transfer_list_set_next(transfer_list_t *instance, transfer_list_t *next);
 
-void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch);
-
 void transfer_list_remove_finished(transfer_list_t *instance);
 
-void transfer_list_abort_all(transfer_list_t *instance);
+void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch);
 #endif
 /**

uspace/drv/uhci-hcd/uhci_hc.c

@@ -97 +97 @@
 
         instance->hw_interrupts = interrupts;
-        instance->hw_failures = 0;
-
         /* Setup UHCI function. */
         instance->ddf_instance = fun;
@@ -151 +149 @@
         while ((pio_read_16(&registers->usbcmd) & UHCI_CMD_HCRESET) != 0);
 
-        /* Set frame to exactly 1ms */
-        pio_write_8(&registers->sofmod, 64);
-
-        /* Set frame list pointer */
+        /* Set framelist pointer */
         const uint32_t pa = addr_to_phys(instance->frame_list);
         pio_write_32(&registers->flbaseadd, pa);
@@ -352 +347 @@
 {
         assert(instance);
-        /* TODO: Resume interrupts are not supported */
+        /* TODO: Check interrupt cause here */
         /* Lower 2 bits are transaction error and transaction complete */
         if (status & 0x3) {
@@ -359 +354 @@
                 transfer_list_remove_finished(&instance->transfers_control_full);
                 transfer_list_remove_finished(&instance->transfers_bulk_full);
-        }
-        /* bits 4 and 5 indicate hc error */
-        if (status & 0x18) {
-                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*/
-                        uhci_hc_init_hw(instance);
-                } else {
-                        usb_log_fatal("Too many UHCI hardware failures!.\n");
-                        uhci_hc_fini(instance);
-                }
         }
 }

uspace/drv/uhci-hcd/uhci_hc.h

@@ -80 +80 @@
 #define UHCI_CLEANER_TIMEOUT 10000
 #define UHCI_DEBUGER_TIMEOUT 5000000
-#define UHCI_ALLOWED_HW_FAIL 5
 
 typedef struct uhci_hc {
@@ -101 +100 @@
         fid_t debug_checker;
         bool hw_interrupts;
-        unsigned hw_failures;
 
         ddf_fun_t *ddf_instance;

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

@@ -159 +159 @@
             (s & TD_STATUS_ERROR_BIT_STUFF) ? " BIT_STUFF," : "",
             (s & TD_STATUS_ERROR_RESERVED) ? " RESERVED," : "",
-            td_act_size(instance)
+            (s >> TD_STATUS_ACTLEN_POS) & TD_STATUS_ACTLEN_MASK
         );
 }