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 --- a/arch/mips/kernel/cpu-probe.c
  14 +++ b/arch/mips/kernel/cpu-probe.c
  15 @@ -153,6 +153,10 @@ void __init check_wait(void)
  16         case CPU_25KF:
  17         case CPU_PR4450:
  18         case CPU_BCM3302:
  19 +       case CPU_BCM6338:
  20 +       case CPU_BCM6345:
  21 +       case CPU_BCM6348:
  22 +       case CPU_BCM6358:
  23                 cpu_wait = r4k_wait;
  24                 break;
  25
  26 @@ -802,11 +806,28 @@ static inline void cpu_probe_broadcom(st
  27         decode_configs(c);
  28         switch (c->processor_id & 0xff00) {
  29         case PRID_IMP_BCM3302:
  30 +       /* same as PRID_IMP_BCM6338 */
  31                 c->cputype = CPU_BCM3302;
  32                 break;
  33         case PRID_IMP_BCM4710:
  34                 c->cputype = CPU_BCM4710;
  35                 break;
  36 +       case PRID_IMP_BCM6345:
  37 +               c->cputype = CPU_BCM6345;
  38 +               break;
  39 +       case PRID_IMP_BCM6348:
  40 +               c->cputype = CPU_BCM6348;
  41 +               break;
  42 +       case PRID_IMP_BCM4350:
  43 +               switch (c->processor_id & 0xf0) {
  44 +               case PRID_REV_BCM6358:
  45 +                       c->cputype = CPU_BCM6358;
  46 +                       break;
  47 +               default:
  48 +                       c->cputype = CPU_UNKNOWN;
  49 +                       break;
  50 +               }
  51 +               break;
  52         default:
  53                 c->cputype = CPU_UNKNOWN;
  54                 break;
  55 @@ -892,6 +913,10 @@ static __cpuinit const char *cpu_to_name
  56         case CPU_SR71000:       name = "Sandcraft SR71000"; break;
  57         case CPU_BCM3302:       name = "Broadcom BCM3302"; break;
  58         case CPU_BCM4710:       name = "Broadcom BCM4710"; break;
  59 +       case CPU_BCM6338:       name = "Broadcom BCM6338"; break;
  60 +       case CPU_BCM6345:       name = "Broadcom BCM6345"; break;
  61 +       case CPU_BCM6348:       name = "Broadcom BCM6348"; break;
  62 +       case CPU_BCM6358:       name = "Broadcom BCM6358"; break;
  63         case CPU_PR4450:        name = "Philips PR4450"; break;
  64         case CPU_LOONGSON2:     name = "ICT Loongson-2"; break;
  65         default:
  66 --- a/arch/mips/mm/tlbex.c
  67 +++ b/arch/mips/mm/tlbex.c
  68 @@ -317,6 +317,10 @@ static void __cpuinit build_tlb_write_en
  69         case CPU_BCM3302:
  70         case CPU_BCM4710:
  71         case CPU_LOONGSON2:
  72 +       case CPU_BCM6338:
  73 +       case CPU_BCM6345:
  74 +       case CPU_BCM6348:
  75 +       case CPU_BCM6358:
  76                 if (m4kc_tlbp_war())
  77                         uasm_i_nop(p);
  78                 tlbw(p);
  79 --- a/include/asm-mips/cpu.h
  80 +++ b/include/asm-mips/cpu.h
  81 @@ -112,6 +112,12 @@
  82
  83  #define PRID_IMP_BCM4710       0x4000
  84  #define PRID_IMP_BCM3302       0x9000
  85 +#define PRID_IMP_BCM6338       0x9000
  86 +#define PRID_IMP_BCM6345       0x8000
  87 +#define PRID_IMP_BCM6348       0x9100
  88 +#define PRID_IMP_BCM4350       0xA000
  89 +#define PRID_REV_BCM6358       0x0010
  90 +#define PRID_REV_BCM6368       0x0030
  91
  92  /*
  93   * Definitions for 7:0 on legacy processors
  94 @@ -198,6 +204,7 @@ enum cpu_type_enum {
  95         CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K,
  96         CPU_AU1000, CPU_AU1100, CPU_AU1200, CPU_AU1210, CPU_AU1250, CPU_AU1500,
  97         CPU_AU1550, CPU_PR4450, CPU_BCM3302, CPU_BCM4710,
  98 +       CPU_BCM6338, CPU_BCM6345, CPU_BCM6348, CPU_BCM6358,
  99
 100         /*
 101          * MIPS64 class processors