Changeset 889146e in mainline for uspace/drv/bus/usb/xhci/commands.h

Timestamp:

2017-12-10T21:49:12Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

53db806

Parents:

6ef407b

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-10 21:43:47)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-10 21:49:12)

Message:

xhci: commands shall not just timeout

Previous behavior was breaking semantic: if a command was successful,
but just took too long to complete, we returned an error, and the caller
had no way to know if the command's effect has taken place.

This commit implements command aborting. The wait_for_command now cannot
just timeout - instead it aborts currently running (probably blocked)
command, and then gets back to waiting. So now, if command_sync returns
an error, it means the command was really unsuccessful.

If aborting the command takes too long, we should reset the whole HC.
This is not yet implemented.

File:

• uspace/drv/bus/usb/xhci/commands.h (modified) (4 diffs)

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

@@ -42 +42 @@
 #include <usb/host/dma_buffer.h>
 #include "hw_struct/trb.h"
+#include "trb_ring.h"
 
-#define XHCI_DEFAULT_TIMEOUT       1000000
-#define XHCI_BLOCK_INDEFINITELY    0
+#define XHCI_COMMAND_TIMEOUT       10000
+#define XHCI_CR_ABORT_TIMEOUT       5000
 
 typedef struct xhci_hc xhci_hc_t;
@@ -68 +69 @@
 } xhci_cmd_type_t;
 
+typedef enum {
+        XHCI_CR_STATE_CLOSED,           /**< Commands are rejected with ENAK. */
+        XHCI_CR_STATE_OPEN,             /**< Commands are enqueued normally. */
+        XHCI_CR_STATE_CHANGING,         /**< Commands wait until state changes. */
+} xhci_cr_state;
+
+typedef struct xhci_command_ring {
+        xhci_trb_ring_t trb_ring;
+
+        fibril_mutex_t guard;           /**< Guard access to this structure. */
+        list_t cmd_list;
+
+        xhci_cr_state state;            /**< Whether commands are allowed to be
+                                             added. */
+        fibril_condvar_t state_cv;      /**< For waiting on CR state change. */
+
+        fibril_condvar_t stopped_cv;    /**< For waiting on CR stopped event. */
+} xhci_cmd_ring_t;
+
 typedef struct xhci_command {
         /** Internal fields used for bookkeeping. Need not worry about these. */
@@ -74 +94 @@
 
                 xhci_cmd_type_t cmd;
-                suseconds_t timeout;
 
                 xhci_trb_t trb;
@@ -130 +149 @@
         fibril_condvar_initialize(&cmd._header.completed_cv);
 
-        if (!cmd._header.timeout) {
-                cmd._header.timeout = XHCI_DEFAULT_TIMEOUT;
-        }
-
         /* Issue the command */
         const int err = xhci_cmd_sync(hc, &cmd);