lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin: dma-mapping: fix thinko in constant optimization

Browse Source 
Make sure the non-constant version of the dma_sync functions actually
complete instead of recursively calling itself forever.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Sonic Zhang
2009-12-16 07:52:52 +00:00
committed by Mike Frysinger
parent 0c270807db
commit a3a6a59019
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/blackfin/include/asm/dma-mapping.h
View File

@@ -44,13 +44,8 @@ dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
extern void extern void
__dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir); __dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir);
static inline void static inline void
_dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir) __dma_sync_inline(dma_addr_t addr, size_t size, enum dma_data_direction dir)
{ {
if (!__builtin_constant_p(dir)) {
__dma_sync(addr, size, dir);
return;
}
switch (dir) { switch (dir) {
case DMA_NONE: case DMA_NONE:
BUG(); BUG();
@@ -64,6 +59,14 @@ _dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir)
break; break;
} }
} }
static inline void
_dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir)
{
if (__builtin_constant_p(dir))
__dma_sync_inline(addr, size, dir);
else
__dma_sync(addr, size, dir);
}
/* /*
* Map a single buffer of the indicated size for DMA in streaming mode. * Map a single buffer of the indicated size for DMA in streaming mode.

2
arch/blackfin/kernel/dma-mapping.c
View File

@@ -116,7 +116,7 @@ EXPORT_SYMBOL(dma_free_coherent);
void __dma_sync(dma_addr_t addr, size_t size, void __dma_sync(dma_addr_t addr, size_t size,
enum dma_data_direction dir) enum dma_data_direction dir)
{ {
_dma_sync(addr, size, dir); __dma_sync_inline(addr, size, dir);
} }
EXPORT_SYMBOL(__dma_sync); EXPORT_SYMBOL(__dma_sync);