summaryrefslogtreecommitdiffstats
path: root/arch/nios2
diff options
context:
space:
mode:
authorFranck Jullien <franck.jullien@gmail.com>2012-09-16 13:38:15 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-09-19 19:31:30 +0200
commit94d8f732c20ef3722401c455fff2d777802720bc (patch)
tree925547762c4fbdc10ea7a2639e15f274a18fe9d4 /arch/nios2
parentd24bb0538d268e3bd944cc6c5f0cd041876a41d7 (diff)
downloadbarebox-94d8f732c20ef3722401c455fff2d777802720bc.tar.gz
nios2: Fix DMA functions when CPU has no dcache
Signed-off-by: Franck Jullien <franck.jullien@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/nios2')
-rw-r--r--arch/nios2/include/asm/dma-mapping.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h
index 9819a97..620c207 100644
--- a/arch/nios2/include/asm/dma-mapping.h
+++ b/arch/nios2/include/asm/dma-mapping.h
@@ -6,7 +6,6 @@
#include <asm/cache.h>
-
/* dma_alloc_coherent() return cache-line aligned allocation which is mapped
* to uncached io region.
*
@@ -14,6 +13,7 @@
* 0x80000000 for nommu, 0xe0000000 for mmu
*/
+#if (DCACHE_SIZE != 0)
static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
{
void *addr = malloc(len + DCACHE_LINE_SIZE);
@@ -25,11 +25,23 @@ static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
~(DCACHE_LINE_SIZE - 1) & ~(IO_REGION_BASE);
return (void *)(*handle | IO_REGION_BASE);
}
+#else
+static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
+{
+ void *addr = malloc(len);
+ if (!addr)
+ return 0;
+ *handle = (unsigned long)addr;
+ return (void *)(*handle | IO_REGION_BASE);
+}
+#endif
+#if (DCACHE_SIZE != 0)
#define dma_alloc dma_alloc
static inline void *dma_alloc(size_t size)
{
return xmemalign(DCACHE_LINE_SIZE, ALIGN(size, DCACHE_LINE_SIZE));
}
+#endif
#endif /* __ASM_NIOS2_DMA_MAPPING_H */