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

Timestamp:

2017-11-14T23:17:54Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

e76c0ea

Parents:

cfe4852

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 23:15:24)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 23:17:54)

Message:

xhci: use dma_buffers instead of malloc32 util

A bit of refactoring was needed to adapt scratchpad buffers.

File:

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

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

@@ -38 +38 @@
 #include <usb/debug.h>
 #include <usb/host/endpoint.h>
-#include <usb/host/utils/malloc32.h>
 #include "debug.h"
 #include "hc.h"
@@ -201 +200 @@
         int err;
 
-        hc->dcbaa = malloc32((1 + hc->max_slots) * sizeof(uint64_t));
-        if (!hc->dcbaa)
+        if (dma_buffer_alloc(&hc->dcbaa_dma, (1 + hc->max_slots) * sizeof(uint64_t)))
                 return ENOMEM;
+        hc->dcbaa = hc->dcbaa_dma.virt;
 
         if ((err = xhci_trb_ring_init(&hc->command_ring)))
@@ -237 +236 @@
         xhci_trb_ring_fini(&hc->command_ring);
 err_dcbaa:
-        free32(hc->dcbaa);
+        hc->dcbaa = NULL;
+        dma_buffer_free(&hc->dcbaa_dma);
         return err;
 }
@@ -402 +402 @@
                 async_usleep(1000);
 
-        uint64_t dcbaaptr = addr_to_phys(hc->dcbaa);
+        uint64_t dcbaaptr = hc->dcbaa_dma.phys;
         XHCI_REG_WR(hc->op_regs, XHCI_OP_DCBAAP_LO, LOWER32(dcbaaptr));
         XHCI_REG_WR(hc->op_regs, XHCI_OP_DCBAAP_HI, UPPER32(dcbaaptr));
@@ -411 +411 @@
         XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_HI, UPPER32(crptr));
 
-        uint64_t erstptr = addr_to_phys(hc->event_ring.erst);
-        uint64_t erdp = hc->event_ring.dequeue_ptr;
         xhci_interrupter_regs_t *intr0 = &hc->rt_regs->ir[0];
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTSZ, hc->event_ring.segment_count);
+        uint64_t erdp = hc->event_ring.dequeue_ptr;
         XHCI_REG_WR(intr0, XHCI_INTR_ERDP_LO, LOWER32(erdp));
         XHCI_REG_WR(intr0, XHCI_INTR_ERDP_HI, UPPER32(erdp));
+        uint64_t erstptr = hc->event_ring.erst.phys;
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA_LO, LOWER32(erstptr));
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA_HI, UPPER32(erstptr));
@@ -572 +572 @@
 {
         xhci_scratchpad_free(hc);
-        free32(hc->dcbaa);
+        dma_buffer_free(&hc->dcbaa_dma);
 }
 
@@ -628 +628 @@
         /* Free the device context. */
         hc->dcbaa[dev->slot_id] = 0;
-        if (dev->dev_ctx) {
-                free32(dev->dev_ctx);
-                dev->dev_ctx = NULL;
-        }
+        dma_buffer_free(&dev->dev_ctx);
 
         /* Mark the slot as invalid. */
@@ -639 +636 @@
 }
 
-static int create_valid_input_ctx(xhci_input_ctx_t **out_ictx)
-{
-        xhci_input_ctx_t *ictx = malloc32(sizeof(xhci_input_ctx_t));
-        if (!ictx) {
-                return ENOMEM;
-        }
-
+static int create_valid_input_ctx(dma_buffer_t *dma_buf)
+{
+        const int err = dma_buffer_alloc(dma_buf, sizeof(xhci_input_ctx_t));
+        if (err)
+                return err;
+
+        xhci_input_ctx_t *ictx = dma_buf->virt;
         memset(ictx, 0, sizeof(xhci_input_ctx_t));
 
@@ -654 +651 @@
         XHCI_INPUT_CTRL_CTX_ADD_SET(ictx->ctrl_ctx, 0);
 
-        if (out_ictx) {
-                *out_ictx = ictx;
-        }
-
         return EOK;
 }
@@ -675 +668 @@
 
         /* Setup and register device context */
-        dev->dev_ctx = malloc32(sizeof(xhci_device_ctx_t));
-        if (!dev->dev_ctx)
+        if (dma_buffer_alloc(&dev->dev_ctx, sizeof(xhci_device_ctx_t)))
                 goto err;
-        memset(dev->dev_ctx, 0, sizeof(xhci_device_ctx_t));
-
-        hc->dcbaa[dev->slot_id] = addr_to_phys(dev->dev_ctx);
+        memset(dev->dev_ctx.virt, 0, sizeof(xhci_device_ctx_t));
+
+        hc->dcbaa[dev->slot_id] = host2xhci(64, dev->dev_ctx.phys);
 
         /* Issue configure endpoint command (sec 4.3.5). */
-        xhci_input_ctx_t *ictx;
-        if ((err = create_valid_input_ctx(&ictx))) {
+        dma_buffer_t ictx_dma_buf;
+        if ((err = create_valid_input_ctx(&ictx_dma_buf))) {
                 goto err_dev_ctx;
         }
+        xhci_input_ctx_t *ictx = ictx_dma_buf.virt;
 
         /* Initialize slot_ctx according to section 4.3.3 point 3. */
@@ -705 +698 @@
 
         /* Issue Address Device command. */
-        if ((err = xhci_cmd_sync_inline(hc, ADDRESS_DEVICE, .slot_id = dev->slot_id, .input_ctx = ictx))) {
+        if ((err = xhci_cmd_sync_inline(hc, ADDRESS_DEVICE, .slot_id = dev->slot_id, .input_ctx = ictx_dma_buf))) {
                 goto err_dev_ctx;
         }
 
-        dev->base.address = XHCI_SLOT_DEVICE_ADDRESS(dev->dev_ctx->slot_ctx);
+        xhci_device_ctx_t *dev_ctx = dev->dev_ctx.virt;
+        dev->base.address = XHCI_SLOT_DEVICE_ADDRESS(dev_ctx->slot_ctx);
         usb_log_debug2("Obtained USB address: %d.\n", dev->base.address);
 
@@ -720 +714 @@
 
 err_dev_ctx:
-        free32(dev->dev_ctx);
         hc->dcbaa[dev->slot_id] = 0;
+        dma_buffer_free(&dev->dev_ctx);
 err:
         return err;
@@ -729 +723 @@
 {
         /* Issue configure endpoint command (sec 4.3.5). */
-        xhci_input_ctx_t *ictx;
-        const int err = create_valid_input_ctx(&ictx);
+        dma_buffer_t ictx_dma_buf;
+        const int err = create_valid_input_ctx(&ictx_dma_buf);
         if (err)
                 return err;
@@ -736 +730 @@
         // TODO: Set slot context and other flags. (probably forgot a lot of 'em)
 
-        return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx);
+        return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx_dma_buf);
 }
 
@@ -748 +742 @@
 {
         /* Issue configure endpoint command (sec 4.3.5). */
-        xhci_input_ctx_t *ictx;
-        const int err = create_valid_input_ctx(&ictx);
+        dma_buffer_t ictx_dma_buf;
+        const int err = create_valid_input_ctx(&ictx_dma_buf);
         if (err)
                 return err;
 
+        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));
         // TODO: Set slot context and other flags. (probably forgot a lot of 'em)
 
-        return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx);
+        return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx_dma_buf);
 }
 
@@ -763 +758 @@
 {
         /* Issue configure endpoint command (sec 4.3.5). */
-        xhci_input_ctx_t *ictx;
-        const int err = create_valid_input_ctx(&ictx);
+        dma_buffer_t ictx_dma_buf;
+        const int err = create_valid_input_ctx(&ictx_dma_buf);
         if (err)
                 return err;
 
+        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 */
         // TODO: Set slot context and other flags. (probably forgot a lot of 'em)
 
-        return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx);
+        return xhci_cmd_sync_inline(hc, CONFIGURE_ENDPOINT, .slot_id = slot_id, .input_ctx = ictx_dma_buf);
 }