lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: Add Cavium OCTEON processor constants and CPU probe.

Browse Source 
Add OCTEON constants to asm/cpu.h and asm/module.h.

Add probe function for Cavium OCTEON CPUs and hook it up.

Signed-off-by: Tomaso Paoletti <tpaoletti@caviumnetworks.com>
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
David Daney
2008-12-11 15:33:26 -08:00
committed by Ralf Baechle
parent 25c3000300
commit 0dd4781bca
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/mips/include/asm/cpu.h
View File

@@ -33,6 +33,7 @@
#define PRID_COMP_TOSHIBA 0x070000 #define PRID_COMP_TOSHIBA 0x070000
#define PRID_COMP_LSI 0x080000 #define PRID_COMP_LSI 0x080000
#define PRID_COMP_LEXRA 0x0b0000 #define PRID_COMP_LEXRA 0x0b0000
#define PRID_COMP_CAVIUM 0x0d0000
/* /*
@@ -113,6 +114,18 @@
#define PRID_IMP_BCM4710 0x4000 #define PRID_IMP_BCM4710 0x4000
#define PRID_IMP_BCM3302 0x9000 #define PRID_IMP_BCM3302 0x9000
/*
* These are the PRID's for when 23:16 == PRID_COMP_CAVIUM
*/
#define PRID_IMP_CAVIUM_CN38XX 0x0000
#define PRID_IMP_CAVIUM_CN31XX 0x0100
#define PRID_IMP_CAVIUM_CN30XX 0x0200
#define PRID_IMP_CAVIUM_CN58XX 0x0300
#define PRID_IMP_CAVIUM_CN56XX 0x0400
#define PRID_IMP_CAVIUM_CN50XX 0x0600
#define PRID_IMP_CAVIUM_CN52XX 0x0700
/* /*
* Definitions for 7:0 on legacy processors * Definitions for 7:0 on legacy processors
*/ */
@@ -203,6 +216,7 @@ enum cpu_type_enum {
* MIPS64 class processors * MIPS64 class processors
*/ */
CPU_5KC, CPU_20KC, CPU_25KF, CPU_SB1, CPU_SB1A, CPU_LOONGSON2, CPU_5KC, CPU_20KC, CPU_25KF, CPU_SB1, CPU_SB1A, CPU_LOONGSON2,
CPU_CAVIUM_OCTEON,
CPU_LAST CPU_LAST
}; };

2
arch/mips/include/asm/module.h
View File

@@ -116,6 +116,8 @@ search_module_dbetables(unsigned long addr)
#define MODULE_PROC_FAMILY "SB1 " #define MODULE_PROC_FAMILY "SB1 "
#elif defined CONFIG_CPU_LOONGSON2 #elif defined CONFIG_CPU_LOONGSON2
#define MODULE_PROC_FAMILY "LOONGSON2 " #define MODULE_PROC_FAMILY "LOONGSON2 "
#elif defined CONFIG_CPU_CAVIUM_OCTEON
#define MODULE_PROC_FAMILY "OCTEON "
#else #else
#error MODULE_PROC_FAMILY undefined for your processor configuration #error MODULE_PROC_FAMILY undefined for your processor configuration
#endif #endif

25
arch/mips/kernel/cpu-probe.c
View File

@@ -154,6 +154,7 @@ void __init check_wait(void)
case CPU_25KF: case CPU_25KF:
case CPU_PR4450: case CPU_PR4450:
case CPU_BCM3302: case CPU_BCM3302:
case CPU_CAVIUM_OCTEON:
cpu_wait = r4k_wait; cpu_wait = r4k_wait;
break; break;
@@ -875,6 +876,27 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
} }
} }
static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu)
{
decode_configs(c);
switch (c->processor_id & 0xff00) {
case PRID_IMP_CAVIUM_CN38XX:
case PRID_IMP_CAVIUM_CN31XX:
case PRID_IMP_CAVIUM_CN30XX:
case PRID_IMP_CAVIUM_CN58XX:
case PRID_IMP_CAVIUM_CN56XX:
case PRID_IMP_CAVIUM_CN50XX:
case PRID_IMP_CAVIUM_CN52XX:
c->cputype = CPU_CAVIUM_OCTEON;
__cpu_name[cpu] = "Cavium Octeon";
break;
default:
printk(KERN_INFO "Unknown Octeon chip!\n");
c->cputype = CPU_UNKNOWN;
break;
}
}
const char *__cpu_name[NR_CPUS]; const char *__cpu_name[NR_CPUS];
__cpuinit void cpu_probe(void) __cpuinit void cpu_probe(void)
@@ -909,6 +931,9 @@ __cpuinit void cpu_probe(void)
case PRID_COMP_NXP: case PRID_COMP_NXP:
cpu_probe_nxp(c, cpu); cpu_probe_nxp(c, cpu);
break; break;
case PRID_COMP_CAVIUM:
cpu_probe_cavium(c, cpu);
break;
} }
BUG_ON(!__cpu_name[cpu]); BUG_ON(!__cpu_name[cpu]);