Changeset 2b61945 in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2017-10-22T03:47:41Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2e5aea1

Parents:

766043c

Message:

xhci: use device_t for bookkeeping

This started as a little refactoring to move active transfer batch to endpoint. Finding the EP in handler needs devices indexed by slot id. Then I found out we do not use the device_t extendable mechanism. Then there were a lot of errors found while doing all this…

File:

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

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

@@ -53 +53 @@
 
         endpoint_init(ep, bus);
-        xhci_ep->device = NULL;
-
-        return EOK;
+
+        return xhci_trb_ring_init(&xhci_ep->ring);
 }
 
@@ -63 +62 @@
 
         /* FIXME: Tear down TR's? */
-}
-
-int xhci_device_init(xhci_device_t *dev, xhci_bus_t *bus, usb_address_t address)
-{
-        memset(&dev->endpoints, 0, sizeof(dev->endpoints));
-        dev->active_endpoint_count = 0;
-        dev->address = address;
-        dev->slot_id = 0;
-
-        return EOK;
-}
-
-void xhci_device_fini(xhci_device_t *dev)
-{
-        // TODO: Check that all endpoints are dead.
-        assert(dev);
+        xhci_trb_ring_fini(&xhci_ep->ring);
+}
+
+/** See section 4.5.1 of the xHCI spec.
+ */
+uint8_t xhci_endpoint_dci(xhci_endpoint_t *ep)
+{
+        return (2 * ep->base.target.endpoint) +
+                (ep->base.transfer_type == USB_TRANSFER_CONTROL
+                 || ep->base.direction == USB_DIRECTION_IN);
 }
 
@@ -93 +86 @@
 uint8_t xhci_endpoint_index(xhci_endpoint_t *ep)
 {
-        return  (2 * ep->base.target.endpoint)
-            - (ep->base.direction == USB_DIRECTION_OUT);
+        return xhci_endpoint_dci(ep) - 1;
 }
 
@@ -139 +131 @@
         XHCI_EP_TYPE_SET(*ctx, xhci_endpoint_type(ep));
         XHCI_EP_MAX_PACKET_SIZE_SET(*ctx, ep->base.max_packet_size);
-        XHCI_EP_MAX_BURST_SIZE_SET(*ctx, ep->device->usb3 ? ss_desc->max_burst : 0);
+        XHCI_EP_MAX_BURST_SIZE_SET(*ctx,
+            xhci_device_get(ep->base.device)->usb3 ? ss_desc->max_burst : 0);
         XHCI_EP_ERROR_COUNT_SET(*ctx, 3);
 
@@ -186 +179 @@
 int xhci_device_add_endpoint(xhci_device_t *dev, xhci_endpoint_t *ep)
 {
-        assert(dev->address == ep->base.target.address);
-        assert(!dev->endpoints[ep->base.target.endpoint]);
-        assert(!ep->device);
-
-        int err;
-        xhci_input_ctx_t *ictx = NULL;
-        xhci_trb_ring_t *ep_ring = NULL;
-        if (ep->base.target.endpoint > 0) {
-                // FIXME: Retrieve this from somewhere, if applicable.
-                usb_superspeed_endpoint_companion_descriptor_t ss_desc;
-                memset(&ss_desc, 0, sizeof(ss_desc));
-
-                // Prepare input context.
-                ictx = malloc32(sizeof(xhci_input_ctx_t));
-                if (!ictx) {
-                        return ENOMEM;
-                }
-
-                memset(ictx, 0, sizeof(xhci_input_ctx_t));
-
-                // Quoting sec. 4.6.6: A1, D0, D1 are down, A0 is up.
-                XHCI_INPUT_CTRL_CTX_ADD_CLEAR(ictx->ctrl_ctx, 1);
-                XHCI_INPUT_CTRL_CTX_DROP_CLEAR(ictx->ctrl_ctx, 0);
-                XHCI_INPUT_CTRL_CTX_DROP_CLEAR(ictx->ctrl_ctx, 1);
-                XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, 0);
-
-                const uint8_t ep_idx = xhci_endpoint_index(ep);
-                XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, ep_idx + 1); /* Preceded by slot ctx */
-
-                ep_ring = malloc(sizeof(xhci_trb_ring_t));
-                if (!ep_ring) {
-                        err = ENOMEM;
-                        goto err_ictx;
-                }
-
-                // FIXME: This ring need not be allocated all the time.
-                err = xhci_trb_ring_init(ep_ring);
-                if (err)
-                        goto err_ring;
-
-                switch (ep->base.transfer_type) {
-                case USB_TRANSFER_CONTROL:
-                        setup_control_ep_ctx(ep, &ictx->endpoint_ctx[ep_idx], ep_ring);
-                        break;
-
-                case USB_TRANSFER_BULK:
-                        setup_bulk_ep_ctx(ep, &ictx->endpoint_ctx[ep_idx], ep_ring, &ss_desc);
-                        break;
-
-                case USB_TRANSFER_ISOCHRONOUS:
-                        setup_isoch_ep_ctx(ep, &ictx->endpoint_ctx[ep_idx], ep_ring, &ss_desc);
-                        break;
-
-                case USB_TRANSFER_INTERRUPT:
-                        setup_interrupt_ep_ctx(ep, &ictx->endpoint_ctx[ep_idx], ep_ring, &ss_desc);
-                        break;
-
-                }
-
-                dev->hc->dcbaa_virt[dev->slot_id].trs[ep->base.target.endpoint] = ep_ring;
-
-                // Issue configure endpoint command (sec 4.3.5).
-                xhci_cmd_t cmd;
-                xhci_cmd_init(&cmd);
-
-                cmd.slot_id = dev->slot_id;
-                xhci_send_configure_endpoint_command(dev->hc, &cmd, ictx);
-                if ((err = xhci_cmd_wait(&cmd, XHCI_DEFAULT_TIMEOUT)) != EOK)
-                        goto err_cmd;
-
-                xhci_cmd_fini(&cmd);
+        assert(dev);
+        assert(ep);
+
+        int err = ENOMEM;
+        usb_endpoint_t ep_num = ep->base.target.endpoint;
+
+        assert(&dev->base == ep->base.device);
+        assert(dev->base.address == ep->base.target.address);
+        assert(!dev->endpoints[ep_num]);
+
+        dev->endpoints[ep_num] = ep;
+        ++dev->active_endpoint_count;
+
+        if (ep_num == 0)
+                /* EP 0 is initialized while setting up the device,
+                 * so we must not issue the command now. */
+                return EOK;
+
+        // FIXME: Retrieve this from somewhere, if applicable.
+        usb_superspeed_endpoint_companion_descriptor_t ss_desc;
+        memset(&ss_desc, 0, sizeof(ss_desc));
+
+        // Prepare input context.
+        xhci_input_ctx_t *ictx = malloc32(sizeof(xhci_input_ctx_t));
+        if (!ictx)
+                goto err;
+
+        memset(ictx, 0, sizeof(xhci_input_ctx_t));
+
+        // Quoting sec. 4.6.6: A1, D0, D1 are down, A0 is up.
+        XHCI_INPUT_CTRL_CTX_ADD_CLEAR(ictx->ctrl_ctx, 1);
+        XHCI_INPUT_CTRL_CTX_DROP_CLEAR(ictx->ctrl_ctx, 0);
+        XHCI_INPUT_CTRL_CTX_DROP_CLEAR(ictx->ctrl_ctx, 1);
+        XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, 0);
+
+        unsigned ep_idx = xhci_endpoint_index(ep);
+        XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, ep_idx + 1); /* Preceded by slot ctx */
+
+        xhci_trb_ring_t *ep_ring = &ep->ring;
+        xhci_ep_ctx_t *ep_ctx = &ictx->endpoint_ctx[ep_idx];
+
+        // TODO: Convert to table
+        switch (ep->base.transfer_type) {
+        case USB_TRANSFER_CONTROL:
+                setup_control_ep_ctx(ep, ep_ctx, ep_ring);
+                break;
+
+        case USB_TRANSFER_BULK:
+                setup_bulk_ep_ctx(ep, ep_ctx, ep_ring, &ss_desc);
+                break;
+
+        case USB_TRANSFER_ISOCHRONOUS:
+                setup_isoch_ep_ctx(ep, ep_ctx, ep_ring, &ss_desc);
+                break;
+
+        case USB_TRANSFER_INTERRUPT:
+                setup_interrupt_ep_ctx(ep, ep_ctx, ep_ring, &ss_desc);
+                break;
         }
 
-        ep->device = dev;
-        dev->endpoints[ep->base.target.endpoint] = ep;
-        ++dev->active_endpoint_count;
+        // Issue configure endpoint command (sec 4.3.5).
+        xhci_cmd_t cmd;
+        xhci_cmd_init(&cmd);
+
+        cmd.slot_id = dev->slot_id;
+        xhci_send_configure_endpoint_command(dev->hc, &cmd, ictx);
+        if ((err = xhci_cmd_wait(&cmd, XHCI_DEFAULT_TIMEOUT)) != EOK)
+                goto err_ictx;
+
+        xhci_cmd_fini(&cmd);
+
+        free32(ictx);
         return EOK;
 
-err_cmd:
-err_ring:
-        if (ep_ring) {
-                xhci_trb_ring_fini(ep_ring);
-                free(ep_ring);
-        }
 err_ictx:
-        free(ictx);
+        free32(ictx);
+err:
+        dev->endpoints[ep_idx] = NULL;
+        dev->active_endpoint_count--;
         return err;
 }
@@ -277 +263 @@
 int xhci_device_remove_endpoint(xhci_device_t *dev, xhci_endpoint_t *ep)
 {
-        assert(dev->address == ep->base.target.address);
+        assert(&dev->base == ep->base.device);
+        assert(dev->base.address == ep->base.target.address);
         assert(dev->endpoints[ep->base.target.endpoint]);
-        assert(dev == ep->device);
 
         // TODO: Issue configure endpoint command to drop this endpoint.
 
-        ep->device = NULL;
         dev->endpoints[ep->base.target.endpoint] = NULL;
         --dev->active_endpoint_count;