Changeset 9620a54 in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2017-10-29T10:51:59Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

d33dc780

Parents:

62f8025

Message:

Small changes. Temporarily fixed no device problem for endpoint logging. Added similar macro for device logging. Changed log messages to adopt these macros. TRB rings can be freed again. Made ring finalizers noexcept. Upon detach, the entire slot is disabled prior to unregistering endpoints in order to prevent invalid HC commands. Removed active endpoints count from XHCI device. Device context is freed in HC, so DCBAA is not touched from anywhere else.

File:

• uspace/drv/bus/usb/xhci/endpoint.c (modified) (5 diffs)

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

@@ -188 +188 @@
 int xhci_endpoint_alloc_transfer_ds(xhci_endpoint_t *xhci_ep)
 {
-
-        usb_log_debug2("Allocating main transfer ring for endpoint %u", xhci_ep->base.endpoint);
+        /* Can't use XHCI_EP_FMT because the endpoint may not have device. */
+        usb_log_debug2("Allocating main transfer ring for endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
 
         xhci_ep->primary_stream_ctx_array = NULL;
@@ -201 +201 @@
 }
 
-int xhci_endpoint_free_transfer_ds(xhci_endpoint_t *xhci_ep)
-{
-        /* FIXME: For some reason (possibly memory corruption), this crashes. */
-        return EOK;
-
+void xhci_endpoint_free_transfer_ds(xhci_endpoint_t *xhci_ep)
+{
         if (endpoint_using_streams(xhci_ep)) {
-                usb_log_debug2("Freeing primary stream context array for endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
+                usb_log_debug2("Freeing primary stream context array of endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
 
                 // maybe check if LSA, then skip?
@@ -223 +220 @@
                 free32(xhci_ep->primary_stream_ctx_array);
         } else {
-                usb_log_debug2("Freeing main transfer ring for endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
-
-                int err;
-                if ((err = xhci_trb_ring_fini(&xhci_ep->ring))) {
-                        return err;
-                }
-        }
-
-        return EOK;
+                usb_log_debug2("Freeing main transfer ring of endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
+
+                xhci_trb_ring_fini(&xhci_ep->ring);
+        }
 }
 
@@ -344 +336 @@
         endpoint_add_ref(&ep->base);
         ep->base.device = &dev->base;
-
         dev->endpoints[ep_num] = ep;
-        ++dev->active_endpoint_count;
 
         return EOK;
@@ -357 +347 @@
 
         assert(dev->endpoints[ep->base.endpoint]);
-
         dev->endpoints[ep->base.endpoint] = NULL;
-        --dev->active_endpoint_count;
         ep->base.device = NULL;