Changeset 86c2ccd in mainline

Timestamp:

2011-02-26T01:25:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

eb292a0

Parents:

c3ae877

Message:

Fixes

Fixed: infinite loop in device_keeper
Fixed: assertion fail in device_keeper
Fixed: Callback on batches after releasing transfer_list mutex
Fixed: debug output in pci.c

Location:

uspace/drv/uhci-hcd

Files:

• batch.c (modified) (4 diffs)
• pci.c (modified) (2 diffs)
• transfer_list.c (modified) (3 diffs)
• transfer_list.h (modified) (1 diff)
• uhci.c (modified) (3 diffs)
• utils/device_keeper.c (modified) (2 diffs)

uspace/drv/uhci-hcd/batch.c

@@ -33 +33 @@
  */
 #include <errno.h>
+#include <str_error.h>
 
 #include <usb/debug.h>
@@ -194 +195 @@
 
         instance->tds[i].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
+        usb_log_debug("Control write last TD status: %x.\n",
+                instance->tds[i].status);
 
         instance->next_step = batch_call_out_and_dispose;
@@ -228 +231 @@
 
         instance->tds[i].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
+        usb_log_debug("Control read last TD status: %x.\n",
+                instance->tds[i].status);
 
         instance->next_step = batch_call_in_and_dispose;
@@ -293 +298 @@
 
         int err = instance->error;
-        usb_log_info("Callback IN(%d): %d, %zu.\n", instance->transfer_type,
-            err, instance->transfered_size);
+        usb_log_info("Callback IN(%d): %s(%d), %zu.\n", instance->transfer_type,
+            str_error(err), err, instance->transfered_size);
 
         instance->callback_in(instance->fun,

uspace/drv/uhci-hcd/pci.c

@@ -90 +90 @@
                                 io_address = res->res.io_range.address;
                                 io_size = res->res.io_range.size;
-                                usb_log_debug("Found io: %x %d.\n",
-                                    res->res.io_range.address, res->res.io_range.size);
+                                usb_log_debug("Found io: %llx %zu %zu.\n",
+                                    res->res.io_range.address, res->res.io_range.size, io_size);
                                 io_found = true;
                                 break;
@@ -125 +125 @@
             IPC_FLAG_BLOCKING);
         bool enabled = hw_res_enable_interrupt(parent_phone);
+        async_hangup(parent_phone);
         return enabled ? EOK : EIO;
 }

uspace/drv/uhci-hcd/transfer_list.c

@@ -70 +70 @@
         assert(instance);
         assert(batch);
+        usb_log_debug("Adding batch(%p) to queue %s.\n", batch, instance->name);
 
         uint32_t pa = (uintptr_t)addr_to_phys(batch->qh);
@@ -123 +124 @@
 }
 /*----------------------------------------------------------------------------*/
-void transfer_list_check(transfer_list_t *instance)
+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;
@@ -134 +138 @@
                 if (batch_is_complete(batch)) {
                         transfer_list_remove_batch(instance, batch);
-                        batch->next_step(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

@@ -60 +60 @@
         queue_head_dispose(instance->queue_head);
 }
-void transfer_list_check(transfer_list_t *instance);
+void transfer_list_remove_finished(transfer_list_t *instance);
 
 void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch);

uspace/drv/uhci-hcd/uhci.c

@@ -285 +285 @@
                 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);
+        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);
 }
 /*----------------------------------------------------------------------------*/
@@ -297 +297 @@
         assert(instance);
 
-        while(1) {
+        while (1) {
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
                 usb_log_debug("UHCI status: %x.\n", status);
@@ -303 +303 @@
                 uhci_interrupt(instance, status);
                 pio_write_16(&instance->registers->usbsts, 0x1f);
-                async_usleep(UHCI_CLEANER_TIMEOUT * 1000);
+                async_usleep(UHCI_CLEANER_TIMEOUT * 5);
         }
         return EOK;

uspace/drv/uhci-hcd/utils/device_keeper.c

@@ -136 +136 @@
                         return address;
                 }
+                ++address;
         }
         fibril_mutex_unlock(&instance->guard);
@@ -147 +148 @@
         assert(address >= 0);
         assert(address <= USB11_ADDRESS_MAX);
-        assert(instance->devices[address].occupied);
         return instance->devices[address].speed;
 }