Changeset 68a61f19 in mainline for uspace/drv/bus/usb/ehci/endpoint_list.c

Timestamp:

2015-06-29T01:46:59Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f6f2a5f7

Parents:

c86ca9a

Message:

ehci, endpoint_list: Fix querying PA before the memory has been accessed

---

modified:

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

File:

• uspace/drv/bus/usb/ehci/endpoint_list.c (modified) (3 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);
 
-        qh_init(instance->list_head, NULL);
-        list_initialize(&instance->endpoint_list);
         fibril_mutex_initialize(&instance->guard);
         return EOK;
@@ -108 +110 @@
         }
         assert(last_qh);
-        /* Keep link */
+        /* Keep link, this might point to the queue QH, or next chained queue */
         ep->qh->horizontal = last_qh->horizontal;
         /* Make sure QH update is written to the memory */
@@ -156 +158 @@
                 qpos = "FIRST";
         } else {
-                ehci_endpoint_t *prev =
-                    list_get_instance(ep->link.prev, ehci_endpoint_t, link);
-                prev_qh = prev->qh;
+                prev_qh = ehci_endpoint_list_instance(ep->link.prev)->qh;
                 qpos = "NOT FIRST";
         }