Changeset ddbd088 in mainline

Timestamp:

2018-01-29T15:13:13Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

ee0ffa6

Parents:

1bab1c8

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-29 15:13:10)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-29 15:13:13)

Message:

ehci: fix invalid synchronization

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci_rh.c (modified) (5 diffs)
• ehci_rh.h (modified) (2 diffs)
• hc.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_rh.c

@@ -100 +100 @@
  */
 int ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
-    const char *name)
+    fibril_mutex_t *guard, const char *name)
 {
         assert(instance);
@@ -127 +127 @@
 
         ehci_rh_hub_desc_init(instance, EHCI_RD(caps->hcsparams));
+        instance->guard = guard;
         instance->status_change_endpoint = NULL;
 
@@ -152 +153 @@
 
                 /* Lock the HC guard */
-                fibril_mutex_lock(batch->ep->guard);
+                fibril_mutex_lock(instance->guard);
                 const int err = endpoint_activate_locked(batch->ep, batch);
                 if (err) {
@@ -167 +168 @@
                 endpoint_add_ref(batch->ep);
                 instance->status_change_endpoint = batch->ep;
-                fibril_mutex_unlock(batch->ep->guard);
+                fibril_mutex_unlock(instance->guard);
         } else {
                 usb_log_debug("RH(%p): BATCH(%p) virtual request complete: %s",
@@ -185 +186 @@
 int ehci_rh_interrupt(ehci_rh_t *instance)
 {
+        fibril_mutex_lock(instance->guard);
         endpoint_t *ep = instance->status_change_endpoint;
-        if (!ep)
-                return EOK;
-
-        fibril_mutex_lock(ep->guard);
+        if (!ep) {
+                fibril_mutex_unlock(instance->guard);
+                return EOK;
+        }
+
         usb_transfer_batch_t * const batch = ep->active_batch;
         endpoint_deactivate_locked(ep);
         instance->status_change_endpoint = NULL;
-        fibril_mutex_unlock(ep->guard);
+        fibril_mutex_unlock(instance->guard);
 
         endpoint_del_ref(ep);

uspace/drv/bus/usb/ehci/ehci_rh.h

@@ -64 +64 @@
         bool resume_flag[EHCI_MAX_PORTS];
 
+        /* HC guard */
+        fibril_mutex_t *guard;
+
         /*
          * This is sort of hacky, but better than duplicating functionality.
@@ -77 +80 @@
 
 int ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
-    const char *name);
+    fibril_mutex_t *guard, const char *name);
 int ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch);
 int ehci_rh_interrupt(ehci_rh_t *instance);

uspace/drv/bus/usb/ehci/hc.c

@@ -187 +187 @@
         usb_log_info("HC(%p): Initializing RH(%p).", instance, &instance->rh);
         ehci_rh_init(
-            &instance->rh, instance->caps, instance->registers, "ehci rh");
+            &instance->rh, instance->caps, instance->registers, &instance->guard,
+            "ehci rh");
 
         ehci_bus_init(&instance->bus, instance);