target/linux/brcm63xx/patches-2.6.27/001-add_broadcom_63xx_cpu_definitions.patch

   1 From a9f65413f9ea81ef2208da66a3db9cb8a9020eef Mon Sep 17 00:00:00 2001
   2 From: Maxime Bizon <mbizon@freebox.fr>
   3 Date: Fri, 18 Jul 2008 15:53:08 +0200
   4 Subject: [PATCH] [MIPS] BCM63XX: Add Broadcom 63xx CPU definitions.
   5
   6 Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
   7 ---
   8  arch/mips/kernel/cpu-probe.c |   25 +++++++++++++++++++++++++
   9  arch/mips/mm/tlbex.c         |    4 ++++
  10  include/asm-mips/cpu.h       |    7 +++++++
  11  3 files changed, 36 insertions(+), 0 deletions(-)
  12
  13 diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
  14 index e621fda..9775315 100644
  15 --- a/arch/mips/kernel/cpu-probe.c
  16 +++ b/arch/mips/kernel/cpu-probe.c
  17 @@ -153,6 +153,10 @@ void __init check_wait(void)
  18         case CPU_25KF:
  19         case CPU_PR4450:
  20         case CPU_BCM3302:
  21 +       case CPU_BCM6338:
  22 +       case CPU_BCM6345:
  23 +       case CPU_BCM6348:
  24 +       case CPU_BCM6358:
  25                 cpu_wait = r4k_wait;
  26                 break;
  27
  28 @@ -802,11 +806,28 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
  29         decode_configs(c);
  30         switch (c->processor_id & 0xff00) {
  31         case PRID_IMP_BCM3302:
  32 +       /* same as PRID_IMP_BCM6338 */
  33                 c->cputype = CPU_BCM3302;
  34                 break;
  35         case PRID_IMP_BCM4710:
  36                 c->cputype = CPU_BCM4710;
  37                 break;
  38 +       case PRID_IMP_BCM6345:
  39 +               c->cputype = CPU_BCM6345;
  40 +               break;
  41 +       case PRID_IMP_BCM6348:
  42 +               c->cputype = CPU_BCM6348;
  43 +               break;
  44 +       case PRID_IMP_BCM4350:
  45 +               switch (c->processor_id & 0xf0) {
  46 +               case PRID_REV_BCM6358:
  47 +                       c->cputype = CPU_BCM6358;
  48 +                       break;
  49 +               default:
  50 +                       c->cputype = CPU_UNKNOWN;
  51 +                       break;
  52 +               }
  53 +               break;
  54         default:
  55                 c->cputype = CPU_UNKNOWN;
  56                 break;
  57 @@ -892,6 +913,10 @@ static __cpuinit const char *cpu_to_name(struct cpuinfo_mips *c)
  58         case CPU_SR71000:       name = "Sandcraft SR71000"; break;
  59         case CPU_BCM3302:       name = "Broadcom BCM3302"; break;
  60         case CPU_BCM4710:       name = "Broadcom BCM4710"; break;
  61 +       case CPU_BCM6338:       name = "Broadcom BCM6338"; break;
  62 +       case CPU_BCM6345:       name = "Broadcom BCM6345"; break;
  63 +       case CPU_BCM6348:       name = "Broadcom BCM6348"; break;
  64 +       case CPU_BCM6358:       name = "Broadcom BCM6358"; break;
  65         case CPU_PR4450:        name = "Philips PR4450"; break;
  66         case CPU_LOONGSON2:     name = "ICT Loongson-2"; break;
  67         default:
  68 diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
  69 index 979cf91..f6deda3 100644
  70 --- a/arch/mips/mm/tlbex.c
  71 +++ b/arch/mips/mm/tlbex.c
  72 @@ -317,6 +317,10 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l,
  73         case CPU_BCM3302:
  74         case CPU_BCM4710:
  75         case CPU_LOONGSON2:
  76 +       case CPU_BCM6338:
  77 +       case CPU_BCM6345:
  78 +       case CPU_BCM6348:
  79 +       case CPU_BCM6358:
  80                 if (m4kc_tlbp_war())
  81                         uasm_i_nop(p);
  82                 tlbw(p);
  83 diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
  84 index 229a786..538bcde 100644
  85 --- a/include/asm-mips/cpu.h
  86 +++ b/include/asm-mips/cpu.h
  87 @@ -112,6 +112,12 @@
  88
  89  #define PRID_IMP_BCM4710       0x4000
  90  #define PRID_IMP_BCM3302       0x9000
  91 +#define PRID_IMP_BCM6338       0x9000
  92 +#define PRID_IMP_BCM6345       0x8000
  93 +#define PRID_IMP_BCM6348       0x9100
  94 +#define PRID_IMP_BCM4350       0xA000
  95 +#define PRID_REV_BCM6358       0x0010
  96 +#define PRID_REV_BCM6368       0x0030
  97
  98  /*
  99   * Definitions for 7:0 on legacy processors
 100 @@ -198,6 +204,7 @@ enum cpu_type_enum {
 101         CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K,
 102         CPU_AU1000, CPU_AU1100, CPU_AU1200, CPU_AU1210, CPU_AU1250, CPU_AU1500,
 103         CPU_AU1550, CPU_PR4450, CPU_BCM3302, CPU_BCM4710,
 104 +       CPU_BCM6338, CPU_BCM6345, CPU_BCM6348, CPU_BCM6358,
 105
 106         /*
 107          * MIPS64 class processors
 108 --
 109 1.5.4.3
 110