From: Florian Fainelli <f.fainelli@xxxxxxxxx>
commit 37808d62afcdc420d98875c4b514c178d56f6815 upstream.
Just to ease debugging of multiplatform kernel, make sure we print
"Broadcom BMIPS5200" for the BMIPS5200 implementation instead of
Broadcom BMIPS5000.
Fixes: 68e6a78373a6d ("MIPS: BMIPS: Add PRId for BMIPS5200 (Whirlwind)")
Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/13014/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/mips/kernel/cpu-probe.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -1284,7 +1284,10 @@ static inline void cpu_probe_broadcom(st
case PRID_IMP_BMIPS5000:
case PRID_IMP_BMIPS5200:
c->cputype = CPU_BMIPS5000;
- __cpu_name[cpu] = "Broadcom BMIPS5000";
+ if ((c->processor_id & PRID_IMP_MASK) == PRID_IMP_BMIPS5200)
+ __cpu_name[cpu] = "Broadcom BMIPS5200";
+ else
+ __cpu_name[cpu] = "Broadcom BMIPS5000";
set_elf_platform(cpu, "bmips5000");
c->options |= MIPS_CPU_ULRI;
break;
Patches currently in stable-queue which might be from f.fainelli@xxxxxxxxx are
queue-4.4/mips-bmips-adjust-mips-hpt-frequency-for-bcm7435.patch
queue-4.4/mips-bmips-clear-mips_cache_aliases-earlier.patch
queue-4.4/mips-bmips-pretty-print-bmips5200-processor-name.patch
queue-4.4/mips-bmips-bmips5000-has-i-cache-filing-from-d-cache.patch
queue-4.4/mips-bmips-fix-prid_imp_bmips5000-masking-for-bmips5200.patch
queue-4.4/mips-smp-update-cpu_foreign_map-on-cpu-disable.patch
queue-4.4/mips-bmips-local_r4k___flush_cache_all-needs-to-blast-s-cache.patch
