Commit d5b6f1db authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle

For MIPS32/MIPS64 cp0.config.mt == 1 implies a standard (R4k-style)

TLB, so no need to set it separately for each implementation.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 81731f79
...@@ -422,7 +422,7 @@ static inline unsigned int decode_config0(struct cpuinfo_mips *c) ...@@ -422,7 +422,7 @@ static inline unsigned int decode_config0(struct cpuinfo_mips *c)
config0 = read_c0_config(); config0 = read_c0_config();
if (((config0 & MIPS_CONF_MT) >> 7) == 1) if (((config0 & MIPS_CONF_MT) >> 7) == 1)
c->options |= MIPS_CPU_TLB; c->options |= MIPS_CPU_TLB | MIPS_CPU_4KTLB;
isa = (config0 & MIPS_CONF_AT) >> 13; isa = (config0 & MIPS_CONF_AT) >> 13;
switch (isa) { switch (isa) {
case 0: case 0:
...@@ -510,7 +510,6 @@ static inline void decode_configs(struct cpuinfo_mips *c) ...@@ -510,7 +510,6 @@ static inline void decode_configs(struct cpuinfo_mips *c)
static inline void cpu_probe_mips(struct cpuinfo_mips *c) static inline void cpu_probe_mips(struct cpuinfo_mips *c)
{ {
decode_configs(c); decode_configs(c);
c->options |= MIPS_CPU_4KTLB;
switch (c->processor_id & 0xff00) { switch (c->processor_id & 0xff00) {
case PRID_IMP_4KC: case PRID_IMP_4KC:
c->cputype = CPU_4KC; c->cputype = CPU_4KC;
...@@ -545,7 +544,6 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c) ...@@ -545,7 +544,6 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c)
static inline void cpu_probe_alchemy(struct cpuinfo_mips *c) static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
{ {
decode_configs(c); decode_configs(c);
c->options |= MIPS_CPU_4KTLB;
switch (c->processor_id & 0xff00) { switch (c->processor_id & 0xff00) {
case PRID_IMP_AU1_REV1: case PRID_IMP_AU1_REV1:
case PRID_IMP_AU1_REV2: case PRID_IMP_AU1_REV2:
...@@ -576,7 +574,6 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c) ...@@ -576,7 +574,6 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
static inline void cpu_probe_sibyte(struct cpuinfo_mips *c) static inline void cpu_probe_sibyte(struct cpuinfo_mips *c)
{ {
decode_configs(c); decode_configs(c);
c->options |= MIPS_CPU_4KTLB;
switch (c->processor_id & 0xff00) { switch (c->processor_id & 0xff00) {
case PRID_IMP_SB1: case PRID_IMP_SB1:
c->cputype = CPU_SB1; c->cputype = CPU_SB1;
...@@ -591,7 +588,6 @@ static inline void cpu_probe_sibyte(struct cpuinfo_mips *c) ...@@ -591,7 +588,6 @@ static inline void cpu_probe_sibyte(struct cpuinfo_mips *c)
static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c) static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c)
{ {
decode_configs(c); decode_configs(c);
c->options |= MIPS_CPU_4KTLB;
switch (c->processor_id & 0xff00) { switch (c->processor_id & 0xff00) {
case PRID_IMP_SR71000: case PRID_IMP_SR71000:
c->cputype = CPU_SR71000; c->cputype = CPU_SR71000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment