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>

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 6ddae926bf79717b95a709d71c40a99a888a310a..ea4b66dccf6e85206cd42c50e4a1c0a7669f45a5 100644 (file)
--- 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 @@
 #define cpu_has_mips64r1       0
 #define cpu_has_mips64r2       0
 
+#define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_mipsmt         0
 
 #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 3f741af37d47cf8153aabe49a8e435e7f7fa4257..09f45e6afade2d5c2d86ab2fed53c928ceed32d3 100644 (file)
--- 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 @@
 #define cpu_has_mips64r1               0
 #define cpu_has_mips64r2               0
 #define cpu_has_dsp                    0
+#define cpu_has_dsp2                   0
 #define cpu_has_mipsmt                 0
 #define cpu_has_userlocal              0
 #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 f453c01d06723885b1875457c4a8991628a5549e..e9c408e8ff4c36035d3cc45a098c30648a00184b 100644 (file)
--- 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 @@
 #define cpu_has_mips64r2               0
 
 #define cpu_has_dsp                    0
+#define cpu_has_dsp2                   0
 #define cpu_has_mipsmt                 0
 #define cpu_has_userlocal              0
 

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 375ad0c815fe75b83b7b4c18dffe667a97563376..94ed063eec9241f391db426d74e22e2464b98ef5 100644 (file)
--- 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 @@
 #define cpu_has_mips64r2       1
 #define cpu_has_mips_r2_exec_hazard 0
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_mipsmt         0
 #define cpu_has_vint           0
 #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 b3314cf53194d6472062436a3ade9eea447896bb..babc8374e3786d9aed1a7715cb7e8adc35c8e109 100644 (file)
--- 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 @@
 #define cpu_has_ic_fills_f_dc  0
 #define cpu_icache_snoops_remote_store 0
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_mipsmt         0
 #define cpu_has_userlocal      0
 

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 9c8735158da1b011875df9af9a02f9e5e9648b4d..f4caacd255528ef1a0bc86f0cf2a522a9243e470 100644 (file)
--- 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 @@
 #define cpu_has_ic_fills_f_dc  0
 
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_mipsmt         0
 #define cpu_has_userlocal      0
 

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 7d3112b148d905f999049f596c3caf6eeb84ab50..1d2b6ff60d339ccc8ebdd80b7e374f201a2b6e4f 100644 (file)
--- 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 @@
 #define cpu_has_dc_aliases     0
 #define cpu_has_ic_fills_f_dc  0
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_icache_snoops_remote_store 1
 #define cpu_has_mipsmt         0
 #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 9a53b326f84816a0a416086a8930059b3a368690..50d344ca60a84ff460f2a1ca902a778884c2761c 100644 (file)
--- 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 @@
 #define cpu_has_dc_aliases     0 /* see probe_pcache() */
 #define cpu_has_ic_fills_f_dc  0
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_icache_snoops_remote_store  1
 #define cpu_has_mipsmt         0
 #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 6782fccebe8da2f473f2e3176f46ec61497771d8..2e1ec6cfedd5d939cbe328da3fb14571773771f0 100644 (file)
--- 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 @@
 #define cpu_has_vtag_icache    0
 #define cpu_has_ic_fills_f_dc  0
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_4k_cache       1
 #define cpu_has_mipsmt         0
 #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 d12e5c6477b943fe46cd564539375094836079f1..a225baaa215d2adec3c96ff89a228ae9e2d5fba4 100644 (file)
--- 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 @@
 #define cpu_has_mips64r1       0
 #define cpu_has_mips64r2       0
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_mipsmt         0
 #define cpu_has_userlocal      0
 #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 675bd8641d5a1efc0df38c258d7343c5eddcdb1e..1a05d854e34c05abfa2ab52c0e4206ce912a7533 100644 (file)
--- 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 @@
 #define cpu_has_dc_aliases     (PAGE_SIZE < 0x4000)
 #define cpu_has_divec          0
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_ejtag          0
 #define cpu_has_fpu            1
 #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 966db4be377ca700d94795f10d3b345f8d250621..091deb1700e5ed013ffcbbbc5af4c742537c4919 100644 (file)
--- 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 @@
 #define cpu_has_vtag_icache    0
 #define cpu_has_ic_fills_f_dc  1
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_mipsmt         0
 #define cpu_icache_snoops_remote_store 1
 

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 f751e3ec56fb4fe3bde1e433f3d67b825138207b..58c76ec32a1938fdd3a2850fdac4c772d223a19e 100644 (file)
--- 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 @@
 #define cpu_has_mips64r1               0
 #define cpu_has_mips64r2               0
 #define cpu_has_dsp                    0
+#define cpu_has_dsp2                   0
 #define cpu_has_mipsmt                 0
 #define cpu_has_userlocal              0
 #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 c3e4d3a4c95da84229dad24ee91e67d43a3eb549..b15307597ee392c0cf57225e70655e33c97f1fdc 100644 (file)
--- 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 @@
 #define cpu_has_mips64r2               0
 
 #define cpu_has_dsp                    0
+#define cpu_has_dsp2                   0
 #define cpu_has_mipsmt                 0
 
 /* #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 ccf5433635376aa1197be4b769516c940736e083..f095c529c48c1f7150d523744c17fe2a2abf3a7a 100644 (file)
--- 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 @@
 #define cpu_has_dc_aliases     (PAGE_SIZE < 0x4000)
 #define cpu_has_ic_fills_f_dc  0
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_nofpuex                0
 #define cpu_has_64bits         1
 #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 1c1f92415b9a28857754c5538c2efe6b41c9ac77..92927b62b5a0709a92394c0dc63028c343d235b8 100644 (file)
--- 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 @@
 #define cpu_has_dc_aliases     0
 #define cpu_has_ic_fills_f_dc  0
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_mipsmt         0
 #define cpu_has_userlocal      0
 #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 275eaf92c748f2567111c758a2755835c918bc08..7f5144c6ce2da590a0ffc88ce50d5350077a8628 100644 (file)
--- 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 @@
 #define cpu_has_vtag_icache    0
 #define cpu_has_ic_fills_f_dc  0
 #define cpu_has_dsp    0
+#define cpu_has_dsp2           0
 #define cpu_has_mipsmt 0
 #define cpu_has_userlocal      0
 

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 470e5e9e10d659b830ea934f52941bee527d63b2..56bdd3298600d878bd60b3d7fdf6b8110bd9c2fe 100644 (file)
--- 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 @@
 #define cpu_has_dc_aliases     0
 #define cpu_has_ic_fills_f_dc  0
 #define cpu_has_dsp            0
+#define cpu_has_dsp2           0
 #define cpu_has_mipsmt         0
 #define cpu_has_userlocal      0
 #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 a80801b094bd76aa735ef1f0fec126954b341f60..016fa9446ba96c6a8bac592812690ac1f66351ff 100644 (file)
--- 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 @@
 
 #define cpu_has_mips16         1
 #define cpu_has_dsp            1
+/* #define cpu_has_dsp2                ??? - do runtime detection */
 #define cpu_has_mipsmt         1
 #define cpu_has_fpu            0