diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:17 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:17 -0400 |
commit | 9966db25defba4e1dce263246db25237bc24479f (patch) | |
tree | 5002f2849ebcceb57f40535798aa37dfbd841875 /arch/mips/kernel | |
parent | 36cfbaad815908f54872a7b471e9a7a09b4084a4 (diff) |
[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 <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 93 | ||||
-rw-r--r-- | arch/mips/kernel/proc.c | 75 | ||||
-rw-r--r-- | arch/mips/kernel/traps.c | 3 |
3 files changed, 94 insertions, 77 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index dde2adf1481c..234c7f5005fb 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) | |||
802 | } | 802 | } |
803 | } | 803 | } |
804 | 804 | ||
805 | const char *__cpu_name[NR_CPUS]; | ||
806 | |||
807 | /* | ||
808 | * Name a CPU | ||
809 | */ | ||
810 | static __init const char *cpu_to_name(struct cpuinfo_mips *c) | ||
811 | { | ||
812 | const char *name = NULL; | ||
813 | |||
814 | switch (c->cputype) { | ||
815 | case CPU_UNKNOWN: name = "unknown"; break; | ||
816 | case CPU_R2000: name = "R2000"; break; | ||
817 | case CPU_R3000: name = "R3000"; break; | ||
818 | case CPU_R3000A: name = "R3000A"; break; | ||
819 | case CPU_R3041: name = "R3041"; break; | ||
820 | case CPU_R3051: name = "R3051"; break; | ||
821 | case CPU_R3052: name = "R3052"; break; | ||
822 | case CPU_R3081: name = "R3081"; break; | ||
823 | case CPU_R3081E: name = "R3081E"; break; | ||
824 | case CPU_R4000PC: name = "R4000PC"; break; | ||
825 | case CPU_R4000SC: name = "R4000SC"; break; | ||
826 | case CPU_R4000MC: name = "R4000MC"; break; | ||
827 | case CPU_R4200: name = "R4200"; break; | ||
828 | case CPU_R4400PC: name = "R4400PC"; break; | ||
829 | case CPU_R4400SC: name = "R4400SC"; break; | ||
830 | case CPU_R4400MC: name = "R4400MC"; break; | ||
831 | case CPU_R4600: name = "R4600"; break; | ||
832 | case CPU_R6000: name = "R6000"; break; | ||
833 | case CPU_R6000A: name = "R6000A"; break; | ||
834 | case CPU_R8000: name = "R8000"; break; | ||
835 | case CPU_R10000: name = "R10000"; break; | ||
836 | case CPU_R12000: name = "R12000"; break; | ||
837 | case CPU_R14000: name = "R14000"; break; | ||
838 | case CPU_R4300: name = "R4300"; break; | ||
839 | case CPU_R4650: name = "R4650"; break; | ||
840 | case CPU_R4700: name = "R4700"; break; | ||
841 | case CPU_R5000: name = "R5000"; break; | ||
842 | case CPU_R5000A: name = "R5000A"; break; | ||
843 | case CPU_R4640: name = "R4640"; break; | ||
844 | case CPU_NEVADA: name = "Nevada"; break; | ||
845 | case CPU_RM7000: name = "RM7000"; break; | ||
846 | case CPU_RM9000: name = "RM9000"; break; | ||
847 | case CPU_R5432: name = "R5432"; break; | ||
848 | case CPU_4KC: name = "MIPS 4Kc"; break; | ||
849 | case CPU_5KC: name = "MIPS 5Kc"; break; | ||
850 | case CPU_R4310: name = "R4310"; break; | ||
851 | case CPU_SB1: name = "SiByte SB1"; break; | ||
852 | case CPU_SB1A: name = "SiByte SB1A"; break; | ||
853 | case CPU_TX3912: name = "TX3912"; break; | ||
854 | case CPU_TX3922: name = "TX3922"; break; | ||
855 | case CPU_TX3927: name = "TX3927"; break; | ||
856 | case CPU_AU1000: name = "Au1000"; break; | ||
857 | case CPU_AU1500: name = "Au1500"; break; | ||
858 | case CPU_AU1100: name = "Au1100"; break; | ||
859 | case CPU_AU1550: name = "Au1550"; break; | ||
860 | case CPU_AU1200: name = "Au1200"; break; | ||
861 | case CPU_4KEC: name = "MIPS 4KEc"; break; | ||
862 | case CPU_4KSC: name = "MIPS 4KSc"; break; | ||
863 | case CPU_VR41XX: name = "NEC Vr41xx"; break; | ||
864 | case CPU_R5500: name = "R5500"; break; | ||
865 | case CPU_TX49XX: name = "TX49xx"; break; | ||
866 | case CPU_20KC: name = "MIPS 20Kc"; break; | ||
867 | case CPU_24K: name = "MIPS 24K"; break; | ||
868 | case CPU_25KF: name = "MIPS 25Kf"; break; | ||
869 | case CPU_34K: name = "MIPS 34K"; break; | ||
870 | case CPU_74K: name = "MIPS 74K"; break; | ||
871 | case CPU_VR4111: name = "NEC VR4111"; break; | ||
872 | case CPU_VR4121: name = "NEC VR4121"; break; | ||
873 | case CPU_VR4122: name = "NEC VR4122"; break; | ||
874 | case CPU_VR4131: name = "NEC VR4131"; break; | ||
875 | case CPU_VR4133: name = "NEC VR4133"; break; | ||
876 | case CPU_VR4181: name = "NEC VR4181"; break; | ||
877 | case CPU_VR4181A: name = "NEC VR4181A"; break; | ||
878 | case CPU_SR71000: name = "Sandcraft SR71000"; break; | ||
879 | case CPU_BCM3302: name = "Broadcom BCM3302"; break; | ||
880 | case CPU_BCM4710: name = "Broadcom BCM4710"; break; | ||
881 | case CPU_PR4450: name = "Philips PR4450"; break; | ||
882 | case CPU_LOONGSON2: name = "ICT Loongson-2"; break; | ||
883 | default: | ||
884 | BUG(); | ||
885 | } | ||
886 | |||
887 | return name; | ||
888 | } | ||
889 | |||
805 | __init void cpu_probe(void) | 890 | __init void cpu_probe(void) |
806 | { | 891 | { |
807 | struct cpuinfo_mips *c = ¤t_cpu_data; | 892 | struct cpuinfo_mips *c = ¤t_cpu_data; |
893 | unsigned int cpu = smp_processor_id(); | ||
808 | 894 | ||
809 | c->processor_id = PRID_IMP_UNKNOWN; | 895 | c->processor_id = PRID_IMP_UNKNOWN; |
810 | c->fpu_id = FPIR_IMP_NONE; | 896 | c->fpu_id = FPIR_IMP_NONE; |
@@ -847,13 +933,16 @@ __init void cpu_probe(void) | |||
847 | c->ases |= MIPS_ASE_MIPS3D; | 933 | c->ases |= MIPS_ASE_MIPS3D; |
848 | } | 934 | } |
849 | } | 935 | } |
936 | |||
937 | __cpu_name[cpu] = cpu_to_name(c); | ||
850 | } | 938 | } |
851 | 939 | ||
852 | __init void cpu_report(void) | 940 | __init void cpu_report(void) |
853 | { | 941 | { |
854 | struct cpuinfo_mips *c = ¤t_cpu_data; | 942 | struct cpuinfo_mips *c = ¤t_cpu_data; |
855 | 943 | ||
856 | printk("CPU revision is: %08x\n", c->processor_id); | 944 | printk(KERN_INFO "CPU revision is: %08x (%s)\n", |
945 | c->processor_id, cpu_name_string()); | ||
857 | if (c->options & MIPS_CPU_FPU) | 946 | if (c->options & MIPS_CPU_FPU) |
858 | printk("FPU revision is: %08x\n", c->fpu_id); | 947 | printk(KERN_INFO "FPU revision is: %08x\n", c->fpu_id); |
859 | } | 948 | } |
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index accd5201d0e1..efd2d1314123 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c | |||
@@ -17,78 +17,6 @@ | |||
17 | 17 | ||
18 | unsigned int vced_count, vcei_count; | 18 | unsigned int vced_count, vcei_count; |
19 | 19 | ||
20 | static const char *cpu_name[] = { | ||
21 | [CPU_UNKNOWN] = "unknown", | ||
22 | [CPU_R2000] = "R2000", | ||
23 | [CPU_R3000] = "R3000", | ||
24 | [CPU_R3000A] = "R3000A", | ||
25 | [CPU_R3041] = "R3041", | ||
26 | [CPU_R3051] = "R3051", | ||
27 | [CPU_R3052] = "R3052", | ||
28 | [CPU_R3081] = "R3081", | ||
29 | [CPU_R3081E] = "R3081E", | ||
30 | [CPU_R4000PC] = "R4000PC", | ||
31 | [CPU_R4000SC] = "R4000SC", | ||
32 | [CPU_R4000MC] = "R4000MC", | ||
33 | [CPU_R4200] = "R4200", | ||
34 | [CPU_R4400PC] = "R4400PC", | ||
35 | [CPU_R4400SC] = "R4400SC", | ||
36 | [CPU_R4400MC] = "R4400MC", | ||
37 | [CPU_R4600] = "R4600", | ||
38 | [CPU_R6000] = "R6000", | ||
39 | [CPU_R6000A] = "R6000A", | ||
40 | [CPU_R8000] = "R8000", | ||
41 | [CPU_R10000] = "R10000", | ||
42 | [CPU_R12000] = "R12000", | ||
43 | [CPU_R14000] = "R14000", | ||
44 | [CPU_R4300] = "R4300", | ||
45 | [CPU_R4650] = "R4650", | ||
46 | [CPU_R4700] = "R4700", | ||
47 | [CPU_R5000] = "R5000", | ||
48 | [CPU_R5000A] = "R5000A", | ||
49 | [CPU_R4640] = "R4640", | ||
50 | [CPU_NEVADA] = "Nevada", | ||
51 | [CPU_RM7000] = "RM7000", | ||
52 | [CPU_RM9000] = "RM9000", | ||
53 | [CPU_R5432] = "R5432", | ||
54 | [CPU_4KC] = "MIPS 4Kc", | ||
55 | [CPU_5KC] = "MIPS 5Kc", | ||
56 | [CPU_R4310] = "R4310", | ||
57 | [CPU_SB1] = "SiByte SB1", | ||
58 | [CPU_SB1A] = "SiByte SB1A", | ||
59 | [CPU_TX3912] = "TX3912", | ||
60 | [CPU_TX3922] = "TX3922", | ||
61 | [CPU_TX3927] = "TX3927", | ||
62 | [CPU_AU1000] = "Au1000", | ||
63 | [CPU_AU1500] = "Au1500", | ||
64 | [CPU_AU1100] = "Au1100", | ||
65 | [CPU_AU1550] = "Au1550", | ||
66 | [CPU_AU1200] = "Au1200", | ||
67 | [CPU_4KEC] = "MIPS 4KEc", | ||
68 | [CPU_4KSC] = "MIPS 4KSc", | ||
69 | [CPU_VR41XX] = "NEC Vr41xx", | ||
70 | [CPU_R5500] = "R5500", | ||
71 | [CPU_TX49XX] = "TX49xx", | ||
72 | [CPU_20KC] = "MIPS 20Kc", | ||
73 | [CPU_24K] = "MIPS 24K", | ||
74 | [CPU_25KF] = "MIPS 25Kf", | ||
75 | [CPU_34K] = "MIPS 34K", | ||
76 | [CPU_74K] = "MIPS 74K", | ||
77 | [CPU_VR4111] = "NEC VR4111", | ||
78 | [CPU_VR4121] = "NEC VR4121", | ||
79 | [CPU_VR4122] = "NEC VR4122", | ||
80 | [CPU_VR4131] = "NEC VR4131", | ||
81 | [CPU_VR4133] = "NEC VR4133", | ||
82 | [CPU_VR4181] = "NEC VR4181", | ||
83 | [CPU_VR4181A] = "NEC VR4181A", | ||
84 | [CPU_SR71000] = "Sandcraft SR71000", | ||
85 | [CPU_BCM3302] = "Broadcom BCM3302", | ||
86 | [CPU_BCM4710] = "Broadcom BCM4710", | ||
87 | [CPU_PR4450] = "Philips PR4450", | ||
88 | [CPU_LOONGSON2] = "ICT Loongson-2", | ||
89 | }; | ||
90 | |||
91 | |||
92 | static int show_cpuinfo(struct seq_file *m, void *v) | 20 | static int show_cpuinfo(struct seq_file *m, void *v) |
93 | { | 21 | { |
94 | unsigned long n = (unsigned long) v - 1; | 22 | unsigned long n = (unsigned long) v - 1; |
@@ -110,8 +38,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
110 | seq_printf(m, "processor\t\t: %ld\n", n); | 38 | seq_printf(m, "processor\t\t: %ld\n", n); |
111 | sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n", | 39 | sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n", |
112 | cpu_data[n].options & MIPS_CPU_FPU ? " FPU V%d.%d" : ""); | 40 | cpu_data[n].options & MIPS_CPU_FPU ? " FPU V%d.%d" : ""); |
113 | seq_printf(m, fmt, cpu_name[cpu_data[n].cputype <= CPU_LAST ? | 41 | seq_printf(m, fmt, __cpu_name[smp_processor_id()], |
114 | cpu_data[n].cputype : CPU_UNKNOWN], | ||
115 | (version >> 4) & 0x0f, version & 0x0f, | 42 | (version >> 4) & 0x0f, version & 0x0f, |
116 | (fp_vers >> 4) & 0x0f, fp_vers & 0x0f); | 43 | (fp_vers >> 4) & 0x0f, fp_vers & 0x0f); |
117 | seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n", | 44 | seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n", |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index b3e408b54c24..632bce1bf420 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
@@ -295,7 +295,8 @@ void show_regs(struct pt_regs *regs) | |||
295 | if (1 <= cause && cause <= 5) | 295 | if (1 <= cause && cause <= 5) |
296 | printk("BadVA : %0*lx\n", field, regs->cp0_badvaddr); | 296 | printk("BadVA : %0*lx\n", field, regs->cp0_badvaddr); |
297 | 297 | ||
298 | printk("PrId : %08x\n", read_c0_prid()); | 298 | printk("PrId : %08x (%s)\n", read_c0_prid(), |
299 | cpu_name_string()); | ||
299 | } | 300 | } |
300 | 301 | ||
301 | void show_registers(struct pt_regs *regs) | 302 | void show_registers(struct pt_regs *regs) |