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

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

@@ -37 +37 @@
 #include <str_error.h>
 #include <usb/debug.h>
-#include <usb/host/utils/malloc32.h>
 #include "commands.h"
 #include "debug.h"
@@ -57 +56 @@
  */
 #define TRB_SET_DEQUEUE_PTR(trb, dptr) (trb).parameter |= host2xhci(64, (dptr))
-#define TRB_SET_ICTX(trb, phys) (trb).parameter |= host2xhci(64, phys_addr & (~0xF))
+#define TRB_SET_ICTX(trb, phys) (trb).parameter |= host2xhci(64, (phys) & (~0xF))
 
 #define TRB_GET_CODE(trb) XHCI_DWORD_EXTRACT((trb).status, 31, 24)
@@ -99 +98 @@
         list_remove(&cmd->_header.link);
 
-        if (cmd->input_ctx) {
-                free32(cmd->input_ctx);
-        };
-
-        if (cmd->bandwidth_ctx) {
-                free32(cmd->bandwidth_ctx);
-        }
+        dma_buffer_free(&cmd->input_ctx);
+        dma_buffer_free(&cmd->bandwidth_ctx);
 
         if (cmd->_header.async) {
@@ -360 +354 @@
         assert(hc);
         assert(cmd);
-        assert(cmd->input_ctx);
+        assert(dma_buffer_is_set(&cmd->input_ctx));
 
         /**
@@ -371 +365 @@
         xhci_trb_clean(&cmd->_header.trb);
 
-        uint64_t phys_addr = (uint64_t) addr_to_phys(cmd->input_ctx);
-        TRB_SET_ICTX(cmd->_header.trb, phys_addr);
+        TRB_SET_ICTX(cmd->_header.trb, cmd->input_ctx.phys);
 
         /**
@@ -396 +389 @@
         if (!cmd->deconfigure) {
                 /* If the DC flag is on, input context is not evaluated. */
-                assert(cmd->input_ctx);
-
-                uint64_t phys_addr = (uint64_t) addr_to_phys(cmd->input_ctx);
-                TRB_SET_ICTX(cmd->_header.trb, phys_addr);
+                assert(dma_buffer_is_set(&cmd->input_ctx));
+
+                TRB_SET_ICTX(cmd->_header.trb, cmd->input_ctx.phys);
         }
 
@@ -413 +405 @@
         assert(hc);
         assert(cmd);
-        assert(cmd->input_ctx);
+        assert(dma_buffer_is_set(&cmd->input_ctx));
 
         /**
@@ -423 +415 @@
         xhci_trb_clean(&cmd->_header.trb);
 
-        uint64_t phys_addr = (uint64_t) addr_to_phys(cmd->input_ctx);
-        TRB_SET_ICTX(cmd->_header.trb, phys_addr);
+        TRB_SET_ICTX(cmd->_header.trb, cmd->input_ctx.phys);
 
         TRB_SET_TYPE(cmd->_header.trb, XHCI_TRB_TYPE_EVALUATE_CONTEXT_CMD);
@@ -506 +497 @@
         xhci_trb_clean(&cmd->_header.trb);
 
-        uint64_t phys_addr = (uint64_t) addr_to_phys(cmd->bandwidth_ctx);
-        TRB_SET_ICTX(cmd->_header.trb, phys_addr);
+        TRB_SET_ICTX(cmd->_header.trb, cmd->bandwidth_ctx.phys);
 
         TRB_SET_TYPE(cmd->_header.trb, XHCI_TRB_TYPE_GET_PORT_BANDWIDTH_CMD);