add DMA declare coherent memory support
PATCH 1/1 add DMA declare coherent memory support
ohci-sm501 driver require dma_declare_coherent_memory().
It is used to driver's local memory allocation with dma_alloc_coherent().
This patch works without problem on TANBAC TB0287(VR4131 + SM501).
Signed-off-by Yoichi Yuasa <[email protected]>
--- arch/mips/Kconfig | 1 + arch/mips/include/asm/dma-mapping.h | 3 +-- arch/mips/mm/dma-default.c | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-)
arch/mips/Kconfig +1 -0
@@ -3,6 +3,7 @@ config MIPS default y select HAVE_IDE select HAVE_OPROFILE + select HAVE_GENERIC_DMA_COHERENT select HAVE_ARCH_KGDB # Horrible source of confusion. Die, die, die ... select EMBEDDED
arch/mips/include/asm/dma-mapping.h +1 -2
@@ -3,6 +3,7 @@#include <asm/scatterlist.h> #include <asm/cache.h> +#include <asm-generic/dma-coherent.h> void *dma_alloc_noncoherent (struct device *dev,size_t size,dma_addr_t *dma_handle,gfp_t flag);
@@ -73,7 +74,6 @@ extern int dma_is_consistent(struct device *dev, dma_addr_t dma_addr);extern void dma_cache_sync (struct device *dev,void *vaddr,size_t size,enum dma_data_direction direction); -#if 0 #define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY extern int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
@@ -81,6 +81,5 @@ extern int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,extern void dma_release_declared_memory (struct device *dev);extern void *dma_mark_declared_memory_occupied (struct device *dev,dma_addr_t device_addr,size_t size); -#endif #endif /* _ASM_DMA_MAPPING_H */
arch/mips/mm/dma-default.c +7 -0
@@ -90,6 +90,9 @@ void *dma_alloc_coherent(struct device *dev, size_t size, {void *ret; +if (dma_alloc_from_coherent (dev, size, dma_handle, &ret)) +return ret; + gfp =massage_gfp_flags (dev, gfp); ret = (void *)__get_free_pages (gfp,get_order (size));
@@ -121,8 +124,12 @@ EXPORT_SYMBOL(dma_free_noncoherent);void dma_free_coherent (struct device *dev,size_t size,void *vaddr,dma_addr_t dma_handle) { +int order =get_order (size);unsigned long addr = (unsigned long ) vaddr; +if (dma_release_from_coherent (dev, order, vaddr)) +return ; +plat_unmap_dma_mem (dev, dma_handle, size,DMA_BIDIRECTIONAL );if (!plat_device_is_coherent (dev))
Signature · 1 line
1.6.5.2
Quoted 4 lines · Yoichi Yuasa
ohci-sm501 driver require
dma_declare_coherent_memory().
It is used to driver's local memory allocation withdma_alloc_coherent().This patch works without problem on TANBAC TB0287(VR4131 + SM501).
I already had a modified version of this patch queued up for 2.6.33. I'll move that patch into the main tree and change the comment to make it clear that this is a required fix.
Thanks,
Ralf