diff options
author | Paul Cercueil <paul@crapouillou.net> | 2019-05-07 18:43:57 -0400 |
---|---|---|
committer | Paul Burton <paul.burton@mips.com> | 2019-07-21 18:23:24 -0400 |
commit | 368fb26c1e55a187131a794f95420d96d31d0e5e (patch) | |
tree | fa730e4917d920e082f2b1de4f50947b2787bedd | |
parent | 3b25b763116482596227225bea7c03fcde11c9ed (diff) |
MIPS: Decode config3 register on Ingenic SoCs
XBurst misses a config2 register, so config3 decode was skipped in
decode_configs().
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: od@zcrc.me
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index fd77dbc29af9..a9c82338396a 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
@@ -1956,9 +1956,17 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) | |||
1956 | static inline void cpu_probe_ingenic(struct cpuinfo_mips *c, unsigned int cpu) | 1956 | static inline void cpu_probe_ingenic(struct cpuinfo_mips *c, unsigned int cpu) |
1957 | { | 1957 | { |
1958 | decode_configs(c); | 1958 | decode_configs(c); |
1959 | |||
1960 | /* | ||
1961 | * XBurst misses a config2 register, so config3 decode was skipped in | ||
1962 | * decode_configs(). | ||
1963 | */ | ||
1964 | decode_config3(c); | ||
1965 | |||
1959 | /* XBurst does not implement the CP0 counter. */ | 1966 | /* XBurst does not implement the CP0 counter. */ |
1960 | c->options &= ~MIPS_CPU_COUNTER; | 1967 | c->options &= ~MIPS_CPU_COUNTER; |
1961 | BUG_ON(!__builtin_constant_p(cpu_has_counter) || cpu_has_counter); | 1968 | BUG_ON(!__builtin_constant_p(cpu_has_counter) || cpu_has_counter); |
1969 | |||
1962 | switch (c->processor_id & PRID_IMP_MASK) { | 1970 | switch (c->processor_id & PRID_IMP_MASK) { |
1963 | case PRID_IMP_XBURST: | 1971 | case PRID_IMP_XBURST: |
1964 | c->cputype = CPU_XBURST; | 1972 | c->cputype = CPU_XBURST; |