diff options
| author | John Crispin <blogic@openwrt.org> | 2015-03-21 21:47:03 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-03-21 21:47:03 +0000 |
| commit | d4a4c0aefc7089ee345ea171a9b2ef28a6254d7d (patch) | |
| tree | 733704ed5944337872d5ba5c1c37dfbbd1cdbcb6 /target/linux/oxnas/patches-4.0/010-arm_introduce-dma-fiq-irq-broadcast.patch | |
| parent | ca37f8bd1100a165a3f81865710f40c8c60d4275 (diff) | |
| download | master-187ad058-d4a4c0aefc7089ee345ea171a9b2ef28a6254d7d.tar.gz master-187ad058-d4a4c0aefc7089ee345ea171a9b2ef28a6254d7d.tar.bz2 master-187ad058-d4a4c0aefc7089ee345ea171a9b2ef28a6254d7d.zip | |
oxnas: add support for kernel 4.0
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44922 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas/patches-4.0/010-arm_introduce-dma-fiq-irq-broadcast.patch')
| -rw-r--r-- | target/linux/oxnas/patches-4.0/010-arm_introduce-dma-fiq-irq-broadcast.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/target/linux/oxnas/patches-4.0/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/oxnas/patches-4.0/010-arm_introduce-dma-fiq-irq-broadcast.patch new file mode 100644 index 0000000000..fb7547f96b --- /dev/null +++ b/target/linux/oxnas/patches-4.0/010-arm_introduce-dma-fiq-irq-broadcast.patch @@ -0,0 +1,62 @@ +Index: linux-3.18-rc4/arch/arm/include/asm/glue-cache.h +=================================================================== +--- linux-3.18-rc4.orig/arch/arm/include/asm/glue-cache.h ++++ linux-3.18-rc4/arch/arm/include/asm/glue-cache.h +@@ -156,11 +156,19 @@ static inline void nop_dma_unmap_area(co + #define __cpuc_flush_user_range __glue(_CACHE,_flush_user_cache_range) + #define __cpuc_coherent_kern_range __glue(_CACHE,_coherent_kern_range) + #define __cpuc_coherent_user_range __glue(_CACHE,_coherent_user_range) ++#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST + #define __cpuc_flush_dcache_area __glue(_CACHE,_flush_kern_dcache_area) + + #define dmac_map_area __glue(_CACHE,_dma_map_area) + #define dmac_unmap_area __glue(_CACHE,_dma_unmap_area) + #define dmac_flush_range __glue(_CACHE,_dma_flush_range) ++#else ++#define __cpuc_flush_dcache_area __glue(fiq,_flush_kern_dcache_area) ++ ++#define dmac_map_area __glue(fiq,_dma_map_area) ++#define dmac_unmap_area __glue(fiq,_dma_unmap_area) ++#define dmac_flush_range __glue(fiq,_dma_flush_range) ++#endif /* CONFIG_DMA_CACHE_FIQ_BROADCAST */ + #endif + + #endif +Index: linux-3.18-rc4/arch/arm/mm/Kconfig +=================================================================== +--- linux-3.18-rc4.orig/arch/arm/mm/Kconfig ++++ linux-3.18-rc4/arch/arm/mm/Kconfig +@@ -843,6 +843,17 @@ config DMA_CACHE_RWFO + in hardware, other workarounds are needed (e.g. cache + maintenance broadcasting in software via FIQ). + ++config DMA_CACHE_FIQ_BROADCAST ++ bool "Enable fiq broadcast DMA cache maintenance" ++ depends on CPU_V6K && SMP ++ select FIQ ++ help ++ The Snoop Control Unit on ARM11MPCore does not detect the ++ cache maintenance operations and the dma_{map,unmap}_area() ++ functions may leave stale cache entries on other CPUs. By ++ enabling this option, fiq broadcast in the ARMv6 ++ DMA cache maintenance functions is performed. ++ + config OUTER_CACHE + bool + +Index: linux-3.18-rc4/arch/arm/mm/flush.c +=================================================================== +--- linux-3.18-rc4.orig/arch/arm/mm/flush.c ++++ linux-3.18-rc4/arch/arm/mm/flush.c +@@ -314,7 +314,11 @@ void flush_dcache_page(struct page *page + + mapping = page_mapping(page); + ++#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST + if (!cache_ops_need_broadcast() && ++#else ++ if ( ++#endif + mapping && !page_mapped(page)) + clear_bit(PG_dcache_clean, &page->flags); + else { |