Changeset 19f0048 in mainline for uspace/drv/bus/usb/xhci/commands.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/commands.c (modified) (2 diffs)

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

@@ -86 +86 @@
         list_initialize(&cr->cmd_list);
 
-        cr->state = XHCI_CR_STATE_OPEN;
-
         return EOK;
 }
@@ -251 +249 @@
                 fibril_condvar_wait(&cr->stopped_cv, &cr->guard);
 
+        fibril_mutex_unlock(&cr->guard);
+}
+
+/**
+ * Mark the command ring as stopped. NAK new commands, abort running, do not
+ * touch the HC as it's probably broken.
+ */
+void xhci_nuke_command_ring(xhci_hc_t *hc)
+{
+        xhci_cmd_ring_t *cr = get_cmd_ring(hc);
+        fibril_mutex_lock(&cr->guard);
+        // Prevent others from starting CR again.
+        cr_set_state(cr, XHCI_CR_STATE_CLOSED);
+        fibril_mutex_unlock(&cr->guard);
+}
+
+/**
+ * Mark the command ring as working again.
+ */
+void xhci_start_command_ring(xhci_hc_t *hc)
+{
+        xhci_cmd_ring_t *cr = get_cmd_ring(hc);
+        fibril_mutex_lock(&cr->guard);
+        // Prevent others from starting CR again.
+        cr_set_state(cr, XHCI_CR_STATE_OPEN);
         fibril_mutex_unlock(&cr->guard);
 }