sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Franck Jullien 2012-09-16 13:38:15 +02:00 committed by Sascha Hauer
parent d24bb0538d
commit 94d8f732c2
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/nios2/include/asm/dma-mapping.h
View File

@ -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 */