diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-12-01 16:36:38 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-12-01 16:36:38 +0000 |
| commit | ab5c1bd1dc3495eea1c828325cb15678db734c5b (patch) | |
| tree | 71427f2aa3ccc632f4ddf793cdba0324b050dc24 /target/linux/brcm47xx | |
| parent | 86b4d5ef68ca77ff6724ebb9bddd6b93239c87fc (diff) | |
brcm47xx: add cpu overwrites
bcm47xx misses cpu overwrites for the features of the CPUs used in
these SoCs.
Instead of manually checking, it is now known at compile time for some
options and the compiler is able to remove the checks and optimize the
code.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38974 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/111-MIPS-BCM47XX-add-cpu-overwrite.patch | 95 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/160-kmap_coherent.patch | 21 |
2 files changed, 102 insertions, 14 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/111-MIPS-BCM47XX-add-cpu-overwrite.patch b/target/linux/brcm47xx/patches-3.10/111-MIPS-BCM47XX-add-cpu-overwrite.patch new file mode 100644 index 0000000000..00e8217a97 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.10/111-MIPS-BCM47XX-add-cpu-overwrite.patch @@ -0,0 +1,95 @@ +From b27da7f1ee034d32e410faf5ab32fc96424a0c62 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Wed, 20 Nov 2013 22:16:43 +0100 +Subject: [PATCH 17/18] add overwrite + +--- + .../asm/mach-bcm47xx/cpu-feature-overrides.h | 82 ++++++++++++++++++++ + 1 file changed, 82 insertions(+) + create mode 100644 arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h + +--- /dev/null ++++ b/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h +@@ -0,0 +1,82 @@ ++#ifndef __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H ++#define __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H ++ ++#define cpu_has_tlb 1 ++#define cpu_has_4kex 1 ++#define cpu_has_3k_cache 0 ++#define cpu_has_4k_cache 1 ++#define cpu_has_tx39_cache 0 ++#define cpu_has_fpu 0 ++#define cpu_has_32fpr 0 ++#define cpu_has_counter 1 ++#if defined(CONFIG_BCM47XX_BCMA) && !defined(CONFIG_BCM47XX_SSB) ++#define cpu_has_watch 1 ++#elif defined(CONFIG_BCM47XX_SSB) && !defined(CONFIG_BCM47XX_BCMA) ++#define cpu_has_watch 0 ++#endif ++#define cpu_has_divec 1 ++#define cpu_has_vce 0 ++#define cpu_has_cache_cdex_p 0 ++#define cpu_has_cache_cdex_s 0 ++#define cpu_has_prefetch 1 ++#define cpu_has_mcheck 1 ++#define cpu_has_ejtag 1 ++#define cpu_has_llsc 1 ++ ++/* cpu_has_mips16 */ ++#define cpu_has_mdmx 0 ++#define cpu_has_mips3d 0 ++#define cpu_has_rixi 0 ++#define cpu_has_mmips 0 ++#define cpu_has_smartmips 0 ++#define cpu_has_vtag_icache 0 ++/* cpu_has_dc_aliases */ ++#define cpu_has_ic_fills_f_dc 0 ++#define cpu_has_pindexed_dcache 0 ++#define cpu_icache_snoops_remote_store 0 ++ ++#define cpu_has_mips_2 1 ++#define cpu_has_mips_3 0 ++#define cpu_has_mips32r1 1 ++#if defined(CONFIG_BCM47XX_BCMA) && !defined(CONFIG_BCM47XX_SSB) ++#define cpu_has_mips32r2 1 ++#elif defined(CONFIG_BCM47XX_SSB) && !defined(CONFIG_BCM47XX_BCMA) ++#define cpu_has_mips32r2 0 ++#endif ++#define cpu_has_mips64r1 0 ++#define cpu_has_mips64r2 0 ++ ++#if defined(CONFIG_BCM47XX_BCMA) && !defined(CONFIG_BCM47XX_SSB) ++#define cpu_has_dsp 1 ++#define cpu_has_dsp2 1 ++#elif defined(CONFIG_BCM47XX_SSB) && !defined(CONFIG_BCM47XX_BCMA) ++#define cpu_has_dsp 0 ++#define cpu_has_dsp2 0 ++#endif ++#define cpu_has_mipsmt 0 ++/* cpu_has_userlocal */ ++ ++#define cpu_has_nofpuex 0 ++#define cpu_has_64bits 0 ++#define cpu_has_64bit_zero_reg 0 ++#if defined(CONFIG_BCM47XX_BCMA) && !defined(CONFIG_BCM47XX_SSB) ++#define cpu_has_vint 1 ++#elif defined(CONFIG_BCM47XX_SSB) && !defined(CONFIG_BCM47XX_BCMA) ++#define cpu_has_vint 0 ++#endif ++#define cpu_has_veic 0 ++#define cpu_has_inclusive_pcaches 0 ++ ++#if defined(CONFIG_BCM47XX_BCMA) && !defined(CONFIG_BCM47XX_SSB) ++#define cpu_dcache_line_size() 32 ++#define cpu_icache_line_size() 32 ++#define cpu_has_perf_cntr_intr_bit 1 ++#elif defined(CONFIG_BCM47XX_SSB) && !defined(CONFIG_BCM47XX_BCMA) ++#define cpu_dcache_line_size() 16 ++#define cpu_icache_line_size() 16 ++#define cpu_has_perf_cntr_intr_bit 0 ++#endif ++#define cpu_scache_line_size() 0 ++#define cpu_has_vz 0 ++ ++#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */ diff --git a/target/linux/brcm47xx/patches-3.10/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-3.10/160-kmap_coherent.patch index 078bc0e2e1..3c9f550636 100644 --- a/target/linux/brcm47xx/patches-3.10/160-kmap_coherent.patch +++ b/target/linux/brcm47xx/patches-3.10/160-kmap_coherent.patch @@ -10,22 +10,15 @@ /* * I-Cache snoops remote store. This only matters on SMP. Some multiprocessors ---- /dev/null +--- a/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h -@@ -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_BCM47XX_CPU_FEATURE_OVERRIDES_H -+#define __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H -+ -+#define cpu_use_kmap_coherent 0 +@@ -79,4 +79,6 @@ + #define cpu_scache_line_size() 0 + #define cpu_has_vz 0 + ++#define cpu_use_kmap_coherent 0 + -+#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */ + #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */ --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c @@ -509,7 +509,7 @@ static inline void local_r4k_flush_cache |