Changeset 4688350b in mainline

Timestamp:

2017-10-01T22:54:09Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

370a1c8

Parents:

4d28d86

Message:

xhci commands: waiting for commands completion uses fibril condvar

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (4 diffs)
• commands.h (modified) (3 diffs)

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

@@ -81 +81 @@
 }
 
-int xhci_wait_for_command(xhci_cmd_t *cmd, uint32_t timeout)
-{
-        uint32_t time = 0;
+int xhci_wait_for_command(xhci_cmd_t *cmd, suseconds_t timeout)
+{
+        int rv = EOK;
+
+        fibril_mutex_lock(&cmd->completed_mtx);
         while (!cmd->completed) {
-                async_usleep(1000);
-                time += 1000;
-
-                if (time > timeout)
-                        return ETIMEOUT;
-        }
-
-        return EOK;
+                usb_log_debug2("Waiting for event completion: going to sleep.");
+                rv = fibril_condvar_wait_timeout(&cmd->completed_cv, &cmd->completed_mtx, timeout);
+
+                usb_log_debug2("Waiting for event completion: woken: %s", str_error(rv));
+                if (rv == ETIMEOUT)
+                        break;
+        }
+        fibril_mutex_lock(&cmd->completed_mtx);
+
+        return rv;
 }
 
@@ -98 +102 @@
 {
         xhci_cmd_t *cmd = malloc32(sizeof(xhci_cmd_t));
-        memset(cmd, 0, sizeof(xhci_cmd_t));
+        xhci_cmd_init(cmd);
+        return cmd;
+}
+
+void xhci_cmd_init(xhci_cmd_t *cmd)
+{
+        memset(cmd, 0, sizeof(*cmd));
 
         link_initialize(&cmd->link);
+
+        fibril_mutex_initialize(&cmd->completed_mtx);
+        fibril_condvar_initialize(&cmd->completed_cv);
 
         /**
@@ -108 +121 @@
          */
         cmd->has_owner = true;
-
-        return cmd;
 }
 
@@ -493 +504 @@
         }
 
+        fibril_mutex_lock(&command->completed_mtx);
         command->completed = true;
+        fibril_condvar_broadcast(&command->completed_cv);
+        fibril_mutex_unlock(&command->completed_mtx);
+
 
         if (!command->has_owner) {

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

@@ -39 +39 @@
 #include <adt/list.h>
 #include <stdbool.h>
+#include <fibril_synch.h>
 #include "hw_struct/trb.h"
 
@@ -56 +57 @@
         bool has_owner;
         bool owns_trb;
+
+        /* Will be unlocked after command completes */
+        fibril_mutex_t completed_mtx;
+        fibril_condvar_t completed_cv;
 } xhci_cmd_t;
 
@@ -62 +67 @@
 int xhci_wait_for_command(xhci_cmd_t *, uint32_t);
 xhci_cmd_t *xhci_alloc_command(void);
+void xhci_cmd_init(xhci_cmd_t *);
 void xhci_free_command(xhci_cmd_t *);