Changeset 2aaf804 in mainline

Timestamp:

2011-05-17T10:14:50Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5f94a0c

Parents:

5e6e50b

Message:

Use provided barriers instead of asm constructs.

Use warning instead of assert if malloc32 falls back to memalign.

Location:

uspace/drv

Files:

• ohci/endpoint_list.c (modified) (3 diffs)
• uhci-hcd/transfer_list.c (modified) (3 diffs)
• uhci-hcd/utils/malloc32.h (modified) (1 diff)

uspace/drv/ohci/endpoint_list.c

@@ -34 +34 @@
 #include <errno.h>
 #include <usb/debug.h>
+#include <arch/barrier.h>
 
 #include "endpoint_list.h"
@@ -107 +108 @@
                 last_ed = last->ed;
         }
-        /* keep link */
+        /* Keep link */
         hcd_ep->ed->next = last_ed->next;
+        /* Make sure ED is written to the memory */
+        write_barrier();
+
+        /* Add ed to the hw list */
         ed_append_ed(last_ed, hcd_ep->ed);
-
-        asm volatile ("": : :"memory");
+        /* Make sure ED is updated */
+        write_barrier();
+
 
         /* Add to the driver list */
@@ -212 +218 @@
         assert((prev_ed->next & ED_NEXT_PTR_MASK) == addr_to_phys(hcd_ep->ed));
         prev_ed->next = hcd_ep->ed->next;
-
-        asm volatile ("": : :"memory");
+        /* Make sure ED is updated */
+        write_barrier();
+
         usb_log_debug("HCD EP(%p) removed (%s) from %s, next %x.\n",
             hcd_ep, qpos, instance->name, hcd_ep->ed->next);

uspace/drv/uhci-hcd/transfer_list.c

@@ -34 +34 @@
 #include <errno.h>
 #include <usb/debug.h>
+#include <arch/barrier.h>
 
 #include "transfer_list.h"
@@ -126 +127 @@
         assert((pa & LINK_POINTER_ADDRESS_MASK) == pa);
 
+        /* Make sure all data in the batch are written */
+        write_barrier();
+
         /* keep link */
         batch_qh(batch)->next = last_qh->next;
         qh_set_next_qh(last_qh, batch_qh(batch));
 
-        asm volatile ("": : :"memory");
+        /* Make sure the pointer is updated */
+        write_barrier();
 
         /* Add to the driver list */
@@ -222 +227 @@
             == addr_to_phys(batch_qh(batch)));
         prev_qh->next = batch_qh(batch)->next;
-        asm volatile ("": : :"memory");
+
+        /* Make sure the pointer is updated */
+        write_barrier();
+
         /* Remove from the batch list */
         list_remove(&batch->link);

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

@@ -74 +74 @@
         if (size <= SLAB_ELEMENT_SIZE)
                 return slab_malloc_g();
-        assert(false);
+        usb_log_warning("Requested %zu bytes, current allocator can't handle "
+            "that amount, pray that the standard malloc will suffice.");
         return memalign(UHCI_STRCUTURES_ALIGNMENT, size);
 }