Commit b382fe84 authored by Ralf Baechle's avatar Ralf Baechle

No point in checking cpu_has_tlb before we've computed the CPU options.

So for now we just unconditionally set the option - Linux wouldn't
work without a TLB anyway.
    
Setting MIPS_CPU_4KTLB was missing for Alchemy and Sandcraft, add that
back.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 4194318c
...@@ -509,8 +509,7 @@ static inline void decode_configs(struct cpuinfo_mips *c) ...@@ -509,8 +509,7 @@ 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);
if (cpu_has_tlb) c->options |= MIPS_CPU_4KTLB;
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;
...@@ -544,6 +543,7 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c) ...@@ -544,6 +543,7 @@ 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:
...@@ -574,6 +574,7 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c) ...@@ -574,6 +574,7 @@ 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;
...@@ -588,8 +589,7 @@ static inline void cpu_probe_sibyte(struct cpuinfo_mips *c) ...@@ -588,8 +589,7 @@ 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);
if (cpu_has_tlb) c->options |= MIPS_CPU_4KTLB;
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