Changeset 74b852b in mainline

Timestamp:

2017-10-21T19:33:09Z (6 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

5fd9c30

Parents:

f45c78f

Message:

Added synchronization to command list.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (4 diffs)
• hc.h (modified) (2 diffs)

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

@@ -67 +67 @@
 
         list_initialize(&hc->commands);
+
+        fibril_mutex_initialize(&hc->commands_mtx);
+
         return EOK;
 }
@@ -126 +129 @@
 static inline xhci_cmd_t *get_command(xhci_hc_t *hc, uint64_t phys)
 {
+        fibril_mutex_lock(&hc->commands_mtx);
+
         link_t *cmd_link = list_first(&hc->commands);
 
@@ -139 +144 @@
         if (cmd_link != NULL) {
                 list_remove(cmd_link);
+                fibril_mutex_unlock(&hc->commands_mtx);
 
                 return list_get_instance(cmd_link, xhci_cmd_t, link);
         }
 
+        fibril_mutex_unlock(&hc->commands_mtx);
         return NULL;
 }
@@ -151 +158 @@
         assert(cmd);
 
+        fibril_mutex_lock(&hc->commands_mtx);
         list_append(&cmd->link, &hc->commands);
+        fibril_mutex_unlock(&hc->commands_mtx);
 
         xhci_trb_ring_enqueue(&hc->command_ring, &cmd->trb, &cmd->trb_phys);

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

@@ -37 +37 @@
 #define XHCI_HC_H
 
+#include <fibril_synch.h>
 #include <usb/host/usb_transfer_batch.h>
 #include "hw_struct/regs.h"
@@ -82 +83 @@
         /* Command list */
         list_t commands;
+        fibril_mutex_t commands_mtx;
+
         list_t transfers;