Index: uspace/lib/usbhost/Makefile =================================================================== --- uspace/lib/usbhost/Makefile (revision a1f83a33fab2ba766d665cd2f41debff28491e6d) +++ uspace/lib/usbhost/Makefile (revision cfe485248470eaa3e68e053d375e4c11a7b486e9) @@ -40,4 +40,5 @@ src/usb2_bus.c \ src/bandwidth.c \ + src/dma_buffer.c \ src/usb_transfer_batch.c Index: uspace/lib/usbhost/include/usb/host/dma_buffer.h =================================================================== --- uspace/lib/usbhost/include/usb/host/dma_buffer.h (revision cfe485248470eaa3e68e053d375e4c11a7b486e9) +++ uspace/lib/usbhost/include/usb/host/dma_buffer.h (revision cfe485248470eaa3e68e053d375e4c11a7b486e9) @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2017 Ondrej Hlavaty + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** @addtogroup drvusbehci + * @{ + */ +/** @file + * @brief USB host controller library: DMA buffer helpers + * + * Simplifies usage of bounce buffers. + * + * Currently the minimum size allocated is a page, which is wasteful. Could be + * extended to support memory pools, which will enable smaller units of + * allocation. + */ +#ifndef LIB_USBHOST_DMA_BUFFER +#define LIB_USBHOST_DMA_BUFFER + +#include +#include +#include + +typedef const struct dma_policy { + bool use64; /**< Whether to use more than initial 4GiB of memory */ + size_t alignment; /**< What alignment is needed. At most PAGE_SIZE. */ +} dma_policy_t; + +typedef struct dma_buffer { + void *virt; + uintptr_t phys; +} dma_buffer_t; + +extern dma_policy_t dma_policy_default; + +extern int dma_buffer_alloc(dma_buffer_t *db, size_t size); +extern int dma_buffer_alloc_policy(dma_buffer_t *, size_t, dma_policy_t); +extern void dma_buffer_free(dma_buffer_t *); + +static inline int dma_buffer_is_set(dma_buffer_t *db) +{ + return !!db->virt; +} + +#endif +/** + * @} + */ Index: uspace/lib/usbhost/src/dma_buffer.c =================================================================== --- uspace/lib/usbhost/src/dma_buffer.c (revision cfe485248470eaa3e68e053d375e4c11a7b486e9) +++ uspace/lib/usbhost/src/dma_buffer.c (revision cfe485248470eaa3e68e053d375e4c11a7b486e9) @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2013 Jan Vesely + * Copyright (c) 2017 Ondrej Hlavaty + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** @addtogroup libusbhost + * @{ + */ +/** @file + */ + +#include + +#include +#include +#include +#include + +dma_policy_t dma_policy_default = { + .use64 = false, + .alignment = PAGE_SIZE, +}; + +/** Allocate a DMA buffer. + * + * @param[in] db dma_buffer_t structure to fill + * @param[in] policy dma_policy_t structure to guide + * @param[in] size Size of the required memory space + * @return Error code. + */ +int dma_buffer_alloc_policy(dma_buffer_t *db, size_t size, dma_policy_t policy) +{ + assert(db); + + if (policy.alignment > PAGE_SIZE) + return EINVAL; + + const size_t aligned_size = ALIGN_UP(size, policy.alignment); + const size_t real_size = ALIGN_UP(aligned_size, PAGE_SIZE); + const int flags = policy.use64 ? 0 : DMAMEM_4GiB; + + uintptr_t phys; + void *address = AS_AREA_ANY; + + const int ret = dmamem_map_anonymous(real_size, + flags, AS_AREA_READ | AS_AREA_WRITE, 0, + &phys, &address); + + if (ret == EOK) { + /* Poison, accessing it should be enough to make sure + * the location is mapped, but poison works better */ + memset(address, 0x5, real_size); + db->virt = address; + db->phys = phys; + } + return ret; +} + +/** Allocate a DMA buffer using the default policy. + * + * @param[in] db dma_buffer_t structure to fill + * @param[in] size Size of the required memory space + * @return Error code. + */ +int dma_buffer_alloc(dma_buffer_t *db, size_t size) +{ + return dma_buffer_alloc_policy(db, size, dma_policy_default); +} + + +/** Free a DMA buffer. + * + * @param[in] db dma_buffer_t structure buffer of which will be freed + */ +void dma_buffer_free(dma_buffer_t *db) +{ + if (db->virt) { + dmamem_unmap_anonymous(db->virt); + db->virt = NULL; + db->phys = 0; + } +} + +/** + * @} + */