diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-08-20 10:25:14 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-10-11 05:10:43 -0400 |
| commit | 475032564ed96c94c085e3e7a90e07d150a7cec9 (patch) | |
| tree | 36b66d585f6aef09205fb0ef525e781fa55f0b07 /arch/mips/include/asm | |
| parent | ee80f7c73dc1b1f0ba9f82079c9bd1c0d1aedef8 (diff) | |
MIPS: Hardwire detection of DSP ASE Rev 2 for systems, as required.
Most supported systems currently hardwire cpu_has_dsp to 0, so we also
can disable support for cpu_has_dsp2 resulting in a slightly smaller
kernel.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/asm')
19 files changed, 20 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h index 6ddae926bf7..ea4b66dccf6 100644 --- a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h | |||
| @@ -42,6 +42,8 @@ | |||
| 42 | #define cpu_has_mips64r1 0 | 42 | #define cpu_has_mips64r1 0 |
| 43 | #define cpu_has_mips64r2 0 | 43 | #define cpu_has_mips64r2 0 |
| 44 | 44 | ||
| 45 | #define cpu_has_dsp 0 | ||
| 46 | #define cpu_has_dsp2 0 | ||
| 45 | #define cpu_has_mipsmt 0 | 47 | #define cpu_has_mipsmt 0 |
| 46 | 48 | ||
| 47 | #define cpu_has_64bits 0 | 49 | #define cpu_has_64bits 0 |
diff --git a/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h b/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h index 3f741af37d4..09f45e6afad 100644 --- a/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #define cpu_has_mips64r1 0 | 37 | #define cpu_has_mips64r1 0 |
| 38 | #define cpu_has_mips64r2 0 | 38 | #define cpu_has_mips64r2 0 |
| 39 | #define cpu_has_dsp 0 | 39 | #define cpu_has_dsp 0 |
| 40 | #define cpu_has_dsp2 0 | ||
| 40 | #define cpu_has_mipsmt 0 | 41 | #define cpu_has_mipsmt 0 |
| 41 | #define cpu_has_userlocal 0 | 42 | #define cpu_has_userlocal 0 |
| 42 | #define cpu_has_nofpuex 0 | 43 | #define cpu_has_nofpuex 0 |
diff --git a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h index f453c01d067..e9c408e8ff4 100644 --- a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #define cpu_has_mips64r2 0 | 37 | #define cpu_has_mips64r2 0 |
| 38 | 38 | ||
| 39 | #define cpu_has_dsp 0 | 39 | #define cpu_has_dsp 0 |
| 40 | #define cpu_has_dsp2 0 | ||
| 40 | #define cpu_has_mipsmt 0 | 41 | #define cpu_has_mipsmt 0 |
| 41 | #define cpu_has_userlocal 0 | 42 | #define cpu_has_userlocal 0 |
| 42 | 43 | ||
diff --git a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h index 375ad0c815f..94ed063eec9 100644 --- a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | #define cpu_has_mips64r2 1 | 53 | #define cpu_has_mips64r2 1 |
| 54 | #define cpu_has_mips_r2_exec_hazard 0 | 54 | #define cpu_has_mips_r2_exec_hazard 0 |
| 55 | #define cpu_has_dsp 0 | 55 | #define cpu_has_dsp 0 |
| 56 | #define cpu_has_dsp2 0 | ||
| 56 | #define cpu_has_mipsmt 0 | 57 | #define cpu_has_mipsmt 0 |
| 57 | #define cpu_has_vint 0 | 58 | #define cpu_has_vint 0 |
| 58 | #define cpu_has_veic 0 | 59 | #define cpu_has_veic 0 |
diff --git a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h index b3314cf5319..babc8374e37 100644 --- a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #define cpu_has_ic_fills_f_dc 0 | 45 | #define cpu_has_ic_fills_f_dc 0 |
| 46 | #define cpu_icache_snoops_remote_store 0 | 46 | #define cpu_icache_snoops_remote_store 0 |
| 47 | #define cpu_has_dsp 0 | 47 | #define cpu_has_dsp 0 |
| 48 | #define cpu_has_dsp2 0 | ||
| 48 | #define cpu_has_mipsmt 0 | 49 | #define cpu_has_mipsmt 0 |
| 49 | #define cpu_has_userlocal 0 | 50 | #define cpu_has_userlocal 0 |
| 50 | 51 | ||
diff --git a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h index 9c8735158da..f4caacd2555 100644 --- a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #define cpu_has_ic_fills_f_dc 0 | 30 | #define cpu_has_ic_fills_f_dc 0 |
| 31 | 31 | ||
| 32 | #define cpu_has_dsp 0 | 32 | #define cpu_has_dsp 0 |
| 33 | #define cpu_has_dsp2 0 | ||
| 33 | #define cpu_has_mipsmt 0 | 34 | #define cpu_has_mipsmt 0 |
| 34 | #define cpu_has_userlocal 0 | 35 | #define cpu_has_userlocal 0 |
| 35 | 36 | ||
diff --git a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h index 7d3112b148d..1d2b6ff60d3 100644 --- a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #define cpu_has_dc_aliases 0 | 26 | #define cpu_has_dc_aliases 0 |
| 27 | #define cpu_has_ic_fills_f_dc 0 | 27 | #define cpu_has_ic_fills_f_dc 0 |
| 28 | #define cpu_has_dsp 0 | 28 | #define cpu_has_dsp 0 |
| 29 | #define cpu_has_dsp2 0 | ||
| 29 | #define cpu_icache_snoops_remote_store 1 | 30 | #define cpu_icache_snoops_remote_store 1 |
| 30 | #define cpu_has_mipsmt 0 | 31 | #define cpu_has_mipsmt 0 |
| 31 | #define cpu_has_userlocal 0 | 32 | #define cpu_has_userlocal 0 |
diff --git a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h index 9a53b326f84..50d344ca60a 100644 --- a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #define cpu_has_dc_aliases 0 /* see probe_pcache() */ | 27 | #define cpu_has_dc_aliases 0 /* see probe_pcache() */ |
| 28 | #define cpu_has_ic_fills_f_dc 0 | 28 | #define cpu_has_ic_fills_f_dc 0 |
| 29 | #define cpu_has_dsp 0 | 29 | #define cpu_has_dsp 0 |
| 30 | #define cpu_has_dsp2 0 | ||
| 30 | #define cpu_icache_snoops_remote_store 1 | 31 | #define cpu_icache_snoops_remote_store 1 |
| 31 | #define cpu_has_mipsmt 0 | 32 | #define cpu_has_mipsmt 0 |
| 32 | #define cpu_has_userlocal 0 | 33 | #define cpu_has_userlocal 0 |
diff --git a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h index 6782fccebe8..2e1ec6cfedd 100644 --- a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #define cpu_has_vtag_icache 0 | 37 | #define cpu_has_vtag_icache 0 |
| 38 | #define cpu_has_ic_fills_f_dc 0 | 38 | #define cpu_has_ic_fills_f_dc 0 |
| 39 | #define cpu_has_dsp 0 | 39 | #define cpu_has_dsp 0 |
| 40 | #define cpu_has_dsp2 0 | ||
| 40 | #define cpu_has_4k_cache 1 | 41 | #define cpu_has_4k_cache 1 |
| 41 | #define cpu_has_mipsmt 0 | 42 | #define cpu_has_mipsmt 0 |
| 42 | #define cpu_has_userlocal 0 | 43 | #define cpu_has_userlocal 0 |
diff --git a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h b/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h index d12e5c6477b..a225baaa215 100644 --- a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #define cpu_has_mips64r1 0 | 38 | #define cpu_has_mips64r1 0 |
| 39 | #define cpu_has_mips64r2 0 | 39 | #define cpu_has_mips64r2 0 |
| 40 | #define cpu_has_dsp 0 | 40 | #define cpu_has_dsp 0 |
| 41 | #define cpu_has_dsp2 0 | ||
| 41 | #define cpu_has_mipsmt 0 | 42 | #define cpu_has_mipsmt 0 |
| 42 | #define cpu_has_userlocal 0 | 43 | #define cpu_has_userlocal 0 |
| 43 | #define cpu_has_nofpuex 0 | 44 | #define cpu_has_nofpuex 0 |
diff --git a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h index 675bd8641d5..1a05d854e34 100644 --- a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #define cpu_has_dc_aliases (PAGE_SIZE < 0x4000) | 32 | #define cpu_has_dc_aliases (PAGE_SIZE < 0x4000) |
| 33 | #define cpu_has_divec 0 | 33 | #define cpu_has_divec 0 |
| 34 | #define cpu_has_dsp 0 | 34 | #define cpu_has_dsp 0 |
| 35 | #define cpu_has_dsp2 0 | ||
| 35 | #define cpu_has_ejtag 0 | 36 | #define cpu_has_ejtag 0 |
| 36 | #define cpu_has_fpu 1 | 37 | #define cpu_has_fpu 1 |
| 37 | #define cpu_has_ic_fills_f_dc 0 | 38 | #define cpu_has_ic_fills_f_dc 0 |
diff --git a/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h b/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h index 966db4be377..091deb1700e 100644 --- a/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #define cpu_has_vtag_icache 0 | 26 | #define cpu_has_vtag_icache 0 |
| 27 | #define cpu_has_ic_fills_f_dc 1 | 27 | #define cpu_has_ic_fills_f_dc 1 |
| 28 | #define cpu_has_dsp 0 | 28 | #define cpu_has_dsp 0 |
| 29 | #define cpu_has_dsp2 0 | ||
| 29 | #define cpu_has_mipsmt 0 | 30 | #define cpu_has_mipsmt 0 |
| 30 | #define cpu_icache_snoops_remote_store 1 | 31 | #define cpu_icache_snoops_remote_store 1 |
| 31 | 32 | ||
diff --git a/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h b/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h index f751e3ec56f..58c76ec32a1 100644 --- a/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #define cpu_has_mips64r1 0 | 45 | #define cpu_has_mips64r1 0 |
| 46 | #define cpu_has_mips64r2 0 | 46 | #define cpu_has_mips64r2 0 |
| 47 | #define cpu_has_dsp 0 | 47 | #define cpu_has_dsp 0 |
| 48 | #define cpu_has_dsp2 0 | ||
| 48 | #define cpu_has_mipsmt 0 | 49 | #define cpu_has_mipsmt 0 |
| 49 | #define cpu_has_userlocal 0 | 50 | #define cpu_has_userlocal 0 |
| 50 | #define cpu_has_nofpuex 0 | 51 | #define cpu_has_nofpuex 0 |
diff --git a/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h index c3e4d3a4c95..b15307597ee 100644 --- a/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h | |||
| @@ -60,6 +60,7 @@ | |||
| 60 | #define cpu_has_mips64r2 0 | 60 | #define cpu_has_mips64r2 0 |
| 61 | 61 | ||
| 62 | #define cpu_has_dsp 0 | 62 | #define cpu_has_dsp 0 |
| 63 | #define cpu_has_dsp2 0 | ||
| 63 | #define cpu_has_mipsmt 0 | 64 | #define cpu_has_mipsmt 0 |
| 64 | 65 | ||
| 65 | /* #define cpu_has_nofpuex ? */ | 66 | /* #define cpu_has_nofpuex ? */ |
diff --git a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h index ccf54336353..f095c529c48 100644 --- a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #define cpu_has_dc_aliases (PAGE_SIZE < 0x4000) | 30 | #define cpu_has_dc_aliases (PAGE_SIZE < 0x4000) |
| 31 | #define cpu_has_ic_fills_f_dc 0 | 31 | #define cpu_has_ic_fills_f_dc 0 |
| 32 | #define cpu_has_dsp 0 | 32 | #define cpu_has_dsp 0 |
| 33 | #define cpu_has_dsp2 0 | ||
| 33 | #define cpu_has_nofpuex 0 | 34 | #define cpu_has_nofpuex 0 |
| 34 | #define cpu_has_64bits 1 | 35 | #define cpu_has_64bits 1 |
| 35 | #define cpu_has_mipsmt 0 | 36 | #define cpu_has_mipsmt 0 |
diff --git a/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h b/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h index 1c1f92415b9..92927b62b5a 100644 --- a/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #define cpu_has_dc_aliases 0 | 26 | #define cpu_has_dc_aliases 0 |
| 27 | #define cpu_has_ic_fills_f_dc 0 | 27 | #define cpu_has_ic_fills_f_dc 0 |
| 28 | #define cpu_has_dsp 0 | 28 | #define cpu_has_dsp 0 |
| 29 | #define cpu_has_dsp2 0 | ||
| 29 | #define cpu_has_mipsmt 0 | 30 | #define cpu_has_mipsmt 0 |
| 30 | #define cpu_has_userlocal 0 | 31 | #define cpu_has_userlocal 0 |
| 31 | #define cpu_icache_snoops_remote_store 0 | 32 | #define cpu_icache_snoops_remote_store 0 |
diff --git a/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h index 275eaf92c74..7f5144c6ce2 100644 --- a/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #define cpu_has_vtag_icache 0 | 12 | #define cpu_has_vtag_icache 0 |
| 13 | #define cpu_has_ic_fills_f_dc 0 | 13 | #define cpu_has_ic_fills_f_dc 0 |
| 14 | #define cpu_has_dsp 0 | 14 | #define cpu_has_dsp 0 |
| 15 | #define cpu_has_dsp2 0 | ||
| 15 | #define cpu_has_mipsmt 0 | 16 | #define cpu_has_mipsmt 0 |
| 16 | #define cpu_has_userlocal 0 | 17 | #define cpu_has_userlocal 0 |
| 17 | 18 | ||
diff --git a/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h b/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h index 470e5e9e10d..56bdd329860 100644 --- a/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #define cpu_has_dc_aliases 0 | 26 | #define cpu_has_dc_aliases 0 |
| 27 | #define cpu_has_ic_fills_f_dc 0 | 27 | #define cpu_has_ic_fills_f_dc 0 |
| 28 | #define cpu_has_dsp 0 | 28 | #define cpu_has_dsp 0 |
| 29 | #define cpu_has_dsp2 0 | ||
| 29 | #define cpu_has_mipsmt 0 | 30 | #define cpu_has_mipsmt 0 |
| 30 | #define cpu_has_userlocal 0 | 31 | #define cpu_has_userlocal 0 |
| 31 | #define cpu_icache_snoops_remote_store 0 | 32 | #define cpu_icache_snoops_remote_store 0 |
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h b/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h index a80801b094b..016fa9446ba 100644 --- a/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h +++ b/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | #define cpu_has_mips16 1 | 11 | #define cpu_has_mips16 1 |
| 12 | #define cpu_has_dsp 1 | 12 | #define cpu_has_dsp 1 |
| 13 | /* #define cpu_has_dsp2 ??? - do runtime detection */ | ||
| 13 | #define cpu_has_mipsmt 1 | 14 | #define cpu_has_mipsmt 1 |
| 14 | #define cpu_has_fpu 0 | 15 | #define cpu_has_fpu 0 |
| 15 | 16 | ||