Changeset 1af4c00 in mainline

Timestamp:

2018-01-17T13:28:34Z (6 years ago)

Author:

Salmelu <salmelu@…>

Branches:

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

Children:

4cc0c2e0

Parents:

61e27e80

Message:

xhci: fixed transition to and from streams

Added remove streams function to transition the endpoint back to single ring no streams mode.
Requesting streams now stops the endpoint, clears the ring and executes update endpoint command.

Location:

uspace/drv/bus/usb/xhci

Files:

• endpoint.c (modified) (5 diffs)
• endpoint.h (modified) (1 diff)
• streams.c (modified) (6 diffs)
• streams.h (modified) (1 diff)

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

@@ -47 +47 @@
 
 static int alloc_transfer_ds(xhci_endpoint_t *);
-static void free_transfer_ds(xhci_endpoint_t *);
 
 /**
@@ -121 +120 @@
         assert(xhci_ep);
 
-        free_transfer_ds(xhci_ep);
+        xhci_endpoint_free_transfer_ds(xhci_ep);
 
         // TODO: Something missed?
@@ -156 +155 @@
 }
 
-/** Allocate transfer data structures for XHCI endpoint.
+/** Allocate transfer data structures for XHCI endpoint not using streams.
  * @param[in] xhci_ep XHCI endpoint to allocate data structures for.
  *
@@ -166 +165 @@
         usb_log_debug2("Allocating main transfer ring for endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
 
-        xhci_ep->primary_stream_ctx_array = NULL;
+        xhci_ep->primary_stream_data_array = NULL;
+        xhci_ep->primary_stream_data_size = 0;
 
         int err;
@@ -186 +186 @@
  * @param[in] xhci_ep XHCI endpoint to free data structures for.
  */
-static void free_transfer_ds(xhci_endpoint_t *xhci_ep)
+void xhci_endpoint_free_transfer_ds(xhci_endpoint_t *xhci_ep)
 {
         if (xhci_ep->primary_stream_data_size) {

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

@@ -135 +135 @@
 void xhci_endpoint_fini(xhci_endpoint_t *);
 
+void xhci_endpoint_free_transfer_ds(xhci_endpoint_t *xhci_ep);
+
 uint8_t xhci_endpoint_dci(xhci_endpoint_t *);
 uint8_t xhci_endpoint_index(xhci_endpoint_t *);

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

@@ -110 +110 @@
         dma_buffer_free(&xhci_ep->primary_stream_ctx_dma);
         free(xhci_ep->primary_stream_data_array);
+
+        xhci_ep->primary_stream_data_array = NULL;
+        xhci_ep->primary_stream_data_size = 0;
 }
 
@@ -312 +315 @@
 }
 
+/** Cancels streams and reconfigures endpoint back to single ring no stream endpoint.
+ * @param[in] hc Host controller of the endpoint.
+ * @param[in] dev Used device.
+ * @param[in] xhci_ep Associated XHCI bulk endpoint.
+ */
+int xhci_endpoint_remove_streams(xhci_hc_t *hc, xhci_device_t *dev, xhci_endpoint_t *xhci_ep)
+{
+        if (!xhci_ep->primary_stream_data_size) {
+                usb_log_warning("There are no streams enabled on the endpoint, doing nothing.");
+                return EOK;
+        }
+
+        hc_stop_endpoint(hc, dev->slot_id, xhci_endpoint_index(xhci_ep));
+        xhci_endpoint_free_transfer_ds(xhci_ep);
+
+        /* Streams are now removed, proceed with reconfiguring endpoint. */
+        int err;
+        if ((err = xhci_trb_ring_init(&xhci_ep->ring))) {
+                usb_log_error("Failed to initialize a transfer ring.");
+                return err;
+        }
+
+        xhci_ep_ctx_t ep_ctx;
+        memset(&ep_ctx, 0, sizeof(ep_ctx));
+        xhci_setup_endpoint_context(xhci_ep, &ep_ctx);
+        return hc_update_endpoint(hc, dev->slot_id, xhci_endpoint_index(xhci_ep), &ep_ctx);
+}
+
 /** Initialize, setup and register primary streams.
  * @param[in] hc Host controller of the endpoint.
@@ -325 +356 @@
                 return err;
         }
+
+        /*
+         * We have passed the checks.
+         * Stop the endpoint, destroy the ring, and transition to streams.
+         */
+        hc_stop_endpoint(hc, dev->slot_id, xhci_endpoint_index(xhci_ep));
+        xhci_endpoint_free_transfer_ds(xhci_ep);
 
         err = initialize_primary_structures(xhci_ep, count);
@@ -343 +381 @@
         setup_stream_context(xhci_ep, &ep_ctx, pstreams, 1);
 
-        // FIXME: do we add endpoint? do we need to destroy previous configuration?
-        return hc_add_endpoint(hc, dev->slot_id, xhci_endpoint_index(xhci_ep), &ep_ctx);
+        return hc_update_endpoint(hc, dev->slot_id, xhci_endpoint_index(xhci_ep), &ep_ctx);
 }
 
@@ -393 +430 @@
         }
 
+        /*
+         * We have passed all checks.
+         * Stop the endpoint, destroy the ring, and transition to streams.
+         */
+        hc_stop_endpoint(hc, dev->slot_id, xhci_endpoint_index(xhci_ep));
+        xhci_endpoint_free_transfer_ds(xhci_ep);
+
         err = initialize_primary_structures(xhci_ep, count);
         if (err) {
@@ -411 +455 @@
         setup_stream_context(xhci_ep, &ep_ctx, pstreams, 0);
 
-        // FIXME: do we add endpoint? do we need to destroy previous configuration?
-        return hc_add_endpoint(hc, dev->slot_id, xhci_endpoint_index(xhci_ep), &ep_ctx);
+        return hc_update_endpoint(hc, dev->slot_id, xhci_endpoint_index(xhci_ep), &ep_ctx);
 
 err_init:

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

@@ -64 +64 @@
 void xhci_stream_free_ds(xhci_endpoint_t *xhci_ep);
 
+int xhci_endpoint_remove_streams(xhci_hc_t *hc, xhci_device_t *dev, xhci_endpoint_t *xhci_ep);
 int xhci_endpoint_request_primary_streams(xhci_hc_t *hc, xhci_device_t *dev,
         xhci_endpoint_t *xhci_ep, unsigned count);