Changeset 306a36d in mainline for uspace/drv/bus/usb/xhci

Timestamp:

2017-11-19T23:43:31Z (8 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

ff14aede

Parents:

e76c0ea

Message:

xhci: configuration of endpoint 0

Moved fetching of the first 8B of device descriptor from usb2_bus to
hcd, and using it in xhci bus. Also, the value was previously read wrong
by the endpoint descriptor macros, although the value is raw in the
device descriptor - now fixed.

Location:

uspace/drv/bus/usb/xhci

Files:

• bus.c (modified) (4 diffs)
• hc.c (modified) (2 diffs)
• hc.h (modified) (1 diff)

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

@@ -50 +50 @@
 
 
-/* FIXME Are these really static? Older HCs fetch it from descriptor. */
-/* FIXME Add USB3 options, if applicable. */
-static const usb_endpoint_desc_t ep0_desc = {
+static const usb_endpoint_desc_t ep0_initial_desc = {
         .endpoint_no = 0,
         .direction = USB_DIRECTION_BOTH,
@@ -97 +95 @@
         xhci_endpoint_t *ep0 = xhci_endpoint_get(ep0_base);
 
-        if ((err = prepare_endpoint(ep0, &ep0_desc)))
+        if ((err = prepare_endpoint(ep0, &ep0_initial_desc)))
                 goto err_ep;
 
@@ -124 +122 @@
 }
 
+static int setup_ep0_packet_size(xhci_hc_t *hc, xhci_device_t *dev)
+{
+        int err;
+
+        uint16_t max_packet_size;
+        if ((err = hcd_get_ep0_max_packet_size(&max_packet_size, hc->hcd, &dev->base)))
+                return err;
+
+        xhci_endpoint_t *ep0 = dev->endpoints[0];
+        assert(ep0);
+
+        if (ep0->base.max_packet_size == max_packet_size)
+                return EOK;
+
+        ep0->base.max_packet_size = max_packet_size;
+
+        xhci_ep_ctx_t ep_ctx;
+        xhci_setup_endpoint_context(ep0, &ep_ctx);
+
+        if ((err = hc_update_endpoint(hc, dev->slot_id, 0, &ep_ctx)))
+                return err;
+
+        return EOK;
+}
+
 int xhci_bus_enumerate_device(xhci_bus_t *bus, xhci_hc_t *hc, device_t *dev)
 {
@@ -160 +183 @@
         }
 
-        // TODO: Fetch descriptor of EP0 and reconfigure it accordingly
-        assert(xhci_dev->endpoints[0]);
+        if ((err = setup_ep0_packet_size(hc, xhci_dev))) {
+                usb_log_error("Failed to setup control endpoint of the new device: %s", str_error(err));
+                goto err_address;
+        }
 
         assert(bus->devices_by_slot[xhci_dev->slot_id] == NULL);

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

@@ -651 +651 @@
 }
 
-// TODO: This currently assumes the device is attached to rh directly
-//      -> calculate route string
 int hc_address_device(xhci_hc_t *hc, xhci_device_t *dev, xhci_endpoint_t *ep0)
 {
@@ -767 +765 @@
 }
 
+int hc_update_endpoint(xhci_hc_t *hc, uint32_t slot_id, uint8_t ep_idx, xhci_ep_ctx_t *ep_ctx)
+{
+        dma_buffer_t ictx_dma_buf;
+        const int err = dma_buffer_alloc(&ictx_dma_buf, sizeof(xhci_input_ctx_t));
+        if (err)
+                return err;
+
+        xhci_input_ctx_t *ictx = ictx_dma_buf.virt;
+        memset(ictx, 0, sizeof(xhci_input_ctx_t));
+
+        XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, ep_idx + 1);
+        memcpy(&ictx->endpoint_ctx[ep_idx], ep_ctx, sizeof(xhci_ep_ctx_t));
+
+        return xhci_cmd_sync_inline(hc, EVALUATE_CONTEXT, .slot_id = slot_id, .input_ctx = ictx_dma_buf);
+}
+
 /**
  * @}

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

@@ -110 +110 @@
 int hc_add_endpoint(xhci_hc_t *, uint32_t, uint8_t, xhci_ep_ctx_t *);
 int hc_drop_endpoint(xhci_hc_t *, uint32_t, uint8_t);
+int hc_update_endpoint(xhci_hc_t *, uint32_t, uint8_t, xhci_ep_ctx_t *);
 
 #endif