aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-08-27 04:27:49 -0400
committerChristoph Hellwig <hch@lst.de>2017-10-19 10:37:40 -0400
commitd708e71ed78f56330325e8de304e2fb1e38ccf1c (patch)
tree536fad8bfebbff728c3b21a8f1b6303d7105d92b
parenta535bb801036268c3d057d7584e9c8f35f69aad4 (diff)
xtensa: make dma_cache_sync a no-op
xtensa does not implement DMA_ATTR_NON_CONSISTENT allocations, so it doesn't make any sense to do any work in dma_cache_sync given that it must be a no-op when dma_alloc_attrs returns coherent memory. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Robin Murphy <robin.murphy@arm.com>
-rw-r--r--arch/xtensa/include/asm/dma-mapping.h6
-rw-r--r--arch/xtensa/kernel/pci-dma.c23
2 files changed, 4 insertions, 25 deletions
diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h
index 269738dc9d1d..353e0314d6ba 100644
--- a/arch/xtensa/include/asm/dma-mapping.h
+++ b/arch/xtensa/include/asm/dma-mapping.h
@@ -23,8 +23,10 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
23 return &xtensa_dma_map_ops; 23 return &xtensa_dma_map_ops;
24} 24}
25 25
26void dma_cache_sync(struct device *dev, void *vaddr, size_t size, 26static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
27 enum dma_data_direction direction); 27 enum dma_data_direction direction)
28{
29}
28 30
29static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr) 31static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
30{ 32{
diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c
index cec86a1c2acc..623720a11143 100644
--- a/arch/xtensa/kernel/pci-dma.c
+++ b/arch/xtensa/kernel/pci-dma.c
@@ -26,29 +26,6 @@
26#include <asm/cacheflush.h> 26#include <asm/cacheflush.h>
27#include <asm/io.h> 27#include <asm/io.h>
28 28
29void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
30 enum dma_data_direction dir)
31{
32 switch (dir) {
33 case DMA_BIDIRECTIONAL:
34 __flush_invalidate_dcache_range((unsigned long)vaddr, size);
35 break;
36
37 case DMA_FROM_DEVICE:
38 __invalidate_dcache_range((unsigned long)vaddr, size);
39 break;
40
41 case DMA_TO_DEVICE:
42 __flush_dcache_range((unsigned long)vaddr, size);
43 break;
44
45 case DMA_NONE:
46 BUG();
47 break;
48 }
49}
50EXPORT_SYMBOL(dma_cache_sync);
51
52static void do_cache_op(dma_addr_t dma_handle, size_t size, 29static void do_cache_op(dma_addr_t dma_handle, size_t size,
53 void (*fn)(unsigned long, unsigned long)) 30 void (*fn)(unsigned long, unsigned long))
54{ 31{