aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx-2.6
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-03-23 00:08:59 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-03-23 00:08:59 +0000
commit47b1d09ed4f87a1bc8f0d77d1ab49c3816717fa4 (patch)
treec53c1c21d5eeb4ccf45141b1c052aabe662d738f /target/linux/brcm47xx-2.6
parent2c6347fcbc88bc5220f4bdc4d7a17ea6d95c34ec (diff)
downloadupstream-47b1d09ed4f87a1bc8f0d77d1ab49c3816717fa4.tar.gz
upstream-47b1d09ed4f87a1bc8f0d77d1ab49c3816717fa4.tar.bz2
upstream-47b1d09ed4f87a1bc8f0d77d1ab49c3816717fa4.zip
add more stability fixes for brcm47xx-2.6 on bcm4704 (from #1485)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6642 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx-2.6')
-rw-r--r--target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch b/target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch
new file mode 100644
index 0000000000..b8847bd028
--- /dev/null
+++ b/target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch
@@ -0,0 +1,48 @@
+--- ./arch/mips/mm/init.c.orig 2007-03-22 08:08:34.000000000 -0600
++++ ./arch/mips/mm/init.c 2007-03-22 08:09:04.000000000 -0600
+@@ -207,7 +207,7 @@
+ struct page *page, unsigned long vaddr, void *dst, const void *src,
+ unsigned long len)
+ {
+- if (cpu_has_dc_aliases) {
++ if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
+ void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
+ memcpy(vto, src, len);
+ kunmap_coherent(page);
+@@ -223,7 +223,7 @@
+ struct page *page, unsigned long vaddr, void *dst, const void *src,
+ unsigned long len)
+ {
+- if (cpu_has_dc_aliases) {
++ if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
+ void *vfrom =
+ kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
+ memcpy(dst, vfrom, len);
+--- ./include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h.orig 2007-03-22 08:10:54.000000000 -0600
++++ ./include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-03-22 08:10:50.000000000 -0600
+@@ -0,0 +1,13 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
++ */
++#ifndef __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H
++#define __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H
++
++#define cpu_use_kmap_coherent 0
++
++#endif /* __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H */
+--- ./include/asm-mips/cpu-features.h.orig 2007-03-22 08:09:16.000000000 -0600
++++ ./include/asm-mips/cpu-features.h 2007-03-22 08:09:52.000000000 -0600
+@@ -98,6 +98,9 @@
+ #ifndef cpu_has_pindexed_dcache
+ #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
+ #endif
++#ifndef cpu_use_kmap_coherent
++#define cpu_use_kmap_coherent 1
++#endif
+
+ /*
+ * I-Cache snoops remote store. This only matters on SMP. Some multiprocessors