Changeset b80c1ab in mainline for uspace/drv/bus/usb/xhci/scratchpad.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/scratchpad.c (modified) (4 diffs)

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

@@ -36 +36 @@
 #include <errno.h>
 #include <usb/debug.h>
-#include <usb/host/utils/malloc32.h>
 #include "hc.h"
 #include "hw_struct/regs.h"
@@ -53 +52 @@
 int xhci_scratchpad_alloc(xhci_hc_t *hc)
 {
-        unsigned num_bufs, allocated;
-        xhci_scratchpad_t *bufs;
-
-        num_bufs = xhci_scratchpad_count(hc);
+        const unsigned num_bufs = xhci_scratchpad_count(hc);
 
         if (!num_bufs)
                 return EOK;
 
-        bufs = malloc32(sizeof(xhci_scratchpad_t));
-        if (!bufs)
+        if (dma_buffer_alloc(&hc->scratchpad_array, num_bufs * sizeof(uint64_t)))
                 return ENOMEM;
+        uint64_t *phys_array = hc->scratchpad_array.virt;
 
-        allocated = 0;
+        hc->dcbaa[0] = host2xhci(64, hc->scratchpad_array.phys);
 
-        uint64_t *phys_array = malloc32(num_bufs * sizeof(uint64_t));
-        if (phys_array == NULL)
-                goto err_phys_array;
-
-        uint64_t *virt_array = malloc32(num_bufs * sizeof(uint64_t));
-        if (virt_array == NULL)
-                goto err_virt_array;
+        hc->scratchpad_buffers = calloc(num_bufs, sizeof(dma_buffer_t));
+        if (!hc->scratchpad_buffers)
+                goto err_dma;
 
         for (unsigned i = 0; i < num_bufs; ++i) {
-                void *buf = malloc32(PAGE_SIZE);
-                phys_array[i] = host2xhci(64, (uint64_t) addr_to_phys(buf));
-                virt_array[i] = (uint64_t) buf;
+                dma_buffer_t *cur = &hc->scratchpad_buffers[i];
+                if (dma_buffer_alloc(cur, PAGE_SIZE))
+                        goto err_buffers;
 
-                if (buf != NULL)
-                        ++allocated;
-                else
-                        goto err_page_alloc;
-
-                memset(buf, 0, PAGE_SIZE);
+                memset(cur->virt, 0, PAGE_SIZE);
+                phys_array[i] = host2xhci(64, cur->phys);
         }
 
-        bufs->phys_ptr = host2xhci(64, (uint64_t) addr_to_phys(phys_array));
-        bufs->virt_ptr = (uint64_t) virt_array;
-        bufs->phys_bck = (uint64_t) phys_array;
-
-        hc->dcbaa[0] = bufs->phys_ptr;
-        hc->scratchpad = bufs;
 
         usb_log_debug2("Allocated %d scratchpad buffers.", num_bufs);
@@ -99 +81 @@
         return EOK;
 
-err_page_alloc:
-        for (unsigned i = 0; i < allocated; ++i)
-                free32((void *) virt_array[i]);
-        free32(virt_array);
-
-err_virt_array:
-        free32(phys_array);
-
-err_phys_array:
-        free32(bufs);
-
+err_buffers:
+        for (unsigned i = 0; i < num_bufs; ++i)
+                dma_buffer_free(&hc->scratchpad_buffers[i]);
+        free(hc->scratchpad_buffers);
+err_dma:
+        hc->dcbaa[0] = 0;
+        dma_buffer_free(&hc->scratchpad_array);
         return ENOMEM;
 }
@@ -115 +93 @@
 void xhci_scratchpad_free(xhci_hc_t *hc)
 {
-        unsigned num_bufs;
-        xhci_scratchpad_t *scratchpad;
-        uint64_t *virt_array;
+        const unsigned num_bufs = xhci_scratchpad_count(hc);
 
-        num_bufs = xhci_scratchpad_count(hc);
         if (!num_bufs)
                 return;
 
-        scratchpad =  hc->scratchpad;
-        virt_array = (uint64_t *) scratchpad->virt_ptr;
-
+        hc->dcbaa[0] = 0;
+        dma_buffer_free(&hc->scratchpad_array);
         for (unsigned i = 0; i < num_bufs; ++i)
-                free32((void *) virt_array[i]);
-        free32((void *) scratchpad->virt_ptr);
-        free32((void *) scratchpad->phys_bck);
-
-        hc->dcbaa[0] = 0;
-
+                dma_buffer_free(&hc->scratchpad_buffers[i]);
+        free(hc->scratchpad_buffers);
         return;
 }