Changeset df6ded8 in mainline for uspace/drv/bus/usb/ohci/ohci_rh.c

Timestamp:

2018-02-28T16:37:50Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

• uspace/drv/bus/usb/ohci/ohci_rh.c (modified) (11 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2013 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -109 +110 @@
  * initializes internal virtual hub.
  */
-errno_t ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs, const char *name)
+errno_t ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs,
+    fibril_mutex_t *guard, const char *name)
 {
         assert(instance);
         instance->registers = regs;
         instance->port_count = OHCI_RD(regs->rh_desc_a) & RHDA_NDS_MASK;
-        usb_log_debug2("rh_desc_a: %x.\n", OHCI_RD(regs->rh_desc_a));
+        usb_log_debug2("rh_desc_a: %x.", OHCI_RD(regs->rh_desc_a));
         if (instance->port_count > OHCI_MAX_PORTS) {
                 usb_log_warning("OHCI specification does not allow %d ports. "
-                    "Max %d ports will be used.\n", instance->port_count,
+                    "Max %d ports will be used.", instance->port_count,
                     OHCI_MAX_PORTS);
                 instance->port_count = OHCI_MAX_PORTS;
         }
-        usb_log_info("%s: Found %u ports.\n", name, instance->port_count);
+        usb_log_info("%s: Found %u ports.", name, instance->port_count);
 
 #if defined OHCI_POWER_SWITCH_no
-        usb_log_info("%s: Set power mode to no power switching.\n", name);
+        usb_log_info("%s: Set power mode to no power switching.", name);
         /* Set port power mode to no power-switching. (always on) */
         OHCI_SET(regs->rh_desc_a, RHDA_NPS_FLAG);
@@ -132 +134 @@
 
 #elif defined OHCI_POWER_SWITCH_ganged
-        usb_log_info("%s: Set power mode to ganged power switching.\n", name);
+        usb_log_info("%s: Set power mode to ganged power switching.", name);
         /* Set port power mode to ganged power-switching. */
         OHCI_CLR(regs->rh_desc_a, RHDA_NPS_FLAG);
@@ -144 +146 @@
         OHCI_CLR(regs->rh_desc_a, RHDA_OCPM_FLAG);
 #else
-        usb_log_info("%s: Set power mode to per-port power switching.\n", name);
+        usb_log_info("%s: Set power mode to per-port power switching.", name);
         /* Set port power mode to per port power-switching. */
         OHCI_CLR(regs->rh_desc_a, RHDA_NPS_FLAG);
@@ -162 +164 @@
 
         ohci_rh_hub_desc_init(instance);
-        instance->unfinished_interrupt_transfer = NULL;
+        instance->status_change_endpoint = NULL;
+        instance->guard = guard;
         return virthub_base_init(&instance->base, name, &ops, instance,
             NULL, &instance->hub_descriptor.header, HUB_STATUS_CHANGE_PIPE);
@@ -178 +181 @@
         assert(instance);
         assert(batch);
-        const usb_target_t target = {{
-                .address = batch->ep->address,
-                .endpoint = batch->ep->endpoint,
-        }};
-        batch->error = virthub_base_request(&instance->base, target,
-            usb_transfer_batch_direction(batch), (void*)batch->setup_buffer,
-            batch->buffer, batch->buffer_size, &batch->transfered_size);
+        batch->error = virthub_base_request(&instance->base, batch->target,
+            batch->dir, &batch->setup.packet,
+            batch->dma_buffer.virt, batch->size, &batch->transferred_size);
         if (batch->error == ENAK) {
-                /* This is safe because only status change interrupt transfers
-                 * return NAK. The assertion holds true because the batch
-                 * existence prevents communication with that ep */
-                assert(instance->unfinished_interrupt_transfer == NULL);
-                instance->unfinished_interrupt_transfer = batch;
+                /* Lock the HC guard */
+                fibril_mutex_lock(instance->guard);
+                const int err = endpoint_activate_locked(batch->ep, batch);
+                if (err) {
+                        fibril_mutex_unlock(batch->ep->guard);
+                        return err;
+                }
+
+                /*
+                 * Asserting that the HC do not run two instances of the status
+                 * change endpoint - shall be true.
+                 */
+                assert(!instance->status_change_endpoint);
+
+                endpoint_add_ref(batch->ep);
+                instance->status_change_endpoint = batch->ep;
+                fibril_mutex_unlock(instance->guard);
         } else {
-                usb_transfer_batch_finish(batch, NULL);
-                usb_transfer_batch_destroy(batch);
+                usb_transfer_batch_finish(batch);
         }
         return EOK;
@@ -207 +217 @@
 errno_t ohci_rh_interrupt(ohci_rh_t *instance)
 {
-        //TODO atomic swap needed
-        usb_transfer_batch_t *batch = instance->unfinished_interrupt_transfer;
-        instance->unfinished_interrupt_transfer = NULL;
+        fibril_mutex_lock(instance->guard);
+        endpoint_t *ep = instance->status_change_endpoint;
+        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(instance->guard);
+
+        endpoint_del_ref(ep);
+
         if (batch) {
-                const usb_target_t target = {{
-                        .address = batch->ep->address,
-                        .endpoint = batch->ep->endpoint,
-                }};
-                batch->error = virthub_base_request(&instance->base, target,
-                    usb_transfer_batch_direction(batch),
-                    (void*)batch->setup_buffer,
-                    batch->buffer, batch->buffer_size, &batch->transfered_size);
-                usb_transfer_batch_finish(batch, NULL);
-                usb_transfer_batch_destroy(batch);
+                batch->error = virthub_base_request(&instance->base, batch->target,
+                    batch->dir, &batch->setup.packet,
+                    batch->dma_buffer.virt, batch->size, &batch->transferred_size);
+                usb_transfer_batch_finish(batch);
         }
         return EOK;
@@ -351 +366 @@
                 }
 
-        case USB_HUB_FEATURE_PORT_ENABLE:         /*1*/
+        case USB2_HUB_FEATURE_PORT_ENABLE:         /*1*/
                 OHCI_WR(hub->registers->rh_port_status[port],
                     RHPS_CLEAR_PORT_ENABLE);
                 return EOK;
 
-        case USB_HUB_FEATURE_PORT_SUSPEND:        /*2*/
+        case USB2_HUB_FEATURE_PORT_SUSPEND:        /*2*/
                 OHCI_WR(hub->registers->rh_port_status[port],
                     RHPS_CLEAR_PORT_SUSPEND);
@@ -362 +377 @@
 
         case USB_HUB_FEATURE_C_PORT_CONNECTION:   /*16*/
-        case USB_HUB_FEATURE_C_PORT_ENABLE:       /*17*/
-        case USB_HUB_FEATURE_C_PORT_SUSPEND:      /*18*/
+        case USB2_HUB_FEATURE_C_PORT_ENABLE:       /*17*/
+        case USB2_HUB_FEATURE_C_PORT_SUSPEND:      /*18*/
         case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: /*19*/
         case USB_HUB_FEATURE_C_PORT_RESET:        /*20*/
                 usb_log_debug2("Clearing port C_CONNECTION, C_ENABLE, "
-                    "C_SUSPEND, C_OC or C_RESET on port %u.\n", port);
+                    "C_SUSPEND, C_OC or C_RESET on port %u.", port);
                 /* Bit offsets correspond to the feature number */
                 OHCI_WR(hub->registers->rh_port_status[port],
@@ -412 +427 @@
                 /* Fall through, for per port power */
                 /* Fallthrough */
-        case USB_HUB_FEATURE_PORT_ENABLE:  /*1*/
-        case USB_HUB_FEATURE_PORT_SUSPEND: /*2*/
+        case USB2_HUB_FEATURE_PORT_ENABLE:  /*1*/
+        case USB2_HUB_FEATURE_PORT_SUSPEND: /*2*/
         case USB_HUB_FEATURE_PORT_RESET:   /*4*/
                 usb_log_debug2("Setting port POWER, ENABLE, SUSPEND or RESET "
-                    "on port %u.\n", port);
+                    "on port %u.", port);
                 /* Bit offsets correspond to the feature number */
                 OHCI_WR(hub->registers->rh_port_status[port], 1 << feature);
@@ -462 +477 @@
         }
 
-        usb_log_debug2("OHCI root hub interrupt mask: %hx.\n", mask);
+        usb_log_debug2("OHCI root hub interrupt mask: %hx.", mask);
 
         if (mask == 0)