Changes in / [31b568e:e099f26] in mainline

Location:

uspace

Files:

• drv/uhci-hcd/transfer_list.c (modified) (4 diffs)
• drv/uhci-hcd/transfers.c (deleted)
• drv/uhci-hcd/uhci_hc.c (modified) (1 diff)
• drv/uhci-hcd/uhci_struct/link_pointer.h (modified) (1 diff)
• drv/uhci-hcd/uhci_struct/queue_head.h (modified) (3 diffs)
• drv/uhci-hcd/uhci_struct/transfer_descriptor.c (modified) (3 diffs)
• drv/uhci-hcd/utils/malloc32.h (modified) (1 diff)
• lib/usb/src/host/device_keeper.c (modified) (1 diff)

uspace/drv/uhci-hcd/transfer_list.c

@@ -79 +79 @@
         if (!instance->queue_head)
                 return;
-        /* Set both next and element to point to the same QH */
+        /* Set both queue_head.next to point to the follower */
         qh_set_next_qh(instance->queue_head, next->queue_head_pa);
-        qh_set_element_qh(instance->queue_head, next->queue_head_pa);
 }
 /*----------------------------------------------------------------------------*/
@@ -98 +97 @@
         usb_log_debug2("Queue %s: Adding batch(%p).\n", instance->name, batch);
 
-        const uint32_t pa = addr_to_phys(batch_qh(batch));
-        assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
-
-        /* New batch will be added to the end of the current list
-         * so set the link accordingly */
-        qh_set_next_qh(batch_qh(batch), instance->queue_head->next);
-
         fibril_mutex_lock(&instance->guard);
 
+        qh_t *last_qh = NULL;
         /* Add to the hardware queue. */
         if (list_empty(&instance->batch_list)) {
                 /* There is nothing scheduled */
-                qh_t *qh = instance->queue_head;
-                assert(qh->element == qh->next);
-                qh_set_element_qh(qh, pa);
+                last_qh = instance->queue_head;
         } else {
                 /* There is something scheduled */
                 usb_transfer_batch_t *last = list_get_instance(
                     instance->batch_list.prev, usb_transfer_batch_t, link);
-                qh_set_next_qh(batch_qh(last), pa);
-        }
+                last_qh = batch_qh(last);
+        }
+        const uint32_t pa = addr_to_phys(batch->qh);
+        assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
+
+        /* keep link */
+        batch_qh(batch)->next = last_qh->next;
+        qh_set_next_qh(last_qh, pa);
+
         /* Add to the driver list */
         list_append(&batch->link, &instance->batch_list);
@@ -174 +172 @@
 {
         fibril_mutex_lock(&instance->guard);
-        while (list_empty(&instance->batch_list)) {
+        while (!list_empty(&instance->batch_list)) {
                 link_t *current = instance->batch_list.next;
                 usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
@@ -197 +195 @@
         assert(batch);
         assert(batch_qh(batch));
+        assert(fibril_mutex_is_locked(&instance->guard));
+
         usb_log_debug2(
             "Queue %s: removing batch(%p).\n", instance->name, batch);
 
-        const char * pos = NULL;
+        const char *qpos = NULL;
         /* Remove from the hardware queue */
-        if (batch->link.prev == &instance->batch_list) {
+        if (instance->batch_list.next == &batch->link) {
                 /* I'm the first one here */
-                qh_set_element_qh(instance->queue_head, batch_qh(batch)->next);
-                pos = "FIRST";
+                assert((instance->queue_head->next & LINK_POINTER_ADDRESS_MASK)
+                    == addr_to_phys(bathc_qh(batch)));
+                instance->queue_head->next = batch_qh(batch)->next;
+                qpos = "FIRST";
         } else {
                 usb_transfer_batch_t *prev =
                     list_get_instance(batch->link.prev, usb_transfer_batch_t, link);
-                qh_set_next_qh(batch_qh(prev), batch_qh(batch)->next);
-                pos = "NOT FIRST";
-        }
-        /* Remove from the driver list */
+                assert((batch_qh(prev)->next & LINK_POINTER_ADDRESS_MASK)
+                    == addr_to_phys(batch_qh(batch)));
+                batch_qh(prev)->next = batch_qh(batch)->next;
+                qpos = "NOT FIRST";
+        }
+        /* Remove from the batch list */
         list_remove(&batch->link);
-        usb_log_debug("Batch(%p) removed (%s) from %s, next element %x.\n",
+        usb_log_debug("Batch(%p) removed (%s) from %s, next %x.\n",
             batch, pos, instance->name, batch_qh(batch)->next);
 }

uspace/drv/uhci-hcd/uhci_hc.c

@@ -125 +125 @@
         }
 
-        instance->debug_checker = fibril_create(uhci_hc_debug_checker, instance);
-        fibril_add_ready(instance->debug_checker);
+        instance->debug_checker =
+            fibril_create(uhci_hc_debug_checker, instance);
+//      fibril_add_ready(instance->debug_checker);
 
         return EOK;

uspace/drv/uhci-hcd/uhci_struct/link_pointer.h

@@ -49 +49 @@
         ((address & LINK_POINTER_ADDRESS_MASK) | LINK_POINTER_QUEUE_HEAD_FLAG)
 
+#define LINK_POINTER_TD(address) \
+        (address & LINK_POINTER_ADDRESS_MASK)
+
+#define LINK_POINTER_TERM \
+        ((link_pointer_t)LINK_POINTER_TERMINATE_FLAG)
+
 #endif
 /**

uspace/drv/uhci-hcd/uhci_struct/queue_head.h

@@ -72 +72 @@
         /* Address is valid and not terminal */
         if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
-                instance->next = (pa & LINK_POINTER_ADDRESS_MASK)
-                    | LINK_POINTER_QUEUE_HEAD_FLAG;
+                instance->next = LINK_POINTER_QH(pa);
         } else {
-                instance->next = 0 | LINK_POINTER_TERMINATE_FLAG;
+                instance->next = LINK_POINTER_TERM;
         }
 }
@@ -91 +90 @@
         /* Address is valid and not terminal */
         if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
-                instance->element = (pa & LINK_POINTER_ADDRESS_MASK)
-                    | LINK_POINTER_QUEUE_HEAD_FLAG;
+                instance->element = LINK_POINTER_QH(pa);
         } else {
-                instance->element = 0 | LINK_POINTER_TERMINATE_FLAG;
+                instance->element = LINK_POINTER_TERM;
         }
 }
@@ -109 +107 @@
 {
         if (pa && ((pa & LINK_POINTER_TERMINATE_FLAG) == 0)) {
-                instance->element = (pa & LINK_POINTER_ADDRESS_MASK);
+                instance->element = LINK_POINTER_TD(pa);
         } else {
-                instance->element = 0 | LINK_POINTER_TERMINATE_FLAG;
+                instance->element = LINK_POINTER_TERM;
         }
 }

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

@@ -69 +69 @@
             || (pid == USB_PID_OUT));
 
+        const uint32_t next_pa = addr_to_phys(next);
+        assert((next_pa & LINK_POINTER_ADDRESS_MASK) == next_pa);
+
         instance->next = 0
             | LINK_POINTER_VERTICAL_FLAG
-            | ((next != NULL) ? addr_to_phys(next) : LINK_POINTER_TERMINATE_FLAG);
+            | (next_pa ? next_pa : LINK_POINTER_TERMINATE_FLAG);
 
         instance->status = 0
@@ -90 +93 @@
             | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
 
-        instance->buffer_ptr = 0;
-
-        if (size) {
-                instance->buffer_ptr = (uintptr_t)addr_to_phys(buffer);
-        }
+        instance->buffer_ptr = addr_to_phys(buffer);
 
         usb_log_debug2("Created TD(%p): %X:%X:%X:%X(%p).\n",
@@ -115 +114 @@
         assert(instance);
 
-        if ((instance->status & TD_STATUS_ERROR_STALLED) != 0)
-                return ESTALL;
+        /* this is hc internal error it should never be reported */
+        if ((instance->status & TD_STATUS_ERROR_BIT_STUFF) != 0)
+                return EAGAIN;
 
+        /* CRC or timeout error, like device not present or bad data,
+         * it won't be reported unless err count reached zero */
         if ((instance->status & TD_STATUS_ERROR_CRC) != 0)
                 return EBADCHECKSUM;
 
-        if ((instance->status & TD_STATUS_ERROR_BUFFER) != 0)
+        /* hc does not end transaction on these, it should never be reported */
+        if ((instance->status & TD_STATUS_ERROR_NAK) != 0)
                 return EAGAIN;
 
+        /* buffer overrun or underrun */
+        if ((instance->status & TD_STATUS_ERROR_BUFFER) != 0)
+                return ERANGE;
+
+        /* device babble is something serious */
         if ((instance->status & TD_STATUS_ERROR_BABBLE) != 0)
                 return EIO;
 
-        if ((instance->status & TD_STATUS_ERROR_NAK) != 0)
-                return EAGAIN;
-
-        if ((instance->status & TD_STATUS_ERROR_BIT_STUFF) != 0)
-                return EAGAIN;
+        /* stall might represent err count reaching zero or stall response from
+         * the device, is err count reached zero, one of the above is reported*/
+        if ((instance->status & TD_STATUS_ERROR_STALLED) != 0)
+                return ESTALL;
 
         return EOK;

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

@@ -50 +50 @@
 static inline uintptr_t addr_to_phys(void *addr)
 {
+        if (addr == NULL)
+                return 0;
+
         uintptr_t result;
         int ret = as_get_physical_mapping(addr, &result);

uspace/lib/usb/src/host/device_keeper.c

@@ -214 +214 @@
         fibril_mutex_lock(&instance->guard);
 
-        usb_address_t new_address = instance->last_address + 1;
-        while (instance->devices[new_address].occupied) {
+        usb_address_t new_address = instance->last_address;
+        do {
+                ++new_address;
+                if (new_address > USB11_ADDRESS_MAX)
+                        new_address = 1;
                 if (new_address == instance->last_address) {
                         fibril_mutex_unlock(&instance->guard);
                         return ENOSPC;
                 }
-                if (new_address == USB11_ADDRESS_MAX)
-                        new_address = 1;
-                ++new_address;
-        }
+        } while (instance->devices[new_address].occupied);
 
         assert(new_address != USB_ADDRESS_DEFAULT);