Changeset 7ec7b7e in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2018-01-19T21:04:32Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

726af29

Parents:

c6f82e5

Message:

Handling HCs with 32 or 64-bytes context size

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (8 diffs)

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

@@ -223 +223 @@
 
         hc->ac64 = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_AC64);
+        hc->csz = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_CSZ);
         hc->max_slots = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_MAX_SLOTS);
 
@@ -723 +724 @@
 
         /* Prepare memory for the context */
-        if ((err = dma_buffer_alloc(&dev->dev_ctx, sizeof(xhci_device_ctx_t))))
+        if ((err = dma_buffer_alloc(&dev->dev_ctx, XHCI_DEVICE_CTX_SIZE(hc))))
                 return err;
-        memset(dev->dev_ctx.virt, 0, sizeof(xhci_device_ctx_t));
+        memset(dev->dev_ctx.virt, 0, XHCI_DEVICE_CTX_SIZE(hc));
 
         /* Get the slot number */
@@ -807 +808 @@
 static int create_configure_ep_input_ctx(xhci_device_t *dev, dma_buffer_t *dma_buf)
 {
-        const int err = dma_buffer_alloc(dma_buf, sizeof(xhci_input_ctx_t));
+        const xhci_hc_t * hc = bus_to_hc(dev->base.bus);
+        const int err = dma_buffer_alloc(dma_buf, XHCI_INPUT_CTX_SIZE(hc));
         if (err)
                 return err;
 
         xhci_input_ctx_t *ictx = dma_buf->virt;
-        memset(ictx, 0, sizeof(xhci_input_ctx_t));
+        memset(ictx, 0, XHCI_INPUT_CTX_SIZE(hc));
 
         // Quoting sec. 4.6.5 and 4.6.6: A1, D0, D1 are down (already zeroed), A0 is up.
-        XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, 0);
-        xhci_setup_slot_context(dev, &ictx->slot_ctx);
+        XHCI_INPUT_CTRL_CTX_ADD_SET(*XHCI_GET_CTRL_CTX(ictx, hc), 0);
+        xhci_slot_ctx_t *slot_ctx = XHCI_GET_SLOT_CTX(XHCI_GET_DEVICE_CTX(ictx, hc), hc);
+        xhci_setup_slot_context(dev, slot_ctx);
 
         return EOK;
@@ -846 +849 @@
 
         /* Copy endpoint 0 context and set A1 flag. */
-        XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, 1);
-        xhci_setup_endpoint_context(ep0, &ictx->endpoint_ctx[0]);
-
+        XHCI_INPUT_CTRL_CTX_ADD_SET(*XHCI_GET_CTRL_CTX(ictx, hc), 1);
+        xhci_ep_ctx_t *ep_ctx = XHCI_GET_EP_CTX(XHCI_GET_DEVICE_CTX(ictx, hc), hc, 0);
+        xhci_setup_endpoint_context(ep0, ep_ctx);
         /* Address device needs Ctx entries set to 1 only */
-        xhci_slot_ctx_t *slot_ctx = &ictx->slot_ctx;
+        xhci_slot_ctx_t *slot_ctx = XHCI_GET_SLOT_CTX(XHCI_GET_DEVICE_CTX(ictx, hc), hc);
         XHCI_SLOT_CTX_ENTRIES_SET(*slot_ctx, 1);
 
@@ -857 +860 @@
                 return err;
 
-        xhci_device_ctx_t *dev_ctx = dev->dev_ctx.virt;
-        dev->base.address = XHCI_SLOT_DEVICE_ADDRESS(dev_ctx->slot_ctx);
+        xhci_device_ctx_t *device_ctx = dev->dev_ctx.virt;
+        dev->base.address = XHCI_SLOT_DEVICE_ADDRESS(*XHCI_GET_SLOT_CTX(device_ctx, hc));
         usb_log_debug2("Obtained USB address: %d.", dev->base.address);
 
@@ -911 +914 @@
 
         xhci_input_ctx_t *ictx = ictx_dma_buf.virt;
-        XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, ep_idx + 1); /* Preceded by slot ctx */
-        memcpy(&ictx->endpoint_ctx[ep_idx], ep_ctx, sizeof(xhci_ep_ctx_t));
 
         xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        XHCI_INPUT_CTRL_CTX_ADD_SET(*XHCI_GET_CTRL_CTX(ictx, hc), ep_idx + 1); /* Preceded by slot ctx */
+
+        xhci_ep_ctx_t *_ep_ctx = XHCI_GET_EP_CTX(XHCI_GET_DEVICE_CTX(ictx, hc), hc, ep_idx);
+        memcpy(_ep_ctx, ep_ctx, XHCI_ONE_CTX_SIZE(hc));
+
         return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = dev->slot_id, .input_ctx = ictx_dma_buf);
 }
@@ -932 +938 @@
                 return err;
 
+        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
         xhci_input_ctx_t *ictx = ictx_dma_buf.virt;
-        XHCI_INPUT_CTRL_CTX_DROP_SET(ictx->ctrl_ctx, ep_idx + 1); /* Preceded by slot ctx */
-
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        XHCI_INPUT_CTRL_CTX_DROP_SET(*XHCI_GET_CTRL_CTX(ictx, hc), ep_idx + 1); /* Preceded by slot ctx */
+
         return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = dev->slot_id, .input_ctx = ictx_dma_buf);
 }
@@ -950 +956 @@
 {
         dma_buffer_t ictx_dma_buf;
-        const int err = dma_buffer_alloc(&ictx_dma_buf, sizeof(xhci_input_ctx_t));
+        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+
+        const int err = dma_buffer_alloc(&ictx_dma_buf, XHCI_INPUT_CTX_SIZE(hc));
         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));
-
-        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+        memset(ictx, 0, XHCI_INPUT_CTX_SIZE(hc));
+
+        XHCI_INPUT_CTRL_CTX_ADD_SET(*XHCI_GET_CTRL_CTX(ictx, hc), ep_idx + 1);
+        xhci_ep_ctx_t *_ep_ctx = XHCI_GET_EP_CTX(XHCI_GET_DEVICE_CTX(ictx, hc), hc, 0);
+        memcpy(_ep_ctx, ep_ctx, sizeof(xhci_ep_ctx_t));
+
         return xhci_cmd_sync_inline(hc, EVALUATE_CONTEXT, .slot_id = dev->slot_id, .input_ctx = ictx_dma_buf);
 }