KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix kmap_coherent use on 2.6.25 kernels

Browse source 
SVN-Revision: 11191
This commit is contained in:
Peter Denison 2008-05-18 21:31:41 +00:00
parent 3b7d3cf074
commit a9a321d21c
1 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch
View file

@ -1,7 +1,7 @@
Index: linux-2.6.25/arch/mips/mm/init.c Index: linux-2.6.25.1/arch/mips/mm/init.c
=================================================================== ===================================================================
--- linux-2.6.25.orig/arch/mips/mm/init.c 2008-04-26 21:56:21.000000000 +0100 --- linux-2.6.25.1.orig/arch/mips/mm/init.c 2008-05-18 11:32:33.000000000 +0100
+++ linux-2.6.25/arch/mips/mm/init.c 2008-04-26 22:07:48.000000000 +0100 +++ linux-2.6.25.1/arch/mips/mm/init.c 2008-05-18 21:05:57.000000000 +0100
@@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to, @@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to,
void *vfrom, *vto; void *vfrom, *vto;
@ -29,10 +29,10 @@ Index: linux-2.6.25/arch/mips/mm/init.c
page_mapped(page) && !Page_dcache_dirty(page)) { page_mapped(page) && !Page_dcache_dirty(page)) {
void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
memcpy(dst, vfrom, len); memcpy(dst, vfrom, len);
Index: linux-2.6.25/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h Index: linux-2.6.25.1/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.25/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h 2008-04-26 21:57:15.000000000 +0100 +++ linux-2.6.25.1/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h 2008-05-18 11:32:40.000000000 +0100
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+/* +/*
+ * This file is subject to the terms and conditions of the GNU General Public + * This file is subject to the terms and conditions of the GNU General Public
@ -47,10 +47,10 @@ Index: linux-2.6.25/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h
+#define cpu_use_kmap_coherent 0 +#define cpu_use_kmap_coherent 0
+ +
+#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */ +#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
Index: linux-2.6.25/include/asm-mips/cpu-features.h Index: linux-2.6.25.1/include/asm-mips/cpu-features.h
=================================================================== ===================================================================
--- linux-2.6.25.orig/include/asm-mips/cpu-features.h 2008-04-26 21:56:21.000000000 +0100 --- linux-2.6.25.1.orig/include/asm-mips/cpu-features.h 2008-05-18 11:32:33.000000000 +0100
+++ linux-2.6.25/include/asm-mips/cpu-features.h 2008-04-26 21:57:15.000000000 +0100 +++ linux-2.6.25.1/include/asm-mips/cpu-features.h 2008-05-18 11:32:40.000000000 +0100
@@ -101,6 +101,9 @@ @@ -101,6 +101,9 @@
#ifndef cpu_has_pindexed_dcache #ifndef cpu_has_pindexed_dcache
#define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
@ -61,3 +61,25 @@ Index: linux-2.6.25/include/asm-mips/cpu-features.h
/* /*
* I-Cache snoops remote store. This only matters on SMP. Some multiprocessors * I-Cache snoops remote store. This only matters on SMP. Some multiprocessors
Index: linux-2.6.25.1/arch/mips/mm/c-r4k.c
===================================================================
--- linux-2.6.25.1.orig/arch/mips/mm/c-r4k.c 2008-05-18 21:06:36.000000000 +0100
+++ linux-2.6.25.1/arch/mips/mm/c-r4k.c 2008-05-18 21:09:28.000000000 +0100
@@ -484,7 +484,7 @@ static inline void local_r4k_flush_cache
* Use kmap_coherent or kmap_atomic to do flushes for
* another ASID than the current one.
*/
- if (cpu_has_dc_aliases)
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent)
vaddr = kmap_coherent(page, addr);
else
vaddr = kmap_atomic(page, KM_USER0);
@@ -505,7 +505,7 @@ static inline void local_r4k_flush_cache
}
if (vaddr) {
- if (cpu_has_dc_aliases)
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent)
kunmap_coherent();
else
kunmap_atomic(vaddr, KM_USER0);