diff options
author | John Crispin <blogic@openwrt.org> | 2015-03-16 07:40:54 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2015-03-16 07:40:54 +0000 |
commit | 3642d7841a03aab93c83f2a6af2e316e8c558b35 (patch) | |
tree | 436d4df87728bc89d6bbd93b453be815c34bd6b3 /target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch | |
parent | 7b9c4ca2bf12eb7b6e880671da5b31efe95eb169 (diff) | |
download | upstream-3642d7841a03aab93c83f2a6af2e316e8c558b35.tar.gz upstream-3642d7841a03aab93c83f2a6af2e316e8c558b35.tar.bz2 upstream-3642d7841a03aab93c83f2a6af2e316e8c558b35.zip |
oxnas: drop 3.14 support
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44819 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch')
-rw-r--r-- | target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch deleted file mode 100644 index 25a28e89be..0000000000 --- a/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/arch/arm/include/asm/glue-cache.h -+++ b/arch/arm/include/asm/glue-cache.h -@@ -156,11 +156,19 @@ extern 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 ---- a/arch/arm/mm/Kconfig -+++ b/arch/arm/mm/Kconfig -@@ -844,6 +844,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 - ---- a/arch/arm/mm/flush.c -+++ b/arch/arm/mm/flush.c -@@ -291,7 +291,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 { |