Changeset 0eadfd1e in mainline

Timestamp:

2018-01-09T14:14:32Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

dfa1fc8

Parents:

17c5e62

Message:

xhci: allocate/free transfer ring internally in endpoint init/fini

Location:

uspace/drv/bus/usb/xhci

Files:

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

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

@@ -93 +93 @@
         xhci_endpoint_t *ep0 = xhci_endpoint_get(ep0_base);
 
-        if ((err = xhci_endpoint_alloc_transfer_ds(ep0)))
-                goto err_added;
-
         /* Address device */
         if ((err = hc_address_device(bus->hc, dev, ep0)))
-                goto err_prepared;
-
-        return EOK;
-
-err_prepared:
-        xhci_endpoint_free_transfer_ds(ep0);
+                goto err_added;
+
+        return EOK;
+
 err_added:
         /* Bus reference */
@@ -354 +349 @@
                         continue;
 
-                xhci_endpoint_free_transfer_ds(xhci_endpoint_get(endpoints[i]));
                 /* Bus reference */
                 endpoint_del_ref(endpoints[i]);
@@ -411 +405 @@
         xhci_device_t *dev = xhci_device_get(ep_base->device);
 
-        if ((err = xhci_endpoint_alloc_transfer_ds(ep)))
-                return err;
-
         usb_log_info("Endpoint " XHCI_EP_FMT " registered to XHCI bus.", XHCI_EP_ARGS(*ep));
 
@@ -420 +411 @@
 
         if ((err = hc_add_endpoint(bus->hc, dev->slot_id, xhci_endpoint_index(ep), &ep_ctx)))
-                goto err_prepared;
-
-        return EOK;
-
-err_prepared:
-        xhci_endpoint_free_transfer_ds(ep);
-        return err;
+                return err;
+
+        return EOK;
 }
 
@@ -454 +441 @@
         }
 
-        /* Tear down TRB ring / PSA. */
-        xhci_endpoint_free_transfer_ds(ep);
-
         return EOK;
 }

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

@@ -45 +45 @@
 #include "endpoint.h"
 
+static int alloc_transfer_ds(xhci_endpoint_t *);
+static void free_transfer_ds(xhci_endpoint_t *);
+
 /**
  * Initialize new XHCI endpoint.
@@ -55 +58 @@
 int xhci_endpoint_init(xhci_endpoint_t *xhci_ep, device_t *dev, const usb_endpoint_descriptors_t *desc)
 {
+        int rc;
         assert(xhci_ep);
 
@@ -103 +107 @@
         }
 
+        if ((rc = alloc_transfer_ds(xhci_ep)))
+                goto err;
+
         return EOK;
+
+err:
+        return rc;
 }
 
@@ -113 +123 @@
 {
         assert(xhci_ep);
+
+        free_transfer_ds(xhci_ep);
 
         // TODO: Something missed?
@@ -291 +303 @@
  * @return Error code.
  */
-int xhci_endpoint_alloc_transfer_ds(xhci_endpoint_t *xhci_ep)
+static int alloc_transfer_ds(xhci_endpoint_t *xhci_ep)
 {
         /* Can't use XHCI_EP_FMT because the endpoint may not have device. */
@@ -316 +328 @@
  * @param[in] xhci_ep XHCI endpoint to free data structures for.
  */
-void xhci_endpoint_free_transfer_ds(xhci_endpoint_t *xhci_ep)
+static void free_transfer_ds(xhci_endpoint_t *xhci_ep)
 {
         if (endpoint_using_streams(xhci_ep)) {

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

@@ -150 +150 @@
 int xhci_endpoint_init(xhci_endpoint_t *, device_t *, const usb_endpoint_descriptors_t *);
 void xhci_endpoint_fini(xhci_endpoint_t *);
-int xhci_endpoint_alloc_transfer_ds(xhci_endpoint_t *);
-void xhci_endpoint_free_transfer_ds(xhci_endpoint_t *);
 
 int xhci_endpoint_request_streams(xhci_hc_t *, xhci_device_t *, xhci_endpoint_t *, unsigned);