Changeset 19746a96 in mainline

Timestamp:

2011-10-16T17:10:19Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f8dfb40

Parents:

0fe2ff1

Message:

ohci: Add root hub mutex to prevent interrupt request handling race.

Location:

uspace/drv/bus/usb/ohci

Files:

• root_hub.c (modified) (5 diffs)
• root_hub.h (modified) (1 diff)

uspace/drv/bus/usb/ohci/root_hub.c

@@ -35 +35 @@
 #include <errno.h>
 #include <str_error.h>
+#include <fibril_synch.h>
 
 #include <usb/debug.h>
+#include <usb/dev/request.h>
+#include <usb/classes/hub.h>
 
 #include "root_hub.h"
@@ -43 +46 @@
 #include <usb/dev/driver.h>
 #include "ohci_regs.h"
-
-#include <usb/dev/request.h>
-#include <usb/classes/hub.h>
 
 /**
@@ -189 +189 @@
 #endif
 
+        fibril_mutex_initialize(&instance->guard);
         rh_init_descriptors(instance);
 
@@ -216 +217 @@
         case USB_TRANSFER_INTERRUPT:
                 usb_log_debug("Root hub got INTERRUPT packet\n");
+                fibril_mutex_lock(&instance->guard);
+                assert(instance->unfinished_interrupt_transfer == NULL);
                 const uint16_t mask = create_interrupt_mask(instance);
                 if (mask == 0) {
                         usb_log_debug("No changes..\n");
-                        assert(instance->unfinished_interrupt_transfer == NULL);
                         instance->unfinished_interrupt_transfer = request;
+                        fibril_mutex_unlock(&instance->guard);
                         return;
                 }
                 usb_log_debug("Processing changes...\n");
                 interrupt_request(request, mask, instance->interrupt_mask_size);
+                fibril_mutex_unlock(&instance->guard);
                 break;
 
@@ -244 +248 @@
         assert(instance);
 
-        if (!instance->unfinished_interrupt_transfer)
-                return;
-
-        usb_log_debug("Finalizing interrupt transfer\n");
-        const uint16_t mask = create_interrupt_mask(instance);
-        interrupt_request(instance->unfinished_interrupt_transfer,
-            mask, instance->interrupt_mask_size);
-        usb_transfer_batch_dispose(instance->unfinished_interrupt_transfer);
-
-        instance->unfinished_interrupt_transfer = NULL;
+        fibril_mutex_lock(&instance->guard);
+        if (instance->unfinished_interrupt_transfer) {
+                usb_log_debug("Finalizing interrupt transfer\n");
+                const uint16_t mask = create_interrupt_mask(instance);
+                interrupt_request(instance->unfinished_interrupt_transfer,
+                    mask, instance->interrupt_mask_size);
+                usb_transfer_batch_dispose(
+                    instance->unfinished_interrupt_transfer);
+                instance->unfinished_interrupt_transfer = NULL;
+        }
+        fibril_mutex_unlock(&instance->guard);
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/bus/usb/ohci/root_hub.h

@@ -47 +47 @@
  */
 typedef struct rh {
+        fibril_mutex_t guard;
         /** pointer to ohci driver registers */
         ohci_regs_t *registers;