x86: order functions in cpu/common.c and cpu/common_64.c v2
PATCH 1/5 x86: order functions in cpu/common.c and cpu/common_64.c v2
v2: make 64 bit get c->x86_cache_alignment = c->x86_clfush_size
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/cpu/common.c | 190 ++++++++++++++++++++++------------------ arch/x86/kernel/cpu/common_64.c | 106 ++++++++++------------ 2 files changed, 156 insertions(+), 140 deletions(-)
arch/x86/kernel/cpu/common.c +105 -85
@@ -60,6 +60,18 @@ EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);__u32 cleared_cpu_caps[NCAPINTS ]__cpuinitdata ; +/* Current gdt points %fs at the "master" per-cpu area: after this, +* it's on the real one. */ +void switch_to_new_gdt (void ) +{ +struct desc_ptr gdt_descr; + + gdt_descr.address = (long )get_cpu_gdt_table (smp_processor_id ()); + gdt_descr.size =GDT_SIZE -1 ; +load_gdt (&gdt_descr); + asm("mov %0, %%fs" : :"r" (__KERNEL_PERCPU) :"memory" ); +} +static int cachesize_override__cpuinitdata =-1 ;static int disable_x86_serial_nr__cpuinitdata =1 ;
@@ -123,15 +135,15 @@ int __cpuinit get_model_name(struct cpuivoid __cpuinit display_cacheinfo (struct cpuinfo_x86 *c) { -unsigned int n, dummy, ecx, edx, l2size; +unsigned int n, dummy, ebx, ecx, edx, l2size; n = c->extended_cpuid_level;if (n >=0x80000005 ) { -cpuid (0x80000005 , &dummy, &dummy, &ecx, &edx); +cpuid (0x80000005 , &dummy, &ebx, &ecx, &edx);printk (KERN_INFO "CPU: L1 I Cache: %dK (%d bytes/line), D cache %dK (%d bytes/line)\n" , - edx>>24 , edx&0xFF , ecx>>24 , ecx&0xFF ); - c->x86_cache_size = (ecx>>24 )+(edx>>24 ); + edx>>24 , edx&0xFF , ecx>>24 , ecx&0xFF ); + c->x86_cache_size = (ecx>>24 ) + (edx>>24 ); }if (n <0x80000006 )/* Some chips just has a large L1. */
@@ -185,6 +197,51 @@ static char __cpuinit *table_lookup_modereturn NULL ;/* Not found */ } +#ifdef CONFIG_X86_HT +void __cpuinit detect_ht (struct cpuinfo_x86 *c) +{ +u32 eax, ebx, ecx, edx; +int index_msb, core_bits; + +cpuid (1 , &eax, &ebx, &ecx, &edx); + +if (!cpu_has (c,X86_FEATURE_HT ) ||cpu_has (c,X86_FEATURE_CMP_LEGACY )) +return ; + + smp_num_siblings = (ebx &0xff0000 ) >>16 ; + +if (smp_num_siblings ==1 ) { +printk (KERN_INFO "CPU: Hyper-Threading is disabled\n" ); + }else if (smp_num_siblings >1 ) { + +if (smp_num_siblings >NR_CPUS ) { +printk (KERN_WARNING "CPU: Unsupported number of siblings %d" , + smp_num_siblings); + smp_num_siblings =1 ; +return ; + } + + index_msb =get_count_order (smp_num_siblings); + c->phys_proc_id =phys_pkg_id (c->initial_apicid, index_msb); + +printk (KERN_INFO "CPU: Physical Processor ID: %d\n" , + c->phys_proc_id); + + smp_num_siblings = smp_num_siblings / c->x86_max_cores; + + index_msb =get_count_order (smp_num_siblings); + + core_bits =get_count_order (c->x86_max_cores); + + c->cpu_core_id =phys_pkg_id (c->initial_apicid, index_msb) & + ((1 << core_bits) -1 ); + +if (c->x86_max_cores >1 ) +printk (KERN_INFO "CPU: Processor Core ID: %d\n" , + c->cpu_core_id); + } +} +#endif static void __cpuinit get_cpu_vendor (struct cpuinfo_x86 *c) {
@@ -258,7 +315,26 @@ static int __cpuinit have_cpuid_p(void)return flag_is_changeable_p (X86_EFLAGS_ID ); } -void __init cpu_detect (struct cpuinfo_x86 *c) +static void __init early_cpu_support_print (void ) +{ +int i,j; +struct cpu_dev *cpu_devx; + +printk ("KERNEL supported cpus:\n" ); +for (i =0 ; i <X86_VENDOR_NUM ; i++) { + cpu_devx = cpu_devs[i]; +if (!cpu_devx) +continue ; +for (j =0 ; j <2 ; j++) { +if (!cpu_devx->c_ident[j]) +continue ; +printk (" %s %s\n" , cpu_devx->c_vendor, + cpu_devx->c_ident[j]); + } + } +} + +void __cpuinit cpu_detect (struct cpuinfo_x86 *c) {/* Get vendor name */ cpuid(0x00000000, (unsigned int *)&c->cpuid_level,
@@ -267,19 +343,20 @@ void __init cpu_detect(struct cpuinfo_x8 (unsigned int *)&c->x86_vendor_id[4]); c->x86 =4 ; +/* Intel-defined flags: level 0x00000001 */ if (c->cpuid_level >=0x00000001 ) {u32 junk, tfms, cap0, misc;cpuid (0x00000001 , &tfms, &misc, &junk, &cap0); - c->x86 = (tfms >>8 ) &15 ; - c->x86_model = (tfms >>4 ) &15 ; + c->x86 = (tfms >>8 ) &0xf ; + c->x86_model = (tfms >>4 ) &0xf ; + c->x86_mask = tfms &0xf ;if (c->x86 ==0xf ) c->x86 += (tfms >>20 ) &0xff ;if (c->x86 >=0x6 ) - c->x86_model += ((tfms >>16 ) &0xF ) <<4 ; - c->x86_mask = tfms &15 ; + c->x86_model += ((tfms >>16 ) &0xf ) <<4 ;if (cap0 & (1 <<19 )) { - c->x86_cache_alignment = ((misc >>8 ) &0xff ) *8 ; c->x86_clflush_size = ((misc >>8 ) &0xff ) *8 ; + c->x86_cache_alignment = c->x86_clflush_size; } } }
@@ -341,6 +418,17 @@ static void __init early_identify_cpu(stvalidate_pat_support (c); } +void __init early_cpu_init (void ) +{ +struct cpu_vendor_dev *cvdev; + +for (cvdev = __x86cpuvendor_start; cvdev < __x86cpuvendor_end; cvdev++) + cpu_devs[cvdev->vendor] = cvdev->cpu_dev; + +early_cpu_support_print (); +early_identify_cpu (&boot_cpu_data); +} +/* * The NOPL instruction is supposed to exist on all CPUs with * family >= 6, unfortunately, that's not true in practice because
@@ -500,7 +588,7 @@ static void __cpuinit identify_cpu(struc*/ if (c != &boot_cpu_data) {/* AND the already accumulated flags with these */ -for (i =0 ; i <NCAPINTS ; i++) +for (i =0 ; i <NCAPINTS ; i++) boot_cpu_data.x86_capability[i] &= c->x86_capability[i]; }
@@ -529,52 +617,6 @@ void __cpuinit identify_secondary_cpu(stmtrr_ap_init (); } -#ifdef CONFIG_X86_HT -void __cpuinit detect_ht (struct cpuinfo_x86 *c) -{ -u32 eax, ebx, ecx, edx; -int index_msb, core_bits; - -cpuid (1 , &eax, &ebx, &ecx, &edx); - -if (!cpu_has (c,X86_FEATURE_HT ) ||cpu_has (c,X86_FEATURE_CMP_LEGACY )) -return ; - - smp_num_siblings = (ebx &0xff0000 ) >>16 ; - -if (smp_num_siblings ==1 ) { -printk (KERN_INFO "CPU: Hyper-Threading is disabled\n" ); - }else if (smp_num_siblings >1 ) { - -if (smp_num_siblings >NR_CPUS ) { -printk (KERN_WARNING "CPU: Unsupported number of the " -"siblings %d" , smp_num_siblings); - smp_num_siblings =1 ; -return ; - } - - index_msb =get_count_order (smp_num_siblings); - c->phys_proc_id =phys_pkg_id (c->initial_apicid, index_msb); - -printk (KERN_INFO "CPU: Physical Processor ID: %d\n" , - c->phys_proc_id); - - smp_num_siblings = smp_num_siblings / c->x86_max_cores; - - index_msb =get_count_order (smp_num_siblings) ; - - core_bits =get_count_order (c->x86_max_cores); - - c->cpu_core_id =phys_pkg_id (c->initial_apicid, index_msb) & - ((1 << core_bits) -1 ); - -if (c->x86_max_cores >1 ) -printk (KERN_INFO "CPU: Processor Core ID: %d\n" , - c->cpu_core_id); - } -} -#endif -static __init int setup_noclflush (char *arg) {setup_clear_cpu_cap (X86_FEATURE_CLFLSH );
@@ -592,17 +634,17 @@ void __cpuinit print_cpu_info(struct cpu vendor = c->x86_vendor_id;if (vendor &&strncmp (c->x86_model_id, vendor,strlen (vendor))) -printk ("%s " , vendor); +printk (KERN_CONT "%s " , vendor); -if (!c->x86_model_id[0 ]) -printk ("%d86" , c->x86); +if (c->x86_model_id[0 ]) +printk (KERN_CONT "%s" , c->x86_model_id);else -printk ("%s" , c->x86_model_id); +printk (KERN_CONT "%d86" , c->x86);if (c->x86_mask || c->cpuid_level >=0 ) -printk (" stepping %02x\n" , c->x86_mask); +printk (KERN_CONT " stepping %02x\n" , c->x86_mask);else -printk ("\n" ); +printk (KERN_CONT "\n" ); }static __init int setup_disablecpuid (char *arg)
@@ -618,16 +660,6 @@ __setup("clearcpuid=", setup_disablecpuicpumask_t cpu_initialized__cpuinitdata =CPU_MASK_NONE ; -void __init early_cpu_init (void ) -{ -struct cpu_vendor_dev *cvdev; - -for (cvdev = __x86cpuvendor_start; cvdev < __x86cpuvendor_end; cvdev++) - cpu_devs[cvdev->vendor] = cvdev->cpu_dev; - -early_identify_cpu (&boot_cpu_data); -} -/* Make sure %fs is initialized properly in idle threads */ struct pt_regs *__cpuinit idle_regs (struct pt_regs *regs) {
@@ -636,18 +668,6 @@ struct pt_regs * __cpuinit idle_regs(strreturn regs; } -/* Current gdt points %fs at the "master" per-cpu area: after this, -* it's on the real one. */ -void switch_to_new_gdt (void ) -{ -struct desc_ptr gdt_descr; - - gdt_descr.address = (long )get_cpu_gdt_table (smp_processor_id ()); - gdt_descr.size =GDT_SIZE -1 ; -load_gdt (&gdt_descr); - asm("mov %0, %%fs" : :"r" (__KERNEL_PERCPU) :"memory" ); -} -/* * cpu_init() initializes state that is per-CPU. Some data is already * initialized (naturally) in the bootstrap process, such as the GDT
arch/x86/kernel/cpu/common_64.c +51 -55
173 lines not on this page · raw message
PATCH 2/5 x86: remove cpu_vendor_dev
1. add c_x86_vendor into cpu_dev
2. change cpu_devs to static
3. check c_x86_vendor before put that cpu_dev into array
4. remove alignment for 64bit
5. order the sequence in cpu_devs according to link sequence... so could put intel at first, then amd...
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/cpu/Makefile | 4 +- arch/x86/kernel/cpu/amd.c | 3 + arch/x86/kernel/cpu/amd_64.c | 4 +- arch/x86/kernel/cpu/centaur.c | 3 + arch/x86/kernel/cpu/centaur_64.c | 3 + arch/x86/kernel/cpu/common.c | 71 +++++++++++++++++++-------------------- arch/x86/kernel/cpu/common_64.c | 71 +++++++++++++++++++-------------------- arch/x86/kernel/cpu/cpu.h | 18 +++------ arch/x86/kernel/cpu/cyrix.c | 6 ++- arch/x86/kernel/cpu/intel.c | 3 + arch/x86/kernel/cpu/intel_64.c | 3 + arch/x86/kernel/cpu/transmeta.c | 3 + arch/x86/kernel/cpu/umc.c | 3 + arch/x86/kernel/vmlinux_32.lds.S | 8 ++-- arch/x86/kernel/vmlinux_64.lds.S | 9 ++-- 15 files changed, 106 insertions(+), 106 deletions(-)
arch/x86/kernel/cpu/amd.c +2 -1
@@ -298,6 +298,7 @@ static struct cpu_dev amd_cpu_dev __cpui .c_early_init = early_init_amd, .c_init = init_amd, .c_size_cache = amd_size_cache, + .c_x86_vendor = X86_VENDOR_AMD, }; -cpu_vendor_dev_register (X86_VENDOR_AMD , &amd_cpu_dev); +cpu_dev_register (amd_cpu_dev);
arch/x86/kernel/cpu/amd_64.c +2 -2
@@ -218,7 +218,7 @@ static struct cpu_dev amd_cpu_dev __cpui .c_ident = { "AuthenticAMD" }, .c_early_init = early_init_amd, .c_init = init_amd, + .c_x86_vendor =X86_VENDOR_AMD , }; -cpu_vendor_dev_register (X86_VENDOR_AMD , &amd_cpu_dev); - +cpu_dev_register (amd_cpu_dev);
arch/x86/kernel/cpu/centaur.c +2 -1
@@ -475,6 +475,7 @@ static struct cpu_dev centaur_cpu_dev __ .c_early_init = early_init_centaur, .c_init = init_centaur, .c_size_cache = centaur_size_cache, + .c_x86_vendor = X86_VENDOR_CENTAUR, }; -cpu_vendor_dev_register (X86_VENDOR_CENTAUR , ¢aur_cpu_dev); +cpu_dev_register (centaur_cpu_dev);
arch/x86/kernel/cpu/centaur_64.c +2 -1
@@ -29,7 +29,8 @@ static struct cpu_dev centaur_cpu_dev __ .c_ident = { "CentaurHauls" }, .c_early_init = early_init_centaur, .c_init = init_centaur, + .c_x86_vendor =X86_VENDOR_CENTAUR , }; -cpu_vendor_dev_register (X86_VENDOR_CENTAUR , ¢aur_cpu_dev); +cpu_dev_register (centaur_cpu_dev);
arch/x86/kernel/cpu/common.c +35 -36
117 lines not on this page · raw message
arch/x86/kernel/cpu/common_64.c +35 -36
115 lines not on this page · raw message
arch/x86/kernel/cpu/cpu.h +6 -12
@@ -21,21 +21,15 @@ struct cpu_dev {void (*c_init)(struct cpuinfo_x86 * c);void (*c_identify)(struct cpuinfo_x86 * c);unsigned int (*c_size_cache)(struct cpuinfo_x86 * c,unsigned int size); +int c_x86_vendor; }; -extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM ]; +#define cpu_dev_register (cpu_devX) \ + static struct cpu_dev *__cpu_dev_##cpu_devX __used \ + __attribute__((__section__(".x86_cpu_dev.init"))) = \ + &cpu_devX; -struct cpu_vendor_dev { -int vendor; -struct cpu_dev *cpu_dev; -}; - -#define cpu_vendor_dev_register (cpu_vendor_id, cpu_dev) \ - static struct cpu_vendor_dev __cpu_vendor_dev_##cpu_vendor_id __used \ - __attribute__((__section__(".x86cpuvendor.init"))) = \ - { cpu_vendor_id, cpu_dev } - -extern struct cpu_vendor_dev __x86cpuvendor_start[], __x86cpuvendor_end[]; +extern struct cpu_dev *__x86_cpu_dev_start[], *__x86_cpu_dev_end[];extern int get_model_name (struct cpuinfo_x86 *c);extern void display_cacheinfo (struct cpuinfo_x86 *c);
arch/x86/kernel/cpu/cyrix.c +4 -2
@@ -442,14 +442,16 @@ static struct cpu_dev cyrix_cpu_dev __cp .c_early_init = early_init_cyrix, .c_init = init_cyrix, .c_identify = cyrix_identify, + .c_x86_vendor = X86_VENDOR_CYRIX, }; -cpu_vendor_dev_register (X86_VENDOR_CYRIX , &cyrix_cpu_dev); +cpu_dev_register (cyrix_cpu_dev);static struct cpu_dev nsc_cpu_dev__cpuinitdata = { .c_vendor ="NSC" , .c_ident = {"Geode by NSC" }, .c_init = init_nsc, + .c_x86_vendor =X86_VENDOR_NSC , }; -cpu_vendor_dev_register (X86_VENDOR_NSC , &nsc_cpu_dev); +cpu_dev_register (nsc_cpu_dev);
arch/x86/kernel/cpu/intel.c +2 -1
@@ -311,9 +311,10 @@ static struct cpu_dev intel_cpu_dev __cp .c_early_init = early_init_intel, .c_init = init_intel, .c_size_cache = intel_size_cache, + .c_x86_vendor = X86_VENDOR_INTEL, }; -cpu_vendor_dev_register (X86_VENDOR_INTEL , &intel_cpu_dev); +cpu_dev_register (intel_cpu_dev);/* arch_initcall(intel_cpu_init); */
arch/x86/kernel/cpu/intel_64.c +2 -1
@@ -93,6 +93,7 @@ static struct cpu_dev intel_cpu_dev __cp .c_ident = { "GenuineIntel" }, .c_early_init = early_init_intel, .c_init = init_intel, + .c_x86_vendor =X86_VENDOR_INTEL , }; -cpu_vendor_dev_register (X86_VENDOR_INTEL , &intel_cpu_dev); +cpu_dev_register (intel_cpu_dev);
arch/x86/kernel/cpu/transmeta.c +2 -1
@@ -102,6 +102,7 @@ static struct cpu_dev transmeta_cpu_dev .c_ident = { "GenuineTMx86", "TransmetaCPU" }, .c_init = init_transmeta, .c_identify = transmeta_identify, + .c_x86_vendor = X86_VENDOR_TRANSMETA, }; -cpu_vendor_dev_register (X86_VENDOR_TRANSMETA , &transmeta_cpu_dev); +cpu_dev_register (transmeta_cpu_dev);
arch/x86/kernel/cpu/umc.c +2 -1
@@ -19,7 +19,8 @@ static struct cpu_dev umc_cpu_dev __cpui } }, }, + .c_x86_vendor = X86_VENDOR_UMC, }; -cpu_vendor_dev_register (X86_VENDOR_UMC , &umc_cpu_dev); +cpu_dev_register (umc_cpu_dev);
arch/x86/kernel/vmlinux_32.lds.S +4 -4
@@ -140,10 +140,10 @@ SECTIONS *(.con_initcall.init) __con_initcall_end = .; } - .x86cpuvendor.init : AT(ADDR(.x86cpuvendor.init) - LOAD_OFFSET) { - __x86cpuvendor_start = .; - *(.x86cpuvendor.init) - __x86cpuvendor_end = .; + .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { + __x86_cpu_dev_start = .; + *(.x86_cpu_dev.init) + __x86_cpu_dev_end = .; } DYN_ARRAY_INIT(8) SECURITY_INIT
arch/x86/kernel/vmlinux_64.lds.S +4 -5
@@ -168,12 +168,11 @@ SECTIONS *(.con_initcall.init) } __con_initcall_end = .; - . = ALIGN(16); - __x86cpuvendor_start = .; - .x86cpuvendor.init : AT(ADDR(.x86cpuvendor.init) - LOAD_OFFSET) { - *(.x86cpuvendor.init) + __x86_cpu_dev_start = .; + .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { + *(.x86_cpu_dev.init) } - __x86cpuvendor_end = .; + __x86_cpu_dev_end = .; DYN_ARRAY_INIT(8)
arch/x86/kernel/cpu/Makefile +2 -2
@@ -8,14 +8,14 @@ obj-y += proc.o capflags.o powerflags. obj-$(CONFIG_X86_32) += common.o bugs.o cmpxchg.o obj-$(CONFIG_X86_64) += common_64.o bugs_64.o +obj-$(CONFIG_CPU_SUP_INTEL_32) += intel.o +obj-$(CONFIG_CPU_SUP_INTEL_64) += intel_64.o obj-$(CONFIG_CPU_SUP_AMD_32) += amd.o obj-$(CONFIG_CPU_SUP_AMD_64) += amd_64.o obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix.o obj-$(CONFIG_CPU_SUP_CENTAUR_32) += centaur.o obj-$(CONFIG_CPU_SUP_CENTAUR_64) += centaur_64.o obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o -obj-$(CONFIG_CPU_SUP_INTEL_32) += intel.o -obj-$(CONFIG_CPU_SUP_INTEL_64) += intel_64.o obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o obj-$(CONFIG_X86_MCE) += mcheck/
PATCH 3/5 x86: make 32bit support show_msr like 64 bit
In reply to Yinghai LuSigned-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/cpu/common.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
arch/x86/kernel/cpu/common.c +51 -0
@@ -616,6 +616,49 @@ void __cpuinit identify_secondary_cpu(stmtrr_ap_init (); } +struct msr_range { +unsigned min; +unsigned max; +}; + +static struct msr_range msr_range_array[]__cpuinitdata = { + {0x00000000 ,0x00000418 }, + {0xc0000000 ,0xc000040b }, + {0xc0010000 ,0xc0010142 }, + {0xc0011000 ,0xc001103b }, +}; + +static void __cpuinit print_cpu_msr (void ) +{ +unsigned index; +u64 val; +int i; +unsigned index_min, index_max; + +for (i =0 ; i <ARRAY_SIZE (msr_range_array); i++) { + index_min = msr_range_array[i].min; + index_max = msr_range_array[i].max; +for (index = index_min; index < index_max; index++) { +if (rdmsrl_amd_safe (index, &val)) +continue ; +printk (KERN_INFO " MSR%08x: %016llx\n" , index, val); + } + } +} + +static int show_msr__cpuinitdata ; +static __init int setup_show_msr (char *arg) +{ +int num; + +get_option (&arg, &num); + +if (num >0 ) + show_msr = num; +return 1 ; +} +__setup ("show_msr=" , setup_show_msr); +static __init int setup_noclflush (char *arg) {setup_clear_cpu_cap (X86_FEATURE_CLFLSH );
@@ -644,6 +687,14 @@ void __cpuinit print_cpu_info(struct cpuprintk (KERN_CONT " stepping %02x\n" , c->x86_mask); else printk(KERN_CONT "\n"); + +#ifdef CONFIG_SMP +if (c->cpu_index < show_msr) +print_cpu_msr (); +#else +if (show_msr) +print_cpu_msr (); +#endif }static __init int setup_disablecpuid (char *arg)
PATCH 4/5 x86: make get_mode_name of 64bit the same of 32bit
In reply to Yinghai LuSigned-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/cpu/common_64.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/x86/kernel/cpu/common_64.c +14 -0
@@ -83,6 +83,7 @@ static struct cpu_dev *this_cpu __cpuiniint __cpuinit get_model_name (struct cpuinfo_x86 *c) {unsigned int *v; +char *p, *q;if (c->extended_cpuid_level <0x80000004 )return 0 ;
@@ -92,6 +93,19 @@ int __cpuinit get_model_name(struct cpuicpuid (0x80000003 , &v[4 ], &v[5 ], &v[6 ], &v[7 ]);cpuid (0x80000004 , &v[8 ], &v[9 ], &v[10 ], &v[11 ]); c->x86_model_id[48 ] =0 ; + +/* Intel chips right-justify this string for some dumb reason; +undo that brain damage */ + p = q = &c->x86_model_id[0 ]; +while (*p ==' ' ) + p++; +if (p != q) { +while (*p) + *q++ = *p++; +while (q <= &c->x86_model_id[48 ]) + *q++ ='\0' ;/* Zero-pad the rest */ + } +return 1 ; }
PATCH 5/5 x86: move 32bit related func together
In reply to Yinghai LuSigned-off-by Yinghai Lu <[email protected]>
arch/x86/kernel/cpu/common.c +125 -126
@@ -22,6 +22,8 @@#include "cpu.h" +static struct cpu_dev *this_cpu__cpuinitdata ; + DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { [GDT_ENTRY_KERNEL_CS ] = { { {0x0000ffff ,0x00cf9a00 } } }, [GDT_ENTRY_KERNEL_DS ] = { { {0x0000ffff ,0x00cf9200 } } },
@@ -58,6 +60,109 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { } };EXPORT_PER_CPU_SYMBOL_GPL (gdt_page); +static int cachesize_override__cpuinitdata =-1 ; +static int disable_x86_serial_nr__cpuinitdata =1 ; + +static int __init cachesize_setup (char *str) +{ +get_option (&str, &cachesize_override); +return 1 ; +} +__setup ("cachesize=" , cachesize_setup); + +/* +* Naming convention should be: <Name> [(<Codename>)] +* This table only is used unless init_<vendor>() below doesn't set it; +* in particular, if CPUID levels 0x80000002..4 are supported, this isn't used +* +*/ + +/* Look up CPU names by table lookup. */ +static char __cpuinit *table_lookup_model (struct cpuinfo_x86 *c) +{ +struct cpu_model_info *info; + +if (c->x86_model >=16 ) +return NULL ;/* Range check */ + +if (!this_cpu) +return NULL ; + + info = this_cpu->c_models; + +while (info && info->family) { +if (info->family == c->x86) +return info->model_names[c->x86_model]; + info++; + } +return NULL ;/* Not found */ +} + +static int __init x86_fxsr_setup (char *s) +{ +setup_clear_cpu_cap (X86_FEATURE_FXSR ); +setup_clear_cpu_cap (X86_FEATURE_XMM ); +return 1 ; +} +__setup ("nofxsr" , x86_fxsr_setup); + +static int __init x86_sep_setup (char *s) +{ +setup_clear_cpu_cap (X86_FEATURE_SEP ); +return 1 ; +} +__setup ("nosep" , x86_sep_setup); + +/* Standard macro to see if a specific flag is changeable */ +static inline int flag_is_changeable_p (u32 flag) +{ +u32 f1, f2; + + asm("pushfl\n\t" +"pushfl\n\t" +"popl %0\n\t" +"movl %0,%1\n\t" +"xorl %2,%0\n\t" +"pushl %0\n\t" +"popfl\n\t" +"pushfl\n\t" +"popl %0\n\t" +"popfl\n\t" + :"=&r" (f1),"=&r" (f2) + :"ir" (flag)); + +return ((f1^f2) & flag) !=0 ; +} + +/* Probe for the CPUID instruction */ +static int __cpuinit have_cpuid_p (void ) +{ +return flag_is_changeable_p (X86_EFLAGS_ID ); +} + +static void __cpuinit squash_the_stupid_serial_number (struct cpuinfo_x86 *c) +{ +if (cpu_has (c,X86_FEATURE_PN ) && disable_x86_serial_nr) { +/* Disable processor serial number */ +unsigned long lo, hi; +rdmsr (MSR_IA32_BBL_CR_CTL , lo, hi); + lo |=0x200000 ; +wrmsr (MSR_IA32_BBL_CR_CTL , lo, hi); +printk (KERN_NOTICE "CPU serial number disabled.\n" ); +clear_cpu_cap (c,X86_FEATURE_PN ); + +/* Disabling the serial number may affect the cpuid level */ + c->cpuid_level =cpuid_eax (0 ); + } +} + +static int __init x86_serial_nr_setup (char *s) +{ + disable_x86_serial_nr =0 ; +return 1 ; +} +__setup ("serialnumber" , x86_serial_nr_setup); +__u32 cleared_cpu_caps[NCAPINTS ]__cpuinitdata ;/* Current gdt points %fs at the "master" per-cpu area: after this,
@@ -72,9 +177,6 @@ void switch_to_new_gdt(void) asm("mov %0, %%fs" : :"r" (__KERNEL_PERCPU) :"memory" ); } -static int cachesize_override__cpuinitdata =-1 ; -static int disable_x86_serial_nr__cpuinitdata =1 ; -static struct cpu_dev *cpu_devs[X86_VENDOR_NUM ] = {};static void __cpuinit default_init (struct cpuinfo_x86 *c)
@@ -95,14 +197,6 @@ static struct cpu_dev __cpuinitdata default_cpu = { .c_vendor = "Unknown", .c_x86_vendor = X86_VENDOR_UNKNOWN, }; -static struct cpu_dev *this_cpu__cpuinitdata ; - -static int __init cachesize_setup (char *str) -{ -get_option (&str, &cachesize_override); -return 1 ; -} -__setup ("cachesize=" , cachesize_setup);int __cpuinit get_model_name (struct cpuinfo_x86 *c) {
@@ -133,7 +227,6 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c)return 1 ; } -void __cpuinit display_cacheinfo (struct cpuinfo_x86 *c) {unsigned int n, dummy, ebx, ecx, edx, l2size;
@@ -150,7 +243,7 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)if (n <0x80000006 )/* Some chips just has a large L1. */ return ; - ecx =cpuid_ecx (0x80000006 ); +cpuid (0x80000006 , &dummy, &ebx, &ecx, &edx); l2size = ecx >>16 ;/* do processor-specific cache resizing */
@@ -167,48 +260,23 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) c->x86_cache_size = l2size;printk (KERN_INFO "CPU: L2 Cache: %dK (%d bytes/line)\n" , - l2size, ecx &0xFF ); -} - -/* -* Naming convention should be: <Name> [(<Codename>)] -* This table only is used unless init_<vendor>() below doesn't set it; -* in particular, if CPUID levels 0x80000002..4 are supported, this isn't used -* -*/ - -/* Look up CPU names by table lookup. */ -static char __cpuinit *table_lookup_model (struct cpuinfo_x86 *c) -{ -struct cpu_model_info *info; - -if (c->x86_model >=16 ) -return NULL ;/* Range check */ - -if (!this_cpu) -return NULL ; - - info = this_cpu->c_models; - -while (info && info->family) { -if (info->family == c->x86) -return info->model_names[c->x86_model]; - info++; - } -return NULL ;/* Not found */ + l2size, ecx &0xFF ); }#ifdef CONFIG_X86_HT void __cpuinit detect_ht (struct cpuinfo_x86 *c) { -u32 eax, ebx, ecx, edx; -int index_msb, core_bits; - -cpuid (1 , &eax, &ebx, &ecx, &edx); +u32 eax, ebx, ecx, edx; +int index_msb, core_bits; -if (!cpu_has (c,X86_FEATURE_HT ) ||cpu_has (c,X86_FEATURE_CMP_LEGACY )) +if (!cpu_has (c,X86_FEATURE_HT ))return ; +if (cpu_has (c,X86_FEATURE_CMP_LEGACY )) + goto out; + +cpuid (1 , &eax, &ebx, &ecx, &edx); + smp_num_siblings = (ebx &0xff0000 ) >>16 ;if (smp_num_siblings ==1 ) {
@@ -225,8 +293,6 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) index_msb =get_count_order (smp_num_siblings); c->phys_proc_id =phys_pkg_id (c->initial_apicid, index_msb); -printk (KERN_INFO "CPU: Physical Processor ID: %d\n" , - c->phys_proc_id); smp_num_siblings = smp_num_siblings / c->x86_max_cores;
@@ -236,10 +302,14 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) c->cpu_core_id =phys_pkg_id (c->initial_apicid, index_msb) & ((1 << core_bits) - 1); + } -if (c->x86_max_cores >1 ) -printk (KERN_INFO "CPU: Processor Core ID: %d\n" , - c->cpu_core_id); +out: +if ((c->x86_max_cores * smp_num_siblings) >1 ) { +printk (KERN_INFO "CPU: Physical Processor ID: %d\n" , + c->phys_proc_id); +printk (KERN_INFO "CPU: Processor Core ID: %d\n" , + c->cpu_core_id); } }#endif
@@ -273,52 +343,6 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c) this_cpu = &default_cpu; } - -static int __init x86_fxsr_setup (char *s) -{ -setup_clear_cpu_cap (X86_FEATURE_FXSR ); -setup_clear_cpu_cap (X86_FEATURE_XMM ); -return 1 ; -} -__setup ("nofxsr" , x86_fxsr_setup); - - -static int __init x86_sep_setup (char *s) -{ -setup_clear_cpu_cap (X86_FEATURE_SEP ); -return 1 ; -} -__setup ("nosep" , x86_sep_setup); - - -/* Standard macro to see if a specific flag is changeable */ -static inline int flag_is_changeable_p (u32 flag) -{ -u32 f1, f2; - - asm("pushfl\n\t" -"pushfl\n\t" -"popl %0\n\t" -"movl %0,%1\n\t" -"xorl %2,%0\n\t" -"pushl %0\n\t" -"popfl\n\t" -"pushfl\n\t" -"popl %0\n\t" -"popfl\n\t" - :"=&r" (f1),"=&r" (f2) - :"ir" (flag)); - -return ((f1^f2) & flag) !=0 ; -} - - -/* Probe for the CPUID instruction */ -static int __cpuinit have_cpuid_p (void ) -{ -return flag_is_changeable_p (X86_EFLAGS_ID ); -} -void __cpuinit cpu_detect (struct cpuinfo_x86 *c) {/* Get vendor name */
@@ -380,16 +404,16 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)*/ static void __init early_identify_cpu (struct cpuinfo_x86 *c) { - c->x86_cache_alignment =32 ; c->x86_clflush_size =32 ; + c->x86_cache_alignment = c->x86_clflush_size;if (!have_cpuid_p ())return ; - c->extended_cpuid_level =0 ; -memset (&c->x86_capability,0 ,sizeof c->x86_capability); + c->extended_cpuid_level =0 ; +cpu_detect (c);get_cpu_vendor (c);
@@ -487,31 +511,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)detect_nopl (c); } -static void __cpuinit squash_the_stupid_serial_number (struct cpuinfo_x86 *c) -{ -if (cpu_has (c,X86_FEATURE_PN ) && disable_x86_serial_nr) { -/* Disable processor serial number */ -unsigned long lo, hi; -rdmsr (MSR_IA32_BBL_CR_CTL , lo, hi); - lo |=0x200000 ; -wrmsr (MSR_IA32_BBL_CR_CTL , lo, hi); -printk (KERN_NOTICE "CPU serial number disabled.\n" ); -clear_cpu_cap (c,X86_FEATURE_PN ); - -/* Disabling the serial number may affect the cpuid level */ - c->cpuid_level =cpuid_eax (0 ); - } -} - -static int __init x86_serial_nr_setup (char *s) -{ - disable_x86_serial_nr =0 ; -return 1 ; -} -__setup ("serialnumber" , x86_serial_nr_setup); - - -/* * This does the hard work of actually picking apart the CPU stuff... */
arch/x86/kernel/cpu/common_64.c +18 -16
@@ -37,6 +37,8 @@#include "cpu.h" +static struct cpu_dev *this_cpu__cpuinitdata ; +/* We need valid kernel segments for data and code in long mode too * IRET will check the segment types kkeil 2000/10/28 * Also sysret mandates a special GDT layout
@@ -78,7 +80,6 @@ static struct cpu_dev __cpuinitdata default_cpu = { .c_vendor = "Unknown", .c_x86_vendor = X86_VENDOR_UNKNOWN, }; -static struct cpu_dev *this_cpu__cpuinitdata ;int __cpuinit get_model_name (struct cpuinfo_x86 *c) {
@@ -112,7 +113,7 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c)void __cpuinit display_cacheinfo (struct cpuinfo_x86 *c) { -unsigned int n, dummy, ebx, ecx, edx; +unsigned int n, dummy, ebx, ecx, edx, l2size; n = c->extended_cpuid_level;
@@ -125,15 +126,17 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) c->x86_tlbsize =0 ; } -if (n >=0x80000006 ) { -cpuid (0x80000006 , &dummy, &ebx, &ecx, &edx); - ecx =cpuid_ecx (0x80000006 ); - c->x86_cache_size = ecx >>16 ; - c->x86_tlbsize += ((ebx >>16 ) &0xfff ) + (ebx &0xfff ); +if (n <0x80000006 )/* Some chips just has a large L1. */ +return ; -printk (KERN_INFO "CPU: L2 Cache: %dK (%d bytes/line)\n" , - c->x86_cache_size, ecx &0xFF ); - } +cpuid (0x80000006 , &dummy, &ebx, &ecx, &edx); + l2size = ecx >>16 ; + c->x86_tlbsize += ((ebx >>16 ) &0xfff ) + (ebx &0xfff ); + + c->x86_cache_size = l2size; + +printk (KERN_INFO "CPU: L2 Cache: %dK (%d bytes/line)\n" , + l2size, ecx &0xFF ); }void __cpuinit detect_ht (struct cpuinfo_x86 *c)
@@ -145,14 +148,13 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)if (cpu_has (c,X86_FEATURE_XTOPOLOGY ))return ; -cpuid (1 , &eax, &ebx, &ecx, &edx); - -if (!cpu_has (c,X86_FEATURE_HT ))return ;if (cpu_has (c,X86_FEATURE_CMP_LEGACY )) goto out; +cpuid (1 , &eax, &ebx, &ecx, &edx); + smp_num_siblings = (ebx &0xff0000 ) >>16 ;if (smp_num_siblings ==1 ) {
@@ -178,6 +180,7 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) c->cpu_core_id =phys_pkg_id (index_msb) & ((1 << core_bits) -1 ); } + out:if ((c->x86_max_cores * smp_num_siblings) >1 ) { printk(KERN_INFO "CPU: Physical Processor ID: %d\n",
@@ -185,7 +188,6 @@ out:printk (KERN_INFO "CPU: Processor Core ID: %d\n" , c->cpu_core_id); } -#endif }
@@ -408,10 +410,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) c->x86_model = c->x86_mask =0 ;/* So far unknown... */ c->x86_vendor_id[0 ] ='\0' ;/* Unset */ c->x86_model_id[0 ] ='\0' ;/* Unset */ - c->x86_clflush_size =64 ; - c->x86_cache_alignment = c->x86_clflush_size; c->x86_max_cores =1 ; c->x86_coreid_bits =0 ; + c->x86_clflush_size =64 ; + c->x86_cache_alignment = c->x86_clflush_size;memset (&c->x86_capability,0 ,sizeof c->x86_capability);generic_identify (c);