Changeset 9b2f69e in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2017-10-15T20:08:16Z (8 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

b7db009

Parents:

816f5f4

Message:

Setting up endpoint contexts (almost) properly. Boilerplate for interrupt transfers. Simplified TRB ring initialization.

File:

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

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

@@ -35 +35 @@
 
 #include <usb/host/endpoint.h>
+#include <usb/descriptor.h>
 
 #include <errno.h>
@@ -53 +54 @@
         xhci_ep->device = NULL;
 
-        usb_log_debug("Endpoint %d:%d initialized.", ep->target.address, ep->target.endpoint);
-
         return EOK;
 }
@@ -63 +62 @@
 
         /* FIXME: Tear down TR's? */
-
-        endpoint_t *ep = &xhci_ep->base;
-
-        usb_log_debug("Endpoint %d:%d destroyed.", ep->target.address, ep->target.endpoint);
 }
 
@@ -76 +71 @@
         dev->slot_id = 0;
 
-        usb_log_debug("Device %d initialized.", dev->address);
         return EOK;
 }
@@ -83 +77 @@
 {
         // TODO: Check that all endpoints are dead.
-        usb_log_debug("Device %d destroyed.", dev->address);
+        assert(dev);
+}
+
+static inline uint8_t xhci_endpoint_ctx_offset(xhci_endpoint_t *ep)
+{
+        /* 0 is slot ctx, 1 is EP0, then it's EP1 out, in, EP2 out, in, etc. */
+
+        uint8_t off = 2 + 2 * (ep->base.target.endpoint - 1);
+        if (ep->base.direction == USB_DIRECTION_IN)
+                ++off;
+
+        return off;
+}
+
+static int xhci_endpoint_type(xhci_endpoint_t *ep)
+{
+        const bool in = ep->base.direction == USB_DIRECTION_IN;
+
+        switch (ep->base.transfer_type) {
+        case USB_TRANSFER_CONTROL:
+                return EP_TYPE_CONTROL;
+
+        case USB_TRANSFER_ISOCHRONOUS:
+                return in ? EP_TYPE_ISOCH_IN
+                          : EP_TYPE_ISOCH_OUT;
+
+        case USB_TRANSFER_BULK:
+                return in ? EP_TYPE_BULK_IN
+                          : EP_TYPE_BULK_OUT;
+
+        case USB_TRANSFER_INTERRUPT:
+                return in ? EP_TYPE_INTERRUPT_IN
+                          : EP_TYPE_INTERRUPT_OUT;
+        }
+
+        return EP_TYPE_INVALID;
+}
+
+static void setup_control_ep_ctx(xhci_endpoint_t *ep, xhci_ep_ctx_t *ctx,
+        xhci_trb_ring_t *ring)
+{
+        // EP0 is configured elsewhere.
+        assert(ep->base.target.endpoint > 0);
+
+        XHCI_EP_TYPE_SET(*ctx, xhci_endpoint_type(ep));
+        XHCI_EP_MAX_PACKET_SIZE_SET(*ctx, ep->base.max_packet_size);
+        XHCI_EP_ERROR_COUNT_SET(*ctx, 3);
+        XHCI_EP_TR_DPTR_SET(*ctx, ring->dequeue);
+        XHCI_EP_DCS_SET(*ctx, 1);
+}
+
+static void setup_bulk_ep_ctx(xhci_endpoint_t *ep, xhci_ep_ctx_t *ctx,
+        xhci_trb_ring_t *ring, usb_superspeed_endpoint_companion_descriptor_t *ss_desc)
+{
+
+        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_ERROR_COUNT_SET(*ctx, 3);
+
+        // FIXME: Get maxStreams and other things from ss_desc
+        const uint8_t maxStreams = 0;
+        if (maxStreams > 0) {
+                // TODO: allocate and clear primary stream array
+                // TODO: XHCI_EP_MAX_P_STREAMS_SET(ctx, psa_size);
+                // TODO: XHCI_EP_TR_DPTR_SET(ctx, psa_start_phys_addr);
+                // TODO: set HID
+                // TODO: set LSA
+        } else {
+                XHCI_EP_MAX_P_STREAMS_SET(*ctx, 0);
+                /* FIXME physical pointer? */
+                XHCI_EP_TR_DPTR_SET(*ctx, ring->dequeue);
+                XHCI_EP_DCS_SET(*ctx, 1);
+        }
+}
+
+static void setup_isoch_ep_ctx(xhci_endpoint_t *ep, xhci_ep_ctx_t *ctx,
+        xhci_trb_ring_t *ring, usb_superspeed_endpoint_companion_descriptor_t *ss_desc)
+{
+        XHCI_EP_TYPE_SET(*ctx, xhci_endpoint_type(ep));
+        XHCI_EP_MAX_PACKET_SIZE_SET(*ctx, ep->base.max_packet_size & 0x07FF);
+        XHCI_EP_MAX_BURST_SIZE_SET(*ctx, ss_desc->max_burst);
+        // FIXME: get Mult field from SS companion descriptor somehow
+        XHCI_EP_MULT_SET(*ctx, 0);
+        XHCI_EP_ERROR_COUNT_SET(*ctx, 0);
+        /* FIXME physical pointer? */
+        XHCI_EP_TR_DPTR_SET(*ctx, ring->dequeue);
+        XHCI_EP_DCS_SET(*ctx, 1);
+        // TODO: max ESIT payload
+}
+
+static void setup_interrupt_ep_ctx(xhci_endpoint_t *ep, xhci_ep_ctx_t *ctx,
+        xhci_trb_ring_t *ring, usb_superspeed_endpoint_companion_descriptor_t *ss_desc)
+{
+        XHCI_EP_TYPE_SET(*ctx, xhci_endpoint_type(ep));
+        XHCI_EP_MAX_PACKET_SIZE_SET(*ctx, ep->base.max_packet_size & 0x07FF);
+        XHCI_EP_MAX_BURST_SIZE_SET(*ctx, ss_desc->max_burst);
+        XHCI_EP_MULT_SET(*ctx, 0);
+        XHCI_EP_ERROR_COUNT_SET(*ctx, 3);
+        /* FIXME physical pointer? */
+        XHCI_EP_TR_DPTR_SET(*ctx, ring->dequeue);
+        XHCI_EP_DCS_SET(*ctx, 1);
+        // TODO: max ESIT payload
 }
 
@@ -92 +188 @@
         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 = malloc(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_offset = xhci_endpoint_ctx_offset(ep);
+                XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, ep_offset);
+
+                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_offset], ep_ring);
+                        break;
+
+                case USB_TRANSFER_BULK:
+                        setup_bulk_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset], ep_ring, &ss_desc);
+                        break;
+
+                case USB_TRANSFER_ISOCHRONOUS:
+                        setup_isoch_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset], ep_ring, &ss_desc);
+                        break;
+
+                case USB_TRANSFER_INTERRUPT:
+                        setup_interrupt_ep_ctx(ep, &ictx->endpoint_ctx[ep_offset], 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, 100000)) != EOK)
+                        goto err_cmd;
+
+                xhci_cmd_fini(&cmd);
+        }
+
         ep->device = dev;
         dev->endpoints[ep->base.target.endpoint] = ep;
         ++dev->active_endpoint_count;
         return EOK;
+
+err_cmd:
+err_ring:
+        if (ep_ring) {
+                xhci_trb_ring_fini(ep_ring);
+                free(ep_ring);
+        }
+err_ictx:
+        free(ictx);
+        return err;
 }
 
@@ -103 +278 @@
         assert(dev->endpoints[ep->base.target.endpoint]);
         assert(dev == ep->device);
+
+        // TODO: Issue configure endpoint command to drop this endpoint.
 
         ep->device = NULL;