Changeset fdc2253b in mainline

Timestamp:

2018-02-05T00:54:08Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

d14688d

Parents:

cc63815

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-02 14:38:23)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:54:08)

Message:

usb pipes: allocate with policy

Location:

uspace

Files:

• drv/bus/usb/xhci/endpoint.c (modified) (1 diff)
• lib/drv/include/usbhc_iface.h (modified) (1 diff)
• lib/usbdev/src/pipes.c (modified) (1 diff)
• lib/usbhost/include/usb/host/endpoint.h (modified) (1 diff)
• lib/usbhost/src/ddf_helpers.c (modified) (1 diff)

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

@@ -119 +119 @@
                 goto err;
 
+        /* Driver can handle non-contiguous buffers */
+        ep->transfer_buffer_policy &= ~DMA_POLICY_CONTIGUOUS;
+
+        /* Driver can handle buffers crossing boundaries */
+        ep->transfer_buffer_policy &= ~DMA_POLICY_NOT_CROSSING;
+
+        /* Some xHCs can handle 64-bit addresses */
+        xhci_bus_t *bus = bus_to_xhci_bus(ep->device->bus);
+        if (bus->hc->ac64)
+                ep->transfer_buffer_policy &= ~DMA_POLICY_4GiB;
+
         return EOK;
 

uspace/lib/drv/include/usbhc_iface.h

@@ -118 +118 @@
         /** Maximum size of one transfer */
         size_t max_transfer_size;
+
+        /** Constraints on buffers to be transferred without copying */
+        dma_policy_t transfer_buffer_policy;
 } usb_pipe_desc_t;
 

uspace/lib/usbdev/src/pipes.c

@@ -171 +171 @@
 void *usb_pipe_alloc_buffer(usb_pipe_t *pipe, size_t size)
 {
-        // FIXME: Do not use the default policy, but the one required by HC.
-
         dma_buffer_t buf;
-        if (dma_buffer_alloc(&buf, size))
+        if (dma_buffer_alloc_policy(&buf, size, pipe->desc.transfer_buffer_policy))
                 return NULL;
 

uspace/lib/usbhost/include/usb/host/endpoint.h

@@ -98 +98 @@
         /** Maximum size of one transfer */
         size_t max_transfer_size;
+        /** Policy for transfer buffers */
+        dma_policy_t transfer_buffer_policy;
+
         /**
          * Number of packets that can be sent in one service interval

uspace/lib/usbhost/src/ddf_helpers.c

@@ -83 +83 @@
                 pipe_desc->transfer_type = ep->transfer_type;
                 pipe_desc->max_transfer_size = ep->max_transfer_size;
+                pipe_desc->transfer_buffer_policy = ep->transfer_buffer_policy;
         }
         endpoint_del_ref(ep);