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

Timestamp:

2017-11-14T23:17:54Z (8 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/trb_ring.c (modified) (7 diffs)

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

@@ -33 +33 @@
 #include <align.h>
 #include <usb/debug.h>
-#include <usb/host/utils/malloc32.h>
 #include "hw_struct/trb.h"
 #include "trb_ring.h"
@@ -68 +67 @@
  * to DMAMEM_4GiB.
  */
-static int trb_segment_allocate(trb_segment_t **segment)
-{
-        uintptr_t phys;
-        int err;
-
-        *segment = AS_AREA_ANY;
-        err = dmamem_map_anonymous(PAGE_SIZE,
-            DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
-            (void *) segment);
-
-        if (err == EOK) {
-                memset(*segment, 0, PAGE_SIZE);
-                (*segment)->phys = phys;
-
-                usb_log_debug2("Allocated new ring segment.");
-        }
-
-        return err;
+static int trb_segment_alloc(trb_segment_t **segment)
+{
+        dma_buffer_t dbuf;
+
+        const int err = dma_buffer_alloc(&dbuf, PAGE_SIZE);
+        if (err)
+                return err;
+
+        *segment = dbuf.virt;
+        memset(*segment, 0, PAGE_SIZE);
+        (*segment)->phys = dbuf.phys;
+        usb_log_debug2("Allocated new ring segment.");
+        return EOK;
+}
+
+static void trb_segment_free(trb_segment_t *segment)
+{
+        dma_buffer_t dbuf = { .virt = segment, .phys = segment->phys };
+        dma_buffer_free(&dbuf);
 }
 
@@ -99 +99 @@
         list_initialize(&ring->segments);
 
-        if ((err = trb_segment_allocate(&segment)) != EOK)
+        if ((err = trb_segment_alloc(&segment)) != EOK)
                 return err;
 
@@ -127 +127 @@
         list_foreach_safe(ring->segments, cur, next) {
                 trb_segment_t *segment = list_get_instance(cur, trb_segment_t, segments_link);
-                dmamem_unmap_anonymous(segment);
+                trb_segment_free(segment);
         }
 }
@@ -264 +264 @@
         list_initialize(&ring->segments);
 
-        if ((err = trb_segment_allocate(&segment)) != EOK)
+        if ((err = trb_segment_alloc(&segment)) != EOK)
                 return err;
 
@@ -274 +274 @@
         ring->dequeue_ptr = segment->phys;
 
-        ring->erst = malloc32(PAGE_SIZE);
-        if (ring->erst == NULL)
+        if (dma_buffer_alloc(&ring->erst, PAGE_SIZE))
                 return ENOMEM;
-        memset(ring->erst, 0, PAGE_SIZE);
-
-        xhci_fill_erst_entry(&ring->erst[0], segment->phys, SEGMENT_TRB_COUNT);
+        xhci_erst_entry_t *erst = ring->erst.virt;
+
+        memset(erst, 0, PAGE_SIZE);
+        xhci_fill_erst_entry(&erst[0], segment->phys, SEGMENT_TRB_COUNT);
 
         ring->ccs = 1;
@@ -297 +297 @@
         }
 
-        if (ring->erst)
-                free32(ring->erst);
+        dma_buffer_free(&ring->erst);
 }