Changeset a1eb7c67 in mainline

Timestamp:

2017-10-03T11:36:40Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

adb4e683

Parents:

a2b0ba3

Message:

Added synchronization to event ring enqueue, removed a leftover debug message.

Location:

uspace/drv/bus/usb/xhci

Files:

• trb_ring.c (modified) (5 diffs)
• trb_ring.h (modified) (1 diff)

uspace/drv/bus/usb/xhci/trb_ring.c

@@ -208 +208 @@
 
                 usb_log_debug2("TRB ring(%p): Enqueued TRB %p", ring, trb);
-                usb_log_error("RING->PCS: %u", ring->pcs);
                 ring->enqueue_trb++;
 
@@ -264 +263 @@
         ring->ccs = 1;
 
+        fibril_mutex_initialize(&ring->guard);
+
         usb_log_debug("Initialized event ring.");
 
@@ -295 +296 @@
 int xhci_event_ring_dequeue(xhci_event_ring_t *ring, xhci_trb_t *event)
 {
+        fibril_mutex_lock(&ring->guard);
+
         /**
          * The ERDP reported to the HC is a half-phase off the one we need to
@@ -301 +304 @@
         ring->dequeue_ptr = event_ring_dequeue_phys(ring);
 
-        if (TRB_CYCLE(*ring->dequeue_trb) != ring->ccs)
+        if (TRB_CYCLE(*ring->dequeue_trb) != ring->ccs) {
+                fibril_mutex_unlock(&ring->guard);
                 return ENOENT; /* The ring is empty. */
+        }
 
         memcpy(event, ring->dequeue_trb, sizeof(xhci_trb_t));
@@ -323 +328 @@
         }
 
-        return EOK;
-}
+        fibril_mutex_unlock(&ring->guard);
+        return EOK;
+}

uspace/drv/bus/usb/xhci/trb_ring.h

@@ -106 +106 @@
 
         bool ccs;                       /* Consumer Cycle State: section 4.9.2 */
+
+        fibril_mutex_t guard;
 } xhci_event_ring_t;