MIPS: loongson: remove loongson-3 handling from dma-coherence.h

Christoph Hellwig · paulburton · commit d7e64bf9499b · 2018-06-24T09:26:04.000-07:00
Loongson3 is dma coherent and uses swiotlb, so it will never used any of these helpers. Signed-off-by: Christoph Hellwig <hch@lst.de> Patchwork: https://patchwork.linux-mips.org/patch/19541/ Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: David Daney <david.daney@cavium.com> Cc: Kevin Cernekee <cernekee@gmail.com> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> Cc: Tom Bogendoerfer <tsbogend@alpha.franken.de> Cc: Huacai Chen <chenhc@lemote.com> Cc: iommu@lists.linux-foundation.org Cc: linux-mips@linux-mips.org
diff --git a/arch/mips/include/asm/mach-loongson64/dma-coherence.h b/arch/mips/include/asm/mach-loongson64/dma-coherence.h
@@ -20,29 +20,19 @@ struct device;
 static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr,
 					  size_t size)
 {
-#ifdef CONFIG_CPU_LOONGSON3
-	return __phys_to_dma(dev, virt_to_phys(addr));
-#else
 	return virt_to_phys(addr) | 0x80000000;
-#endif
 }
 
 static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
 					       struct page *page)
 {
-#ifdef CONFIG_CPU_LOONGSON3
-	return __phys_to_dma(dev, page_to_phys(page));
-#else
 	return page_to_phys(page) | 0x80000000;
-#endif
 }
 
 static inline unsigned long plat_dma_addr_to_phys(struct device *dev,
 	dma_addr_t dma_addr)
 {
-#if defined(CONFIG_CPU_LOONGSON3) && defined(CONFIG_64BIT)
-	return __dma_to_phys(dev, dma_addr);
-#elif defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT)
+#if defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT)
 	return (dma_addr > 0x8fffffff) ? dma_addr : (dma_addr & 0x0fffffff);
 #else
 	return dma_addr & 0x7fffffff;
@@ -69,11 +59,7 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)
 
 static inline int plat_device_is_coherent(struct device *dev)
 {
-#ifdef CONFIG_DMA_NONCOHERENT
 	return 0;
-#else
-	return 1;
-#endif /* CONFIG_DMA_NONCOHERENT */
 }
 
 static inline void plat_post_dma_flush(struct device *dev)

Original file line number	Diff line number	Diff line change
`@@ -20,29 +20,19 @@ struct device;`
`20`	`20`	`static inline dma_addr_t plat_map_dma_mem(struct device dev, void addr,`
`21`	`21`	`size_t size)`
`22`	`22`	`{`
`23`		`-#ifdef CONFIG_CPU_LOONGSON3`
`24`		`- return __phys_to_dma(dev, virt_to_phys(addr));`
`25`		`-#else`
`26`	`23`	`return virt_to_phys(addr) \| 0x80000000;`
`27`		`-#endif`
`28`	`24`	`}`
`29`	`25`
`30`	`26`	`static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,`
`31`	`27`	`struct page *page)`
`32`	`28`	`{`
`33`		`-#ifdef CONFIG_CPU_LOONGSON3`
`34`		`- return __phys_to_dma(dev, page_to_phys(page));`
`35`		`-#else`
`36`	`29`	`return page_to_phys(page) \| 0x80000000;`
`37`		`-#endif`
`38`	`30`	`}`
`39`	`31`
`40`	`32`	`static inline unsigned long plat_dma_addr_to_phys(struct device *dev,`
`41`	`33`	`dma_addr_t dma_addr)`
`42`	`34`	`{`
`43`		`-#if defined(CONFIG_CPU_LOONGSON3) && defined(CONFIG_64BIT)`
`44`		`- return __dma_to_phys(dev, dma_addr);`
`45`		`-#elif defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT)`
	`35`	`+#if defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT)`
`46`	`36`	`return (dma_addr > 0x8fffffff) ? dma_addr : (dma_addr & 0x0fffffff);`
`47`	`37`	`#else`
`48`	`38`	`return dma_addr & 0x7fffffff;`
`@@ -69,11 +59,7 @@ static inline int plat_dma_supported(struct device *dev, u64 mask)`
`69`	`59`
`70`	`60`	`static inline int plat_device_is_coherent(struct device *dev)`
`71`	`61`	`{`
`72`		`-#ifdef CONFIG_DMA_NONCOHERENT`
`73`	`62`	`return 0;`
`74`		`-#else`
`75`		`- return 1;`
`76`		`-#endif /* CONFIG_DMA_NONCOHERENT */`
`77`	`63`	`}`
`78`	`64`
`79`	`65`	`static inline void plat_post_dma_flush(struct device *dev)`