Changeset 50362c6 in mainline

Timestamp:

2015-06-29T03:14:27Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a996402e

Parents:

f6f2a5f7

Message:

ehci, ep list: stop using list_head_pa.

Location:

uspace/drv/bus/usb/ehci

Files:

• endpoint_list.c (modified) (3 diffs)
• endpoint_list.h (modified) (2 diffs)
• hc.c (modified) (5 diffs)

uspace/drv/bus/usb/ehci/endpoint_list.c

@@ -60 +60 @@
                 return ENOMEM;
         }
-        /* Make sure the address translation exists by initializing first */
         qh_init(instance->list_head, NULL);
 
-        instance->list_head_pa = addr_to_phys(instance->list_head);
         list_initialize(&instance->endpoint_list);
-        usb_log_debug2("Transfer list %s setup with ED: %p(0x%0" PRIx32 ")).\n",
-            name, instance->list_head, instance->list_head_pa);
+        usb_log_debug2("Transfer list %s setup with ED: %p(%x).\n",
+            name, instance->list_head, addr_to_phys(instance->list_head));
 
         fibril_mutex_initialize(&instance->guard);
@@ -79 +77 @@
         assert(next->list_head);
 
-        instance->list_head->horizontal = LINK_POINTER_QH(next->list_head_pa);
+        qh_append_qh(instance->list_head, next->list_head);
 }
 
@@ -127 +125 @@
                 ep, instance->name, first, first->qh);
         if (last_qh == instance->list_head) {
-                usb_log_debug2("%s head ED(%p-0x%0" PRIx32 "): %x:%x.\n",
-                    instance->name, last_qh, instance->list_head_pa,
+                usb_log_debug2("%s head ED(%p-%x): %x:%x.\n",
+                    instance->name, last_qh, addr_to_phys(instance->list_head),
                     last_qh->status, last_qh->horizontal);
         }

uspace/drv/bus/usb/ehci/endpoint_list.h

@@ -50 +50 @@
         /** EHCI hw structure at the beginning of the queue */
         qh_t *list_head;
-        /** Physical address of the first(dummy) ED */
-        uint32_t list_head_pa;
         /** Assigned name, provides nicer debug output */
         const char *name;
@@ -69 +67 @@
         free32(instance->list_head);
         instance->list_head = NULL;
-        instance->list_head_pa = 0;
 }
 

uspace/drv/bus/usb/ehci/hc.c

@@ -392 +392 @@
         /* Enable periodic list */
         assert(instance->periodic_list_base);
-        const uintptr_t phys_base =
+        uintptr_t phys_base =
             addr_to_phys((void*)instance->periodic_list_base);
         assert((phys_base & USB_PERIODIC_LIST_BASE_MASK) == phys_base);
@@ -400 +400 @@
 
         /* Enable Async schedule */
-        assert((instance->async_list.list_head_pa & USB_ASYNCLIST_MASK) ==
-            instance->async_list.list_head_pa);
-        EHCI_WR(instance->registers->asynclistaddr,
-            instance->async_list.list_head_pa);
+        phys_base = addr_to_phys((void*)instance->async_list.list_head);
+        assert((phys_base & USB_ASYNCLIST_MASK) == phys_base);
+        EHCI_WR(instance->registers->asynclistaddr, phys_base);
         EHCI_SET(instance->registers->usbcmd, USB_CMD_ASYNC_SCHEDULE_FLAG);
 
@@ -434 +433 @@
                 return ret;
         }
+        /* Specs say "Software must set queue head horizontal pointer T-bits to
+         * a zero for queue heads in the asynchronous schedule" (4.4.0).
+         * So we must maintain circular buffer (all horizontal pointers
+         * have to be valid */
+        endpoint_list_chain(&instance->async_list, &instance->async_list);
 
         ret = endpoint_list_init(&instance->int_list, "INT");
@@ -441 +445 @@
                 return ret;
         }
-        /* Loop async list */
-        endpoint_list_chain(&instance->async_list, &instance->async_list);
 
         /* Take 1024 periodic list heads, we ignore low mem options */
@@ -457 +459 @@
                 /* Disable everything for now */
                 instance->periodic_list_base[i] =
-                    LINK_POINTER_QH(instance->int_list.list_head_pa);
+                    LINK_POINTER_QH(addr_to_phys(instance->int_list.list_head));
         }
         return EOK;