diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-04-14 15:55:33 +0200 |
|---|---|---|
| committer | Christian Mauderer <christian.mauderer@embedded-brains.de> | 2020-04-15 16:18:43 +0200 |
| commit | bd7af5fcee976bc3a287b4622591dc0df40a79f9 (patch) | |
| tree | fff17a422bd2e498870a1476c5db047c3e619a5a | |
| parent | testsuite: A description for each test added (diff) | |
| download | rtems-libbsd-bd7af5fcee976bc3a287b4622591dc0df40a79f9.tar.bz2 | |
usb_busdma: Add USB_NEED_BUSDMA_COHERENT_ALLOC
Some BSPs have a cache-coherent memory area, however, it should not be
used for the USB controller.
| -rw-r--r-- | freebsd/sys/dev/usb/usb_busdma.c | 4 | ||||
| -rw-r--r-- | rtemsbsd/include/rtems/bsd/local/opt_usb.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/freebsd/sys/dev/usb/usb_busdma.c b/freebsd/sys/dev/usb/usb_busdma.c index 9a70c687..dc52fe15 100644 --- a/freebsd/sys/dev/usb/usb_busdma.c +++ b/freebsd/sys/dev/usb/usb_busdma.c @@ -584,7 +584,11 @@ usb_pc_alloc_mem(struct usb_page_cache *pc, struct usb_page *pg, } /* allocate memory */ if (bus_dmamem_alloc( +#if !defined(__rtems__) || USB_NEED_BUSDMA_COHERENT_ALLOC utag->tag, &ptr, (BUS_DMA_WAITOK | BUS_DMA_COHERENT), &map)) { +#else /* __rtems__ */ + utag->tag, &ptr, BUS_DMA_WAITOK, &map)) { +#endif /* __rtems__ */ goto error; } /* setup page cache */ diff --git a/rtemsbsd/include/rtems/bsd/local/opt_usb.h b/rtemsbsd/include/rtems/bsd/local/opt_usb.h index 809a969f..9f654863 100644 --- a/rtemsbsd/include/rtems/bsd/local/opt_usb.h +++ b/rtemsbsd/include/rtems/bsd/local/opt_usb.h @@ -1,4 +1,5 @@ #include <rtems/bsd/modules.h> +#include <bsp.h> #define USB_HAVE_CONDVAR 1 @@ -6,6 +7,10 @@ #define USB_HAVE_BUSDMA 1 +#if !defined(LIBBSP_ARM_IMX_BSP_H) && !defined(LIBBSP_ARM_STM32H7_BSP_H) +#define USB_NEED_BUSDMA_COHERENT_ALLOC 1 +#endif + #define USB_HAVE_COMPAT_LINUX 0 #define USB_HAVE_USER_IO 0 |