dma-mapping: move dma_mark_clean to dma-direct.h

Christoph Hellwig · Christoph Hellwig · commit b49efd762482 · 2018-01-10T16:41:12.000+01:00
And unlike the other helpers we don't require a &lt;asm/dma-direct.h&gt; as
this helper is a special case for ia64 only, and this keeps it as
simple as possible.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
@@ -109,8 +109,6 @@ static inline bool is_device_dma_coherent(struct device *dev)
 	return dev->archdata.dma_coherent;
 }
 
-static inline void dma_mark_clean(void *addr, size_t size) { }
-
 /**
  * arm_dma_alloc - allocate consistent memory for DMA
  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h
@@ -50,9 +50,5 @@ static inline bool is_device_dma_coherent(struct device *dev)
 	return dev->archdata.dma_coherent;
 }
 
-static inline void dma_mark_clean(void *addr, size_t size)
-{
-}
-
 #endif	/* __KERNEL__ */
 #endif	/* __ASM_DMA_MAPPING_H */
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
@@ -33,6 +33,7 @@ config IA64
 	select HAVE_MEMBLOCK
 	select HAVE_MEMBLOCK_NODE_MAP
 	select HAVE_VIRT_CPU_ACCOUNTING
+	select ARCH_HAS_DMA_MARK_CLEAN
 	select ARCH_HAS_SG_CHAIN
 	select VIRT_TO_BUS
 	select ARCH_DISCARD_MEMBLOCK
diff --git a/arch/ia64/include/asm/dma.h b/arch/ia64/include/asm/dma.h
@@ -20,6 +20,4 @@ extern unsigned long MAX_DMA_ADDRESS;
 
 #define free_dma(x)
 
-void dma_mark_clean(void *addr, size_t size);
-
 #endif /* _ASM_IA64_DMA_H */
diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
@@ -17,8 +17,6 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
 	return mips_dma_map_ops;
 }
 
-static inline void dma_mark_clean(void *addr, size_t size) {}
-
 #define arch_setup_dma_ops arch_setup_dma_ops
 static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base,
 				      u64 size, const struct iommu_ops *iommu,
diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h
@@ -15,8 +15,6 @@
 
 extern const struct dma_map_ops swiotlb_dma_ops;
 
-static inline void dma_mark_clean(void *addr, size_t size) {}
-
 extern unsigned int ppc_swiotlb_enable;
 int __init swiotlb_setup_bus_notifier(void);
 
diff --git a/arch/tile/include/asm/dma-mapping.h b/arch/tile/include/asm/dma-mapping.h
@@ -44,8 +44,6 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off)
 	dev->archdata.dma_offset = off;
 }
 
-static inline void dma_mark_clean(void *addr, size_t size) {}
-
 #define HAVE_ARCH_DMA_SET_MASK 1
 int dma_set_mask(struct device *dev, u64 mask);
 
diff --git a/arch/unicore32/include/asm/dma-mapping.h b/arch/unicore32/include/asm/dma-mapping.h
@@ -25,7 +25,5 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
 	return &swiotlb_dma_map_ops;
 }
 
-static inline void dma_mark_clean(void *addr, size_t size) {}
-
 #endif /* __KERNEL__ */
 #endif
diff --git a/arch/x86/include/asm/swiotlb.h b/arch/x86/include/asm/swiotlb.h
@@ -28,8 +28,6 @@ static inline void pci_swiotlb_late_init(void)
 }
 #endif
 
-static inline void dma_mark_clean(void *addr, size_t size) {}
-
 extern void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 					dma_addr_t *dma_handle, gfp_t flags,
 					unsigned long attrs);
diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
@@ -29,4 +29,13 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
 	return addr + size - 1 <= *dev->dma_mask;
 }
 #endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */
+
+#ifdef CONFIG_ARCH_HAS_DMA_MARK_CLEAN
+void dma_mark_clean(void *addr, size_t size);
+#else
+static inline void dma_mark_clean(void *addr, size_t size)
+{
+}
+#endif /* CONFIG_ARCH_HAS_DMA_MARK_CLEAN */
+
 #endif /* _LINUX_DMA_DIRECT_H */

Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,6 @@ static inline bool is_device_dma_coherent(struct device *dev)`
`109`	`109`	`return dev->archdata.dma_coherent;`
`110`	`110`	`}`
`111`	`111`
`112`		`-static inline void dma_mark_clean(void *addr, size_t size) { }`
`113`		`-`
`114`	`112`	`/**`
`115`	`113`	`* arm_dma_alloc - allocate consistent memory for DMA`
`116`	`114`	`* @dev: valid struct device pointer, or NULL for ISA and EISA-like devices`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,5 @@ static inline bool is_device_dma_coherent(struct device *dev)`
`50`	`50`	`return dev->archdata.dma_coherent;`
`51`	`51`	`}`
`52`	`52`
`53`		`-static inline void dma_mark_clean(void *addr, size_t size)`
`54`		`-{`
`55`		`-}`
`56`		`-`
`57`	`53`	`#endif /* __KERNEL__ */`
`58`	`54`	`#endif /* __ASM_DMA_MAPPING_H */`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ static inline const struct dma_map_ops get_arch_dma_ops(struct bus_type bus)`
`17`	`17`	`return mips_dma_map_ops;`
`18`	`18`	`}`
`19`	`19`
`20`		`-static inline void dma_mark_clean(void *addr, size_t size) {}`
`21`		`-`
`22`	`20`	`#define arch_setup_dma_ops arch_setup_dma_ops`
`23`	`21`	`static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base,`
`24`	`22`	`u64 size, const struct iommu_ops *iommu,`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,6 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off)`
`44`	`44`	`dev->archdata.dma_offset = off;`
`45`	`45`	`}`
`46`	`46`
`47`		`-static inline void dma_mark_clean(void *addr, size_t size) {}`
`48`		`-`
`49`	`47`	`#define HAVE_ARCH_DMA_SET_MASK 1`
`50`	`48`	`int dma_set_mask(struct device *dev, u64 mask);`
`51`	`49`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,5 @@ static inline const struct dma_map_ops get_arch_dma_ops(struct bus_type bus)`
`25`	`25`	`return &swiotlb_dma_map_ops;`
`26`	`26`	`}`
`27`	`27`
`28`		`-static inline void dma_mark_clean(void *addr, size_t size) {}`
`29`		`-`
`30`	`28`	`#endif /* __KERNEL__ */`
`31`	`29`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ static inline void pci_swiotlb_late_init(void)`
`28`	`28`	`}`
`29`	`29`	`#endif`
`30`	`30`
`31`		`-static inline void dma_mark_clean(void *addr, size_t size) {}`
`32`		`-`
`33`	`31`	`extern void x86_swiotlb_alloc_coherent(struct device hwdev, size_t size,`
`34`	`32`	`dma_addr_t *dma_handle, gfp_t flags,`
`35`	`33`	`unsigned long attrs);`