Changeset 19f0048 in mainline for uspace/drv/bus/usb/xhci/trb_ring.c

Timestamp:

2018-02-01T02:13:34Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

17d34a8

Parents:

53fdf8c

Message:

xhci: reinitialize in case of HC error

File:

• uspace/drv/bus/usb/xhci/trb_ring.c (modified) (5 diffs)

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

@@ -188 +188 @@
 static uintptr_t trb_ring_enqueue_phys(xhci_trb_ring_t *ring)
 {
-        uintptr_t trb_id = ring->enqueue_trb - segment_begin(ring->enqueue_segment);
+        size_t trb_id = ring->enqueue_trb - segment_begin(ring->enqueue_segment);
         return ring->enqueue_segment->phys + trb_id * sizeof(xhci_trb_t);
 }
@@ -346 +346 @@
         }
 
+        fibril_mutex_initialize(&ring->guard);
+
+        usb_log_debug("Initialized event ring.");
+        return EOK;
+}
+
+void xhci_event_ring_reset(xhci_event_ring_t *ring)
+{
+        list_foreach(ring->segments, segments_link, trb_segment_t, segment)
+                memset(segment->trb_storage, 0, sizeof(segment->trb_storage));
+
         trb_segment_t * const segment = get_first_segment(&ring->segments);
         ring->dequeue_segment = segment;
@@ -351 +362 @@
         ring->dequeue_ptr = segment->phys;
         ring->ccs = 1;
-
-        fibril_mutex_initialize(&ring->guard);
-
-        usb_log_debug("Initialized event ring.");
-        return EOK;
 }
 
@@ -432 +438 @@
         ring->end = ring->begin + size;
 
-        ring->enqueue = ring->dequeue = ring->begin;
-
         fibril_mutex_initialize(&ring->guard);
         fibril_condvar_initialize(&ring->enqueued_cv);
         fibril_condvar_initialize(&ring->dequeued_cv);
 
-        ring->running = true;
+        xhci_sw_ring_restart(ring);
 }
 
@@ -486 +490 @@
 }
 
+void xhci_sw_ring_restart(xhci_sw_ring_t *ring)
+{
+        ring->enqueue = ring->dequeue = ring->begin;
+        memset(ring->begin, 0, sizeof(xhci_trb_t) * (ring->end - ring->begin));
+        ring->running = true;
+}
+
 void xhci_sw_ring_fini(xhci_sw_ring_t *ring)
 {