From: Sam Ravnborg Date: Sat, 26 May 2012 04:43:29 +0000 (+0000) Subject: sparc32: support leon + sun in dma_make_coherent() X-Git-Tag: upstream/snapshot3+hdmi~7328^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95835335a3c187f418e86b453e1716cb5aad17be;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git sparc32: support leon + sun in dma_make_coherent() No need for two implementations - we check the cpu model. Signed-off-by: Sam Ravnborg Cc: Daniel Hellstrom Cc: Konrad Eisele --- diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 8bc4db0..f00945b 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -55,17 +55,13 @@ const struct sparc32_dma_ops *sparc32_dma_ops; /* This function must make sure that caches and memory are coherent after DMA * On LEON systems without cache snooping it flushes the entire D-CACHE. */ -#ifndef CONFIG_SPARC_LEON static inline void dma_make_coherent(unsigned long pa, unsigned long len) { + if (sparc_cpu_model == sparc_leon) { + if (!sparc_leon3_snooping_enabled()) + leon_flush_dcache_all(); + } } -#else -static inline void dma_make_coherent(unsigned long pa, unsigned long len) -{ - if (!sparc_leon3_snooping_enabled()) - leon_flush_dcache_all(); -} -#endif static void __iomem *_sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz); static void __iomem *_sparc_alloc_io(unsigned int busno, unsigned long phys,