Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9966db25defba4e1dce263246db25237bc24479f
Commit:     9966db25defba4e1dce263246db25237bc24479f
Parent:     36cfbaad815908f54872a7b471e9a7a09b4084a4
Author:     Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 11 23:46:17 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Thu Oct 11 23:46:17 2007 +0100

    [MIPS] Make facility to convert CPU types to strings generally available.
    
    So far /proc/cpuinfo has been the only user but human readable processor
    name are more useful than that for proc.
    
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/kernel/cpu-probe.c |   93 +++++++++++++++++++++++++++++++++++++++++-
 arch/mips/kernel/proc.c      |   75 +---------------------------------
 arch/mips/kernel/traps.c     |    3 +-
 include/asm-mips/cpu-info.h  |    3 +
 4 files changed, 97 insertions(+), 77 deletions(-)

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index dde2adf..234c7f5 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -802,9 +802,95 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips 
*c)
        }
 }
 
+const char *__cpu_name[NR_CPUS];
+
+/*
+ * Name a CPU
+ */
+static __init const char *cpu_to_name(struct cpuinfo_mips *c)
+{
+       const char *name = NULL;
+
+       switch (c->cputype) {
+       case CPU_UNKNOWN:       name = "unknown"; break;
+       case CPU_R2000:         name = "R2000"; break;
+       case CPU_R3000:         name = "R3000"; break;
+       case CPU_R3000A:        name = "R3000A"; break;
+       case CPU_R3041:         name = "R3041"; break;
+       case CPU_R3051:         name = "R3051"; break;
+       case CPU_R3052:         name = "R3052"; break;
+       case CPU_R3081:         name = "R3081"; break;
+       case CPU_R3081E:        name = "R3081E"; break;
+       case CPU_R4000PC:       name = "R4000PC"; break;
+       case CPU_R4000SC:       name = "R4000SC"; break;
+       case CPU_R4000MC:       name = "R4000MC"; break;
+       case CPU_R4200:         name = "R4200"; break;
+       case CPU_R4400PC:       name = "R4400PC"; break;
+       case CPU_R4400SC:       name = "R4400SC"; break;
+       case CPU_R4400MC:       name = "R4400MC"; break;
+       case CPU_R4600:         name = "R4600"; break;
+       case CPU_R6000:         name = "R6000"; break;
+       case CPU_R6000A:        name = "R6000A"; break;
+       case CPU_R8000:         name = "R8000"; break;
+       case CPU_R10000:        name = "R10000"; break;
+       case CPU_R12000:        name = "R12000"; break;
+       case CPU_R14000:        name = "R14000"; break;
+       case CPU_R4300:         name = "R4300"; break;
+       case CPU_R4650:         name = "R4650"; break;
+       case CPU_R4700:         name = "R4700"; break;
+       case CPU_R5000:         name = "R5000"; break;
+       case CPU_R5000A:        name = "R5000A"; break;
+       case CPU_R4640:         name = "R4640"; break;
+       case CPU_NEVADA:        name = "Nevada"; break;
+       case CPU_RM7000:        name = "RM7000"; break;
+       case CPU_RM9000:        name = "RM9000"; break;
+       case CPU_R5432:         name = "R5432"; break;
+       case CPU_4KC:           name = "MIPS 4Kc"; break;
+       case CPU_5KC:           name = "MIPS 5Kc"; break;
+       case CPU_R4310:         name = "R4310"; break;
+       case CPU_SB1:           name = "SiByte SB1"; break;
+       case CPU_SB1A:          name = "SiByte SB1A"; break;
+       case CPU_TX3912:        name = "TX3912"; break;
+       case CPU_TX3922:        name = "TX3922"; break;
+       case CPU_TX3927:        name = "TX3927"; break;
+       case CPU_AU1000:        name = "Au1000"; break;
+       case CPU_AU1500:        name = "Au1500"; break;
+       case CPU_AU1100:        name = "Au1100"; break;
+       case CPU_AU1550:        name = "Au1550"; break;
+       case CPU_AU1200:        name = "Au1200"; break;
+       case CPU_4KEC:          name = "MIPS 4KEc"; break;
+       case CPU_4KSC:          name = "MIPS 4KSc"; break;
+       case CPU_VR41XX:        name = "NEC Vr41xx"; break;
+       case CPU_R5500:         name = "R5500"; break;
+       case CPU_TX49XX:        name = "TX49xx"; break;
+       case CPU_20KC:          name = "MIPS 20Kc"; break;
+       case CPU_24K:           name = "MIPS 24K"; break;
+       case CPU_25KF:          name = "MIPS 25Kf"; break;
+       case CPU_34K:           name = "MIPS 34K"; break;
+       case CPU_74K:           name = "MIPS 74K"; break;
+       case CPU_VR4111:        name = "NEC VR4111"; break;
+       case CPU_VR4121:        name = "NEC VR4121"; break;
+       case CPU_VR4122:        name = "NEC VR4122"; break;
+       case CPU_VR4131:        name = "NEC VR4131"; break;
+       case CPU_VR4133:        name = "NEC VR4133"; break;
+       case CPU_VR4181:        name = "NEC VR4181"; break;
+       case CPU_VR4181A:       name = "NEC VR4181A"; break;
+       case CPU_SR71000:       name = "Sandcraft SR71000"; break;
+       case CPU_BCM3302:       name = "Broadcom BCM3302"; break;
+       case CPU_BCM4710:       name = "Broadcom BCM4710"; break;
+       case CPU_PR4450:        name = "Philips PR4450"; break;
+       case CPU_LOONGSON2:     name = "ICT Loongson-2"; break;
+       default:
+               BUG();
+       }
+
+       return name;
+}
+
 __init void cpu_probe(void)
 {
        struct cpuinfo_mips *c = &current_cpu_data;
+       unsigned int cpu = smp_processor_id();
 
        c->processor_id = PRID_IMP_UNKNOWN;
        c->fpu_id       = FPIR_IMP_NONE;
@@ -847,13 +933,16 @@ __init void cpu_probe(void)
                                c->ases |= MIPS_ASE_MIPS3D;
                }
        }
+
+       __cpu_name[cpu] = cpu_to_name(c);
 }
 
 __init void cpu_report(void)
 {
        struct cpuinfo_mips *c = &current_cpu_data;
 
-       printk("CPU revision is: %08x\n", c->processor_id);
+       printk(KERN_INFO "CPU revision is: %08x (%s)\n",
+              c->processor_id, cpu_name_string());
        if (c->options & MIPS_CPU_FPU)
-               printk("FPU revision is: %08x\n", c->fpu_id);
+               printk(KERN_INFO "FPU revision is: %08x\n", c->fpu_id);
 }
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index accd520..efd2d13 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -17,78 +17,6 @@
 
 unsigned int vced_count, vcei_count;
 
-static const char *cpu_name[] = {
-       [CPU_UNKNOWN]   = "unknown",
-       [CPU_R2000]     = "R2000",
-       [CPU_R3000]     = "R3000",
-       [CPU_R3000A]    = "R3000A",
-       [CPU_R3041]     = "R3041",
-       [CPU_R3051]     = "R3051",
-       [CPU_R3052]     = "R3052",
-       [CPU_R3081]     = "R3081",
-       [CPU_R3081E]    = "R3081E",
-       [CPU_R4000PC]   = "R4000PC",
-       [CPU_R4000SC]   = "R4000SC",
-       [CPU_R4000MC]   = "R4000MC",
-       [CPU_R4200]     = "R4200",
-       [CPU_R4400PC]   = "R4400PC",
-       [CPU_R4400SC]   = "R4400SC",
-       [CPU_R4400MC]   = "R4400MC",
-       [CPU_R4600]     = "R4600",
-       [CPU_R6000]     = "R6000",
-       [CPU_R6000A]    = "R6000A",
-       [CPU_R8000]     = "R8000",
-       [CPU_R10000]    = "R10000",
-       [CPU_R12000]    = "R12000",
-       [CPU_R14000]    = "R14000",
-       [CPU_R4300]     = "R4300",
-       [CPU_R4650]     = "R4650",
-       [CPU_R4700]     = "R4700",
-       [CPU_R5000]     = "R5000",
-       [CPU_R5000A]    = "R5000A",
-       [CPU_R4640]     = "R4640",
-       [CPU_NEVADA]    = "Nevada",
-       [CPU_RM7000]    = "RM7000",
-       [CPU_RM9000]    = "RM9000",
-       [CPU_R5432]     = "R5432",
-       [CPU_4KC]       = "MIPS 4Kc",
-       [CPU_5KC]       = "MIPS 5Kc",
-       [CPU_R4310]     = "R4310",
-       [CPU_SB1]       = "SiByte SB1",
-       [CPU_SB1A]      = "SiByte SB1A",
-       [CPU_TX3912]    = "TX3912",
-       [CPU_TX3922]    = "TX3922",
-       [CPU_TX3927]    = "TX3927",
-       [CPU_AU1000]    = "Au1000",
-       [CPU_AU1500]    = "Au1500",
-       [CPU_AU1100]    = "Au1100",
-       [CPU_AU1550]    = "Au1550",
-       [CPU_AU1200]    = "Au1200",
-       [CPU_4KEC]      = "MIPS 4KEc",
-       [CPU_4KSC]      = "MIPS 4KSc",
-       [CPU_VR41XX]    = "NEC Vr41xx",
-       [CPU_R5500]     = "R5500",
-       [CPU_TX49XX]    = "TX49xx",
-       [CPU_20KC]      = "MIPS 20Kc",
-       [CPU_24K]       = "MIPS 24K",
-       [CPU_25KF]      = "MIPS 25Kf",
-       [CPU_34K]       = "MIPS 34K",
-       [CPU_74K]       = "MIPS 74K",
-       [CPU_VR4111]    = "NEC VR4111",
-       [CPU_VR4121]    = "NEC VR4121",
-       [CPU_VR4122]    = "NEC VR4122",
-       [CPU_VR4131]    = "NEC VR4131",
-       [CPU_VR4133]    = "NEC VR4133",
-       [CPU_VR4181]    = "NEC VR4181",
-       [CPU_VR4181A]   = "NEC VR4181A",
-       [CPU_SR71000]   = "Sandcraft SR71000",
-       [CPU_BCM3302]   = "Broadcom BCM3302",
-       [CPU_BCM4710]   = "Broadcom BCM4710",
-       [CPU_PR4450]    = "Philips PR4450",
-       [CPU_LOONGSON2] = "ICT Loongson-2",
-};
-
-
 static int show_cpuinfo(struct seq_file *m, void *v)
 {
        unsigned long n = (unsigned long) v - 1;
@@ -110,8 +38,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
        seq_printf(m, "processor\t\t: %ld\n", n);
        sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
                cpu_data[n].options & MIPS_CPU_FPU ? "  FPU V%d.%d" : "");
-       seq_printf(m, fmt, cpu_name[cpu_data[n].cputype <= CPU_LAST ?
-                                   cpu_data[n].cputype : CPU_UNKNOWN],
+       seq_printf(m, fmt, __cpu_name[smp_processor_id()],
                                   (version >> 4) & 0x0f, version & 0x0f,
                                   (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);
        seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n",
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index b3e408b..632bce1 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -295,7 +295,8 @@ void show_regs(struct pt_regs *regs)
        if (1 <= cause && cause <= 5)
                printk("BadVA : %0*lx\n", field, regs->cp0_badvaddr);
 
-       printk("PrId  : %08x\n", read_c0_prid());
+       printk("PrId  : %08x (%s)\n", read_c0_prid(),
+              cpu_name_string());
 }
 
 void show_registers(struct pt_regs *regs)
diff --git a/include/asm-mips/cpu-info.h b/include/asm-mips/cpu-info.h
index 0468959..94f1c81 100644
--- a/include/asm-mips/cpu-info.h
+++ b/include/asm-mips/cpu-info.h
@@ -74,4 +74,7 @@ extern struct cpuinfo_mips cpu_data[];
 extern void cpu_probe(void);
 extern void cpu_report(void);
 
+extern const char *__cpu_name[];
+#define cpu_name_string()      __cpu_name[smp_processor_id()]
+
 #endif /* __ASM_CPU_INFO_H */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to