MIPS: BCM63xx: Add Broadcom 63xx CPU definitions.

Todo: Nothing ever detects CPU_BCM6338 but the code tests for it anyway.

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 34 insertions, 0 deletions

diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 3bdc0e3d89cc..4b96d1a36056 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -113,6 +113,12 @@
 
 #define PRID_IMP_BCM4710        0x4000
 #define PRID_IMP_BCM3302        0x9000
+#define PRID_IMP_BCM6338        0x9000
+#define PRID_IMP_BCM6345        0x8000
+#define PRID_IMP_BCM6348        0x9100
+#define PRID_IMP_BCM4350        0xA000
+#define PRID_REV_BCM6358        0x0010
+#define PRID_REV_BCM6368        0x0030
 
 /*
  * These are the PRID's for when 23:16 == PRID_COMP_CAVIUM
@@ -210,6 +216,7 @@ enum cpu_type_enum {
          */
         CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K,
         CPU_ALCHEMY, CPU_PR4450, CPU_BCM3302, CPU_BCM4710,
+        CPU_BCM6338, CPU_BCM6345, CPU_BCM6348, CPU_BCM6358,
 
         /*
          * MIPS64 class processors
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 4579d5c12da9..f709657e4dcd 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -156,6 +156,9 @@ void __init check_wait(void)
         case CPU_25KF:
         case CPU_PR4450:
         case CPU_BCM3302:
+        case CPU_BCM6338:
+        case CPU_BCM6348:
+        case CPU_BCM6358:
         case CPU_CAVIUM_OCTEON:
                 cpu_wait = r4k_wait;
                 break;
@@ -854,6 +857,7 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
         decode_configs(c);
         switch (c->processor_id & 0xff00) {
         case PRID_IMP_BCM3302:
+         /* same as PRID_IMP_BCM6338 */
                 c->cputype = CPU_BCM3302;
                 __cpu_name[cpu] = "Broadcom BCM3302";
                 break;
@@ -861,6 +865,25 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
                 c->cputype = CPU_BCM4710;
                 __cpu_name[cpu] = "Broadcom BCM4710";
                 break;
+        case PRID_IMP_BCM6345:
+                c->cputype = CPU_BCM6345;
+                __cpu_name[cpu] = "Broadcom BCM6345";
+                break;
+        case PRID_IMP_BCM6348:
+                c->cputype = CPU_BCM6348;
+                __cpu_name[cpu] = "Broadcom BCM6348";
+                break;
+        case PRID_IMP_BCM4350:
+                switch (c->processor_id & 0xf0) {
+                case PRID_REV_BCM6358:
+                        c->cputype = CPU_BCM6358;
+                        __cpu_name[cpu] = "Broadcom BCM6358";
+                        break;
+                default:
+                        c->cputype = CPU_UNKNOWN;
+                        break;
+                }
+                break;
         }
 }
 
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index bc66f57f3257..bb1719a55d22 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -321,6 +321,10 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l,
         case CPU_BCM3302:
         case CPU_BCM4710:
         case CPU_LOONGSON2:
+        case CPU_BCM6338:
+        case CPU_BCM6345:
+        case CPU_BCM6348:
+        case CPU_BCM6358:
         case CPU_R5500:
                 if (m4kc_tlbp_war())
                         uasm_i_nop(p);