Changeset 0535ee4 in mainline

Timestamp:

2011-01-28T17:36:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

01656f2

Parents:

3fb3099c

Message:

Added debug_checker fibril (checks memory structures)

Fixed: Cleaning fibril checks all queues

Location:

uspace/drv/uhci

Files:

• uhci.c (modified) (4 diffs)
• uhci.h (modified) (2 diffs)

uspace/drv/uhci/uhci.c

@@ -11 +11 @@
 static int uhci_init_transfer_lists(transfer_list_t list[]);
 static int uhci_clean_finished(void *arg);
+static int uhci_debug_checker(void *arg);
 
 int uhci_init(device_t *device, void *regs)
@@ -79 +80 @@
         instance->cleaner = fibril_create(uhci_clean_finished, instance);
         fibril_add_ready(instance->cleaner);
+
+        instance->debug_checker = fibril_create(uhci_debug_checker, instance);
+        fibril_add_ready(instance->debug_checker);
 
         uhci_print_verbose("Starting UHCI HC.\n");
@@ -184 +188 @@
                 uhci_print_verbose("Running cleaning fibril on: %p.\n", instance);
                 /* iterate all transfer queues */
-                int i = 1;
+                int i = 0;
                 for (; i < TRANSFER_QUEUES; ++i) {
                         /* Remove inactive transfers from the top of the queue
                          * TODO: should I reach queue head or is this enough? */
-                        uhci_print_verbose("Running cleaning fibril on queue: %p.\n",
-                                &instance->transfers[i]);
+                        volatile transfer_descriptor_t * it =
+                                instance->transfers[i].first;
+                        uhci_print_verbose("Running cleaning fibril on queue: %p (%s).\n",
+                                &instance->transfers[i], it ? "SOMETHING" : "EMPTY");
                         while (instance->transfers[i].first &&
                          !(instance->transfers[i].first->status & TD_STATUS_ERROR_ACTIVE)) {
                                 transfer_descriptor_t *transfer = instance->transfers[i].first;
-                                uhci_print_verbose("Cleaning fibril found inactive transport.");
+                                uhci_print_info("Inactive transfer calling callback.\n");
                                 instance->transfers[i].first = transfer->next_va;
                                 transfer_descriptor_dispose(transfer);
@@ -200 +206 @@
                                 instance->transfers[i].last = instance->transfers[i].first;
                 }
-                async_usleep(1000000);
-        }
-        return EOK;
-}
+                async_usleep(UHCI_CLEANER_TIMEOUT);
+        }
+        return EOK;
+}
+/*---------------------------------------------------------------------------*/
+int uhci_debug_checker(void *arg)
+{
+        return 0;
+        uhci_t *instance = (uhci_t*)arg;
+        assert(instance);
+        while (1) {
+                uint16_t reg;
+                reg = pio_read_16(&instance->registers->usbcmd);
+                uhci_print_verbose("Command register: %X\n", reg);
+                reg = pio_read_16(&instance->registers->usbsts);
+                uhci_print_verbose("Status register: %X\n", reg);
+                uintptr_t frame_list = pio_read_32(&instance->registers->flbaseadd);
+                uhci_print_verbose("Framelist address: %p vs. %p.\n",
+                        frame_list, addr_to_phys(instance->frame_list));
+                int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff;
+                uhci_print_verbose("Framelist item: %d \n", frnum );
+
+                queue_head_t* qh = instance->transfers[USB_TRANSFER_INTERRUPT].queue_head;
+                uhci_print_verbose("Interrupt QH: %p vs. %p.\n",
+                        instance->frame_list[frnum], addr_to_phys(qh));
+
+                uhci_print_verbose("Control QH: %p vs. %p.\n", qh->next_queue,
+                        addr_to_phys(instance->transfers[USB_TRANSFER_CONTROL].queue_head));
+                qh = instance->transfers[USB_TRANSFER_CONTROL].queue_head;
+
+                uhci_print_verbose("Bulk QH: %p vs. %p.\n", qh->next_queue,
+                        addr_to_phys(instance->transfers[USB_TRANSFER_BULK].queue_head));
+
+                async_usleep(UHCI_DEBUGER_TIMEOUT);
+        }
+        return 0;
+}

uspace/drv/uhci/uhci.h

@@ -64 +64 @@
 #define TRANSFER_QUEUES 4
 #define UHCI_FRAME_LIST_COUNT 1024
+#define UHCI_CLEANER_TIMEOUT 5000000
+#define UHCI_DEBUGER_TIMEOUT 3000000
 
 typedef struct uhci {
@@ -74 +76 @@
         transfer_list_t transfers[TRANSFER_QUEUES];
         fid_t cleaner;
+        fid_t debug_checker;
 } uhci_t;