aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-27 22:01:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-27 22:01:16 +0000
commitd2e88fa30c127723bf2827a1caf738c2cf0460f6 (patch)
tree77bf588c515539015d8ae26f5be771ee6e682ac5 /target
parent6a0c74d7b9640f237a2e338f4284aa87871c7b6c (diff)
downloadupstream-d2e88fa30c127723bf2827a1caf738c2cf0460f6.tar.gz
upstream-d2e88fa30c127723bf2827a1caf738c2cf0460f6.tar.bz2
upstream-d2e88fa30c127723bf2827a1caf738c2cf0460f6.zip
brcm47xx: fix parts of the cache code that were not covered by the kmap_coherent patch yet. this seems to fix the crazy segfaults we were getting...
SVN-Revision: 7745
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch47
1 files changed, 39 insertions, 8 deletions
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch b/target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch
index 67068081d1..0b13f3b58c 100644
--- a/target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch
+++ b/target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.22-rc4/arch/mips/mm/init.c
+Index: linux-2.6.22-rc5/arch/mips/mm/init.c
===================================================================
---- linux-2.6.22-rc4.orig/arch/mips/mm/init.c 2007-06-10 21:32:12.000000000 +0100
-+++ linux-2.6.22-rc4/arch/mips/mm/init.c 2007-06-10 21:33:21.000000000 +0100
+--- linux-2.6.22-rc5.orig/arch/mips/mm/init.c 2007-06-27 23:40:06.406545264 +0200
++++ linux-2.6.22-rc5/arch/mips/mm/init.c 2007-06-27 23:40:08.920163136 +0200
@@ -207,7 +207,7 @@
void *vfrom, *vto;
@@ -29,10 +29,10 @@ Index: linux-2.6.22-rc4/arch/mips/mm/init.c
void *vfrom =
kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
memcpy(dst, vfrom, len);
-Index: linux-2.6.22-rc4/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h
+Index: linux-2.6.22-rc5/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-rc4/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-06-10 21:33:21.000000000 +0100
++++ linux-2.6.22-rc5/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-06-27 23:40:08.921162984 +0200
@@ -0,0 +1,13 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -47,10 +47,10 @@ Index: linux-2.6.22-rc4/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h
+#define cpu_use_kmap_coherent 0
+
+#endif /* __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H */
-Index: linux-2.6.22-rc4/include/asm-mips/cpu-features.h
+Index: linux-2.6.22-rc5/include/asm-mips/cpu-features.h
===================================================================
---- linux-2.6.22-rc4.orig/include/asm-mips/cpu-features.h 2007-06-10 21:32:12.000000000 +0100
-+++ linux-2.6.22-rc4/include/asm-mips/cpu-features.h 2007-06-10 21:33:21.000000000 +0100
+--- linux-2.6.22-rc5.orig/include/asm-mips/cpu-features.h 2007-06-27 23:40:06.419543288 +0200
++++ linux-2.6.22-rc5/include/asm-mips/cpu-features.h 2007-06-27 23:40:08.921162984 +0200
@@ -101,6 +101,9 @@
#ifndef cpu_has_pindexed_dcache
#define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
@@ -61,3 +61,34 @@ Index: linux-2.6.22-rc4/include/asm-mips/cpu-features.h
/*
* I-Cache snoops remote store. This only matters on SMP. Some multiprocessors
+Index: linux-2.6.22-rc5/arch/mips/mm/c-r4k.c
+===================================================================
+--- linux-2.6.22-rc5.orig/arch/mips/mm/c-r4k.c 2007-06-27 23:40:45.883543848 +0200
++++ linux-2.6.22-rc5/arch/mips/mm/c-r4k.c 2007-06-27 23:42:06.682260576 +0200
+@@ -339,7 +339,7 @@
+
+ static void r4k_flush_cache_all(void)
+ {
+- if (!cpu_has_dc_aliases)
++ if (!cpu_has_dc_aliases || !cpu_use_kmap_coherent)
+ return;
+
+ r4k_on_each_cpu(local_r4k_flush_cache_all, NULL, 1, 1);
+@@ -380,7 +380,7 @@
+ static void r4k_flush_cache_range(struct vm_area_struct *vma,
+ unsigned long start, unsigned long end)
+ {
+- if (!cpu_has_dc_aliases)
++ if (!cpu_has_dc_aliases || !cpu_use_kmap_coherent)
+ return;
+
+ r4k_on_each_cpu(local_r4k_flush_cache_range, vma, 1, 1);
+@@ -412,7 +412,7 @@
+
+ static void r4k_flush_cache_mm(struct mm_struct *mm)
+ {
+- if (!cpu_has_dc_aliases)
++ if (!cpu_has_dc_aliases || !cpu_use_kmap_coherent)
+ return;
+
+ r4k_on_each_cpu(local_r4k_flush_cache_mm, mm, 1, 1);