x86_64: split cpuinfo from setup_64.c into cpu/proc_64.c
PATCH 1/5 x86_64: split cpuinfo from setup_64.c into cpu/proc_64.c
From: Hiroshi Shimamoto <[email protected]>
x86 /proc/cpuinfo code can be unified.
This is the first step of unification.
--- arch/x86/kernel/cpu/Makefile | 1 + arch/x86/kernel/cpu/proc_64.c | 126 +++++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/setup_64.c | 120 --------------------------------------- 3 files changed, 127 insertions(+), 120 deletions(-) create mode 100644 arch/x86/kernel/cpu/proc_64.c
arch/x86/kernel/cpu/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_X86_32) += transmeta.o obj-$(CONFIG_X86_32) += intel.o obj-$(CONFIG_X86_32) += nexgen.o obj-$(CONFIG_X86_32) += umc.o +obj-$(CONFIG_X86_64) += proc_64.o obj-$(CONFIG_X86_MCE) += mcheck/ obj-$(CONFIG_MTRR) += mtrr/
arch/x86/kernel/cpu/proc_64.c new file +126 -0
126 lines not on this page · raw message
arch/x86/kernel/setup_64.c +0 -120
123 lines not on this page · raw message
Signature · 1 line
1.5.3.8
PATCH 2/5 x86: make cpu/proc|_64.c similar
From: Hiroshi Shimamoto <[email protected]>
clean up for unification.
--- arch/x86/kernel/cpu/proc.c | 120 +++++++++++++++++++++++----------------- arch/x86/kernel/cpu/proc_64.c | 63 ++++++++++++--------- 2 files changed, 105 insertions(+), 78 deletions(-)
arch/x86/kernel/cpu/proc.c +69 -51
@@ -8,75 +8,90 @@/* * Get CPU information for use by the procfs. */ +static void show_cpuinfo_core (struct seq_file *m,struct cpuinfo_x86 *c, +unsigned int cpu) +{ +#ifdef CONFIG_X86_HT +if (c->x86_max_cores * smp_num_siblings >1 ) { +seq_printf (m,"physical id\t: %d\n" , c->phys_proc_id); +seq_printf (m,"siblings\t: %d\n" , +cpus_weight (per_cpu (cpu_core_map, cpu))); +seq_printf (m,"core id\t\t: %d\n" , c->cpu_core_id); +seq_printf (m,"cpu cores\t: %d\n" , c->booted_cores); + } +#endif +} + +static void show_cpuinfo_misc (struct seq_file *m,struct cpuinfo_x86 *c) +{ +/* +* We use exception 16 if we have hardware math and we've either seen +* it or the CPU claims it is internal +*/ +int fpu_exception = c->hard_math && (ignore_fpu_irq || cpu_has_fpu); +seq_printf (m, +"fdiv_bug\t: %s\n" +"hlt_bug\t\t: %s\n" +"f00f_bug\t: %s\n" +"coma_bug\t: %s\n" +"fpu\t\t: %s\n" +"fpu_exception\t: %s\n" +"cpuid level\t: %d\n" +"wp\t\t: %s\n" , + c->fdiv_bug ?"yes" :"no" , + c->hlt_works_ok ?"no" :"yes" , + c->f00f_bug ?"yes" :"no" , + c->coma_bug ?"yes" :"no" , + c->hard_math ?"yes" :"no" , + fpu_exception ?"yes" :"no" , + c->cpuid_level, + c->wp_works_ok ?"yes" :"no" ); +} +static int show_cpuinfo (struct seq_file *m,void *v) {struct cpuinfo_x86 *c = v; -int i, n =0 ; -int fpu_exception; +unsigned int cpu =0 ; +int i;#ifdef CONFIG_SMP - n = c->cpu_index; + cpu = c->cpu_index;#endif -seq_printf (m,"processor\t: %d\n" -"vendor_id\t: %s\n" -"cpu family\t: %d\n" -"model\t\t: %d\n" -"model name\t: %s\n" , - n, - c->x86_vendor_id[0 ] ? c->x86_vendor_id :"unknown" , - c->x86, - c->x86_model, - c->x86_model_id[0 ] ? c->x86_model_id :"unknown" ); +seq_printf (m,"processor\t: %u\n" +"vendor_id\t: %s\n" +"cpu family\t: %d\n" +"model\t\t: %u\n" +"model name\t: %s\n" , + cpu, + c->x86_vendor_id[0 ] ? c->x86_vendor_id :"unknown" , + c->x86, + c->x86_model, + c->x86_model_id[0 ] ? c->x86_model_id :"unknown" );if (c->x86_mask || c->cpuid_level >=0 )seq_printf (m,"stepping\t: %d\n" , c->x86_mask);else seq_printf (m,"stepping\t: unknown\n" ); -if (cpu_has (c,X86_FEATURE_TSC ) ) { -unsigned int freq =cpufreq_quick_get (n); +if (cpu_has (c,X86_FEATURE_TSC )) { +unsigned int freq =cpufreq_quick_get (cpu); +if (!freq) freq = cpu_khz;seq_printf (m,"cpu MHz\t\t: %u.%03u\n" , - freq /1000 , (freq %1000 )); + freq /1000 , (freq %1000 )); }/* Cache size */ if (c->x86_cache_size >=0 )seq_printf (m,"cache size\t: %d KB\n" , c->x86_cache_size); -#ifdef CONFIG_X86_HT -if (c->x86_max_cores * smp_num_siblings >1 ) { -seq_printf (m,"physical id\t: %d\n" , c->phys_proc_id); -seq_printf (m,"siblings\t: %d\n" , -cpus_weight (per_cpu (cpu_core_map, n))); -seq_printf (m,"core id\t\t: %d\n" , c->cpu_core_id); -seq_printf (m,"cpu cores\t: %d\n" , c->booted_cores); - } -#endif - -/* We use exception 16 if we have hardware math and we've either seen it or the CPU claims it is internal */ - fpu_exception = c->hard_math && (ignore_fpu_irq || cpu_has_fpu); -seq_printf (m,"fdiv_bug\t: %s\n" -"hlt_bug\t\t: %s\n" -"f00f_bug\t: %s\n" -"coma_bug\t: %s\n" -"fpu\t\t: %s\n" -"fpu_exception\t: %s\n" -"cpuid level\t: %d\n" -"wp\t\t: %s\n" -"flags\t\t:" , - c->fdiv_bug ?"yes" :"no" , - c->hlt_works_ok ?"no" :"yes" , - c->f00f_bug ?"yes" :"no" , - c->coma_bug ?"yes" :"no" , - c->hard_math ?"yes" :"no" , - fpu_exception ?"yes" :"no" , - c->cpuid_level, - c->wp_works_ok ?"yes" :"no" ); - -for ( i =0 ; i <32 *NCAPINTS ; i++ ) -if (test_bit (i, c->x86_capability) && - x86_cap_flags[i] !=NULL ) + +show_cpuinfo_core (m, c, cpu); +show_cpuinfo_misc (m, c); + +seq_printf (m,"flags\t\t:" ); +for (i =0 ; i <32 *NCAPINTS ; i++) +if (cpu_has (c, i) && x86_cap_flags[i] !=NULL )seq_printf (m," %s" , x86_cap_flags[i]);for (i =0 ; i <32 ; i++)
@@ -91,8 +106,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) }seq_printf (m,"\nbogomips\t: %lu.%02lu\n" , - c->loops_per_jiffy/(500000 /HZ ), - (c->loops_per_jiffy/(5000 /HZ )) %100 ); + c->loops_per_jiffy/(500000 /HZ ), + (c->loops_per_jiffy/(5000 /HZ )) %100 );seq_printf (m,"clflush size\t: %u\n\n" , c->x86_clflush_size);return 0 ;
@@ -106,14 +121,17 @@ static void *c_start(struct seq_file *m, loff_t *pos)return &cpu_data (*pos);return NULL ; } +static void *c_next (struct seq_file *m,void *v,loff_t *pos) { *pos =next_cpu (*pos, cpu_online_map);return c_start (m, pos); } +static void c_stop (struct seq_file *m,void *v) { } +const struct seq_operations cpuinfo_op = { .start = c_start, .next = c_next,
arch/x86/kernel/cpu/proc_64.c +36 -27
100 lines not on this page · raw message
Signature · 1 line
1.5.3.8
PATCH 3/5 x86_32: add power management line in /proc/cpuinfo
In reply to Hiroshi ShimamotoFrom: Hiroshi Shimamoto <[email protected]>
Change /proc/cpuinfo. It will look like x86_64's. 'power management' line is added and power management information will be printed at the line.
--- arch/x86/kernel/cpu/proc.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/proc.c +9 -5
@@ -94,7 +94,13 @@ static int show_cpuinfo(struct seq_file *m, void *v)if (cpu_has (c, i) && x86_cap_flags[i] !=NULL )seq_printf (m," %s" , x86_cap_flags[i]); -for (i =0 ; i <32 ; i++) +seq_printf (m,"\nbogomips\t: %lu.%02lu\n" , + c->loops_per_jiffy/(500000 /HZ ), + (c->loops_per_jiffy/(5000 /HZ )) %100 ); +seq_printf (m,"clflush size\t: %u\n" , c->x86_clflush_size); + +seq_printf (m,"power management:" ); +for (i =0 ; i <32 ; i++) {if (c->x86_power & (1 << i)) {if (i <ARRAY_SIZE (x86_power_flags) && x86_power_flags[i])
@@ -104,11 +110,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)else seq_printf (m," [%d]" , i); } + } -seq_printf (m,"\nbogomips\t: %lu.%02lu\n" , - c->loops_per_jiffy/(500000 /HZ ), - (c->loops_per_jiffy/(5000 /HZ )) %100 ); -seq_printf (m,"clflush size\t: %u\n\n" , c->x86_clflush_size); +seq_printf (m,"\n\n" );return 0 ; }
Signature · 1 line
1.5.3.8
PATCH 4/5 x86: cosmetic unification cpu/proc|_64.c
In reply to Hiroshi ShimamotoFrom: Hiroshi Shimamoto <[email protected]>
make cpu/proc.c and cpu/proc_64.c same.
--- arch/x86/kernel/cpu/proc.c | 36 ++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/proc_64.c | 49 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/proc.c +36 -0
@@ -8,6 +8,7 @@/* * Get CPU information for use by the procfs. */ +#ifdef CONFIG_X86_32 static void show_cpuinfo_core (struct seq_file *m,struct cpuinfo_x86 *c,unsigned int cpu) {
@@ -47,6 +48,31 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c) c->cpuid_level, c->wp_works_ok ? "yes" : "no"); } +#else +static void show_cpuinfo_core (struct seq_file *m,struct cpuinfo_x86 *c, +unsigned int cpu) +{ +#ifdef CONFIG_SMP +if (c->x86_max_cores * smp_num_siblings >1 ) { +seq_printf (m,"physical id\t: %d\n" , c->phys_proc_id); +seq_printf (m,"siblings\t: %d\n" , +cpus_weight (per_cpu (cpu_core_map, cpu))); +seq_printf (m,"core id\t\t: %d\n" , c->cpu_core_id); +seq_printf (m,"cpu cores\t: %d\n" , c->booted_cores); + } +#endif +} + +static void show_cpuinfo_misc (struct seq_file *m,struct cpuinfo_x86 *c) +{ +seq_printf (m, +"fpu\t\t: yes\n" +"fpu_exception\t: yes\n" +"cpuid level\t: %d\n" +"wp\t\t: yes\n" , + c->cpuid_level); +} +#endif static int show_cpuinfo (struct seq_file *m,void *v) {
@@ -97,7 +123,17 @@ static int show_cpuinfo(struct seq_file *m, void *v)seq_printf (m,"\nbogomips\t: %lu.%02lu\n" , c->loops_per_jiffy/(500000 /HZ ), (c->loops_per_jiffy/(5000 /HZ )) %100 ); + +#ifdef CONFIG_X86_64 +if (c->x86_tlbsize >0 ) +seq_printf (m,"TLB size\t: %d 4K pages\n" , c->x86_tlbsize); +#endif seq_printf (m,"clflush size\t: %u\n" , c->x86_clflush_size); +#ifdef CONFIG_X86_64 +seq_printf (m,"cache_alignment\t: %d\n" , c->x86_cache_alignment); +seq_printf (m,"address sizes\t: %u bits physical, %u bits virtual\n" , + c->x86_phys_bits, c->x86_virt_bits); +#endif seq_printf (m,"power management:" );for (i =0 ; i <32 ; i++) {
arch/x86/kernel/cpu/proc_64.c +47 -2
72 lines not on this page · raw message
Signature · 1 line
1.5.3.8
PATCH 5/5 x86: unify cpu/proc|_64.c
In reply to Hiroshi ShimamotoFrom: Hiroshi Shimamoto <[email protected]>
Now cpu/proc.c and cpu/proc_64.c are same.
So cpu/proc_64.c can be removed.
--- arch/x86/kernel/cpu/Makefile | 5 +- arch/x86/kernel/cpu/proc_64.c | 180 ----------------------------------------- 2 files changed, 2 insertions(+), 183 deletions(-) delete mode 100644 arch/x86/kernel/cpu/proc_64.c
arch/x86/kernel/cpu/Makefile +2 -3
@@ -3,9 +3,9 @@ # obj-y := intel_cacheinfo.o addon_cpuid_features.o -obj-y += feature_names.o +obj-y += proc.o feature_names.o -obj-$(CONFIG_X86_32) += common.o proc.o bugs.o +obj-$(CONFIG_X86_32) += common.o bugs.o obj-$(CONFIG_X86_32) += amd.o obj-$(CONFIG_X86_32) += cyrix.o obj-$(CONFIG_X86_32) += centaur.o
@@ -13,7 +13,6 @@ obj-$(CONFIG_X86_32) += transmeta.o obj-$(CONFIG_X86_32) += intel.o obj-$(CONFIG_X86_32) += nexgen.o obj-$(CONFIG_X86_32) += umc.o -obj-$(CONFIG_X86_64) += proc_64.o obj-$(CONFIG_X86_MCE) += mcheck/ obj-$(CONFIG_MTRR) += mtrr/
arch/x86/kernel/cpu/proc_64.c deleted +0 -180
180 lines not on this page · raw message
Signature · 1 line
1.5.3.8
Re: [PATCH 5/5] x86: unify cpu/proc|_64.c
Quoted 4 lines · Hiroshi Shimamoto
From: Hiroshi Shimamoto <[email protected]>
Now
cpu/proc.candcpu/proc_64.care same.
Socpu/proc_64.ccan be removed.
thanks Hiroshi, very nicely done! I've applied all 5 patches.
Ingo