diff options
author | Maciej W. Rozycki <macro@imgtec.com> | 2017-05-23 08:40:23 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2017-07-11 08:13:06 -0400 |
commit | 65ae8d2621a9fb20b53348311984ea79fee42a55 (patch) | |
tree | e42f2bf9b8b4b18c8a4356c1002c37f794bcfa77 | |
parent | 92ecd19a7e1dc1c928707835c28cb65f0740be2d (diff) |
MIPS16e2: Provide feature overrides for non-MIPS16 systems
Hardcode the absence of the MIPS16e2 ASE for all the systems that do so
for the MIPS16 ASE already, providing for code to be optimized away.
Signed-off-by: Maciej W. Rozycki <macro@imgtec.com>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/16097/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 files changed, 16 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h index ade0356df257..e6a8108cde4e 100644 --- a/arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h | |||
@@ -40,6 +40,7 @@ | |||
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | #define cpu_has_mips16 0 | 42 | #define cpu_has_mips16 0 |
43 | #define cpu_has_mips16e2 0 | ||
43 | #define cpu_has_mdmx 0 | 44 | #define cpu_has_mdmx 0 |
44 | #define cpu_has_mips3d 0 | 45 | #define cpu_has_mips3d 0 |
45 | #define cpu_has_smartmips 0 | 46 | #define cpu_has_smartmips 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 c5b6eef0efa7..bace5b9ae4df 100644 --- a/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h | |||
@@ -31,6 +31,7 @@ | |||
31 | #define cpu_has_ejtag 1 | 31 | #define cpu_has_ejtag 1 |
32 | #define cpu_has_llsc 1 | 32 | #define cpu_has_llsc 1 |
33 | #define cpu_has_mips16 0 | 33 | #define cpu_has_mips16 0 |
34 | #define cpu_has_mips16e2 0 | ||
34 | #define cpu_has_mdmx 0 | 35 | #define cpu_has_mdmx 0 |
35 | #define cpu_has_mips3d 0 | 36 | #define cpu_has_mips3d 0 |
36 | #define cpu_has_smartmips 0 | 37 | #define cpu_has_smartmips 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 bc1167dbd4e3..b56cf10b91d3 100644 --- a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #define cpu_has_ejtag 1 | 19 | #define cpu_has_ejtag 1 |
20 | #define cpu_has_llsc 1 | 20 | #define cpu_has_llsc 1 |
21 | #define cpu_has_mips16 0 | 21 | #define cpu_has_mips16 0 |
22 | #define cpu_has_mips16e2 0 | ||
22 | #define cpu_has_mdmx 0 | 23 | #define cpu_has_mdmx 0 |
23 | #define cpu_has_mips3d 0 | 24 | #define cpu_has_mips3d 0 |
24 | #define cpu_has_smartmips 0 | 25 | #define cpu_has_smartmips 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 30c5cd9fd973..291fe90aafa5 100644 --- a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h | |||
@@ -37,6 +37,7 @@ | |||
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #define cpu_has_mips16 0 | 39 | #define cpu_has_mips16 0 |
40 | #define cpu_has_mips16e2 0 | ||
40 | #define cpu_has_mdmx 0 | 41 | #define cpu_has_mdmx 0 |
41 | #define cpu_has_mips3d 0 | 42 | #define cpu_has_mips3d 0 |
42 | #define cpu_has_smartmips 0 | 43 | #define cpu_has_smartmips 0 |
diff --git a/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h b/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h index 21eae03d752a..2ec10237688c 100644 --- a/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h | |||
@@ -27,6 +27,7 @@ | |||
27 | #define cpu_has_mcheck 0 | 27 | #define cpu_has_mcheck 0 |
28 | #define cpu_has_ejtag 0 | 28 | #define cpu_has_ejtag 0 |
29 | #define cpu_has_mips16 0 | 29 | #define cpu_has_mips16 0 |
30 | #define cpu_has_mips16e2 0 | ||
30 | #define cpu_has_mdmx 0 | 31 | #define cpu_has_mdmx 0 |
31 | #define cpu_has_mips3d 0 | 32 | #define cpu_has_mips3d 0 |
32 | #define cpu_has_smartmips 0 | 33 | #define cpu_has_smartmips 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 9b19b72dba56..b80d5eafc9db 100644 --- a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #define cpu_has_32fpr 1 | 19 | #define cpu_has_32fpr 1 |
20 | #define cpu_has_counter 1 | 20 | #define cpu_has_counter 1 |
21 | #define cpu_has_mips16 0 | 21 | #define cpu_has_mips16 0 |
22 | #define cpu_has_mips16e2 0 | ||
22 | #define cpu_has_divec 0 | 23 | #define cpu_has_divec 0 |
23 | #define cpu_has_cache_cdex_p 1 | 24 | #define cpu_has_cache_cdex_p 1 |
24 | #define cpu_has_prefetch 0 | 25 | #define cpu_has_prefetch 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 7449794eade6..136d6d464e32 100644 --- a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h | |||
@@ -43,6 +43,7 @@ | |||
43 | #define cpu_has_ejtag 0 | 43 | #define cpu_has_ejtag 0 |
44 | #define cpu_has_llsc 1 | 44 | #define cpu_has_llsc 1 |
45 | #define cpu_has_mips16 0 | 45 | #define cpu_has_mips16 0 |
46 | #define cpu_has_mips16e2 0 | ||
46 | #define cpu_has_mdmx 0 | 47 | #define cpu_has_mdmx 0 |
47 | #define cpu_has_mips3d 0 | 48 | #define cpu_has_mips3d 0 |
48 | #define cpu_has_smartmips 0 | 49 | #define cpu_has_smartmips 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 4cec06d133db..ba8b4e30b3e2 100644 --- a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h | |||
@@ -16,6 +16,7 @@ | |||
16 | */ | 16 | */ |
17 | #define cpu_has_watch 1 | 17 | #define cpu_has_watch 1 |
18 | #define cpu_has_mips16 0 | 18 | #define cpu_has_mips16 0 |
19 | #define cpu_has_mips16e2 0 | ||
19 | #define cpu_has_divec 0 | 20 | #define cpu_has_divec 0 |
20 | #define cpu_has_vce 0 | 21 | #define cpu_has_vce 0 |
21 | #define cpu_has_cache_cdex_p 0 | 22 | #define cpu_has_cache_cdex_p 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 241409b78ff1..63b4c889094b 100644 --- a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h | |||
@@ -29,6 +29,7 @@ | |||
29 | #define cpu_has_32fpr 1 | 29 | #define cpu_has_32fpr 1 |
30 | #define cpu_has_counter 1 | 30 | #define cpu_has_counter 1 |
31 | #define cpu_has_mips16 0 | 31 | #define cpu_has_mips16 0 |
32 | #define cpu_has_mips16e2 0 | ||
32 | #define cpu_has_vce 0 | 33 | #define cpu_has_vce 0 |
33 | #define cpu_has_cache_cdex_s 0 | 34 | #define cpu_has_cache_cdex_s 0 |
34 | #define cpu_has_mcheck 0 | 35 | #define cpu_has_mcheck 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 0933f94a1e69..7c5e576f9d96 100644 --- a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h | |||
@@ -23,6 +23,7 @@ | |||
23 | #define cpu_has_ejtag 1 | 23 | #define cpu_has_ejtag 1 |
24 | #define cpu_has_llsc 1 | 24 | #define cpu_has_llsc 1 |
25 | #define cpu_has_mips16 0 | 25 | #define cpu_has_mips16 0 |
26 | #define cpu_has_mips16e2 0 | ||
26 | #define cpu_has_mdmx 0 | 27 | #define cpu_has_mdmx 0 |
27 | #define cpu_has_mips3d 0 | 28 | #define cpu_has_mips3d 0 |
28 | #define cpu_has_smartmips 0 | 29 | #define cpu_has_smartmips 0 |
diff --git a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h index 89328a3d44d8..581915ce231c 100644 --- a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h | |||
@@ -32,6 +32,7 @@ | |||
32 | #define cpu_has_mcheck 0 | 32 | #define cpu_has_mcheck 0 |
33 | #define cpu_has_mdmx 0 | 33 | #define cpu_has_mdmx 0 |
34 | #define cpu_has_mips16 0 | 34 | #define cpu_has_mips16 0 |
35 | #define cpu_has_mips16e2 0 | ||
35 | #define cpu_has_mips3d 0 | 36 | #define cpu_has_mips3d 0 |
36 | #define cpu_has_mipsmt 0 | 37 | #define cpu_has_mipsmt 0 |
37 | #define cpu_has_smartmips 0 | 38 | #define cpu_has_smartmips 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 091deb1700e5..0c29ff820bb9 100644 --- a/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h | |||
@@ -13,6 +13,7 @@ | |||
13 | #define cpu_has_4k_cache 1 | 13 | #define cpu_has_4k_cache 1 |
14 | #define cpu_has_watch 1 | 14 | #define cpu_has_watch 1 |
15 | #define cpu_has_mips16 0 | 15 | #define cpu_has_mips16 0 |
16 | #define cpu_has_mips16e2 0 | ||
16 | #define cpu_has_counter 1 | 17 | #define cpu_has_counter 1 |
17 | #define cpu_has_divec 1 | 18 | #define cpu_has_divec 1 |
18 | #define cpu_has_vce 0 | 19 | #define cpu_has_vce 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 b15307597ee3..6a1087ee8c6e 100644 --- a/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h | |||
@@ -48,6 +48,7 @@ | |||
48 | #define cpu_has_llsc 1 | 48 | #define cpu_has_llsc 1 |
49 | 49 | ||
50 | #define cpu_has_mips16 0 | 50 | #define cpu_has_mips16 0 |
51 | #define cpu_has_mips16e2 0 | ||
51 | #define cpu_has_mdmx 0 | 52 | #define cpu_has_mdmx 0 |
52 | #define cpu_has_mips3d 0 | 53 | #define cpu_has_mips3d 0 |
53 | #define cpu_has_smartmips 0 | 54 | #define cpu_has_smartmips 0 |
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 d38be668e338..e1e182300fea 100644 --- a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h | |||
@@ -17,6 +17,7 @@ | |||
17 | #define cpu_has_counter 1 | 17 | #define cpu_has_counter 1 |
18 | #define cpu_has_watch 0 | 18 | #define cpu_has_watch 0 |
19 | #define cpu_has_mips16 0 | 19 | #define cpu_has_mips16 0 |
20 | #define cpu_has_mips16e2 0 | ||
20 | #define cpu_has_divec 0 | 21 | #define cpu_has_divec 0 |
21 | #define cpu_has_cache_cdex_p 1 | 22 | #define cpu_has_cache_cdex_p 1 |
22 | #define cpu_has_prefetch 0 | 23 | #define cpu_has_prefetch 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 92927b62b5a0..7022358057fd 100644 --- a/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h | |||
@@ -13,6 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | #define cpu_has_watch 1 | 14 | #define cpu_has_watch 1 |
15 | #define cpu_has_mips16 0 | 15 | #define cpu_has_mips16 0 |
16 | #define cpu_has_mips16e2 0 | ||
16 | #define cpu_has_divec 1 | 17 | #define cpu_has_divec 1 |
17 | #define cpu_has_vce 0 | 18 | #define cpu_has_vce 0 |
18 | #define cpu_has_cache_cdex_p 0 | 19 | #define cpu_has_cache_cdex_p 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 7f5144c6ce2d..b9d39dc45420 100644 --- a/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h +++ b/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h | |||
@@ -6,6 +6,7 @@ | |||
6 | #define cpu_has_inclusive_pcaches 0 | 6 | #define cpu_has_inclusive_pcaches 0 |
7 | 7 | ||
8 | #define cpu_has_mips16 0 | 8 | #define cpu_has_mips16 0 |
9 | #define cpu_has_mips16e2 0 | ||
9 | #define cpu_has_mdmx 0 | 10 | #define cpu_has_mdmx 0 |
10 | #define cpu_has_mips3d 0 | 11 | #define cpu_has_mips3d 0 |
11 | #define cpu_has_smartmips 0 | 12 | #define cpu_has_smartmips 0 |