x86: make detect_ht depends on X86_HT
PATCH 1/16 x86: make detect_ht depends on X86_HT
64bit has X86_HT set too, so use that instead of SMP
--- arch/x86/kernel/cpu/common.c | 4 ++-- arch/x86/kernel/cpu/common_64.c | 2 +- include/asm-x86/processor.h | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/common.c +2 -2
@@ -263,9 +263,9 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) l2size, ecx & 0xFF); } -#ifdef CONFIG_X86_HT void __cpuinit detect_ht (struct cpuinfo_x86 *c) { +#ifdef CONFIG_X86_HT u32 eax, ebx, ecx, edx;int index_msb, core_bits;
@@ -311,8 +311,8 @@ out:printk (KERN_INFO "CPU: Processor Core ID: %d\n" , c->cpu_core_id); } -}#endif +}static void __cpuinit get_cpu_vendor (struct cpuinfo_x86 *c) {
arch/x86/kernel/cpu/common_64.c +1 -1
@@ -141,7 +141,7 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)void __cpuinit detect_ht (struct cpuinfo_x86 *c) { -#ifdef CONFIG_SMP +#ifdef CONFIG_X86_HT u32 eax, ebx, ecx, edx;int index_msb, core_bits;
include/asm-x86/processor.h +0 -4
@@ -167,11 +167,7 @@ extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);extern unsigned short num_cache_leaves;extern void detect_extended_topology (struct cpuinfo_x86 *c); -#if defined(CONFIG_X86_HT ) || defined(CONFIG_X86_64 )extern void detect_ht (struct cpuinfo_x86 *c); -#else -static inline void detect_ht (struct cpuinfo_x86 *c) {} -#endif static inline void native_cpuid (unsigned int *eax,unsigned int *ebx,unsigned int *ecx,unsigned int *edx)
Signature · 1 line
1.5.4.5
PATCH 2/16 x86: make header file the same in common_xx.c
--- arch/x86/kernel/cpu/common.c | 22 +++++++++++++++++++--- arch/x86/kernel/cpu/common_64.c | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/common.c +19 -3
@@ -1,25 +1,41 @@#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/sched.h> #include <linux/string.h> +#include <linux/bootmem.h> +#include <linux/bitops.h> +#include <linux/module.h> +#include <linux/kgdb.h> +#include <linux/topology.h> #include <linux/delay.h> #include <linux/smp.h> -#include <linux/module.h> #include <linux/percpu.h> -#include <linux/bootmem.h> -#include <asm/processor.h> #include <asm/i387.h> #include <asm/msr.h> #include <asm/io.h> +#include <asm/linkage.h> #include <asm/mmu_context.h> #include <asm/mtrr.h> #include <asm/mce.h> #include <asm/pat.h> #include <asm/asm.h> +#include <asm/numa.h> #ifdef CONFIG_X86_LOCAL_APIC #include <asm/mpspec.h> #include <asm/apic.h> #include <mach_apic.h> +#include <asm/genapic.h> #endif +#include <asm/pda.h> +#include <asm/pgtable.h> +#include <asm/processor.h> +#include <asm/desc.h> +#include <asm/atomic.h> +#include <asm/proto.h> +#include <asm/sections.h> +#include <asm/setup.h> +#include "cpu.h" static struct cpu_dev *this_cpu__cpuinitdata ;
arch/x86/kernel/cpu/common_64.c +1 -1
@@ -24,6 +24,7 @@#include <asm/mpspec.h> #include <asm/apic.h> #include <mach_apic.h> +#include <asm/genapic.h> #endif #include <asm/pda.h> #include <asm/pgtable.h>
@@ -33,7 +34,6 @@#include <asm/proto.h> #include <asm/sections.h> #include <asm/setup.h> -#include <asm/genapic.h> #include "cpu.h"
Signature · 1 line
1.5.4.5
PATCH 3/16 x86: same gdt_page with marco
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 17 +++++++++++++++++ arch/x86/kernel/cpu/common_64.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/common.c +17 -0
@@ -40,6 +40,22 @@static struct cpu_dev *this_cpu__cpuinitdata ; +#ifdef CONFIG_X86_64 +/* 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 + */ +/* The TLS descriptors are currently at a different place compared to i386. + Hopefully nobody expects them at a fixed place (Wine?) */ +DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = { + [GDT_ENTRY_KERNEL32_CS] = { { { 0x0000ffff, 0x00cf9b00 } } }, + [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00af9b00 } } }, + [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9300 } } }, + [GDT_ENTRY_DEFAULT_USER32_CS] = { { { 0x0000ffff, 0x00cffb00 } } }, + [GDT_ENTRY_DEFAULT_USER_DS] = { { { 0x0000ffff, 0x00cff300 } } }, + [GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00affb00 } } }, +} }; +#else DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00cf9a00 } } }, [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9200 } } },
@@ -74,6 +90,7 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { [GDT_ENTRY_ESPFIX_SS] = { { { 0x00000000, 0x00c09200 } } }, [GDT_ENTRY_PERCPU] = { { { 0x00000000, 0x00000000 } } }, } }; +#endif EXPORT_PER_CPU_SYMBOL_GPL (gdt_page);static int cachesize_override__cpuinitdata =-1 ;
arch/x86/kernel/cpu/common_64.c +37 -0
@@ -39,6 +39,7 @@static struct cpu_dev *this_cpu__cpuinitdata ; +#ifdef CONFIG_X86_64 /* 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
@@ -53,6 +54,42 @@ DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = { [GDT_ENTRY_DEFAULT_USER_DS] = { { { 0x0000ffff, 0x00cff300 } } }, [GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00affb00 } } }, } }; +#else +DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { + [GDT_ENTRY_KERNEL_CS ] = { { {0x0000ffff ,0x00cf9a00 } } }, + [GDT_ENTRY_KERNEL_DS ] = { { {0x0000ffff ,0x00cf9200 } } }, + [GDT_ENTRY_DEFAULT_USER_CS ] = { { {0x0000ffff ,0x00cffa00 } } }, + [GDT_ENTRY_DEFAULT_USER_DS ] = { { {0x0000ffff ,0x00cff200 } } }, +/* +* Segments used for calling PnP BIOS have byte granularity. +* They code segments and data segments have fixed 64k limits, +* the transfer segment sizes are set at run time. +*/ +/* 32-bit code */ + [GDT_ENTRY_PNPBIOS_CS32 ] = { { {0x0000ffff ,0x00409a00 } } }, +/* 16-bit code */ + [GDT_ENTRY_PNPBIOS_CS16 ] = { { {0x0000ffff ,0x00009a00 } } }, +/* 16-bit data */ + [GDT_ENTRY_PNPBIOS_DS ] = { { {0x0000ffff ,0x00009200 } } }, +/* 16-bit data */ + [GDT_ENTRY_PNPBIOS_TS1 ] = { { {0x00000000 ,0x00009200 } } }, +/* 16-bit data */ + [GDT_ENTRY_PNPBIOS_TS2 ] = { { {0x00000000 ,0x00009200 } } }, +/* +* The APM segments have byte granularity and their bases +* are set at run time. All have 64k limits. +*/ +/* 32-bit code */ + [GDT_ENTRY_APMBIOS_BASE ] = { { {0x0000ffff ,0x00409a00 } } }, +/* 16-bit code */ + [GDT_ENTRY_APMBIOS_BASE +1 ] = { { {0x0000ffff ,0x00009a00 } } }, +/* data */ + [GDT_ENTRY_APMBIOS_BASE +2 ] = { { {0x0000ffff ,0x00409200 } } }, + + [GDT_ENTRY_ESPFIX_SS ] = { { {0x00000000 ,0x00c09200 } } }, + [GDT_ENTRY_PERCPU ] = { { {0x00000000 ,0x00000000 } } }, +} }; +#endif EXPORT_PER_CPU_SYMBOL_GPL (gdt_page);__u32 cleared_cpu_caps[NCAPINTS ]__cpuinitdata ;
Signature · 1 line
1.5.4.5
PATCH 4/16 x86: cpu common let 64bit code have 32bit only func
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 8 +++ arch/x86/kernel/cpu/common_64.c | 111 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/common.c +8 -0
@@ -93,6 +93,7 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {#endif EXPORT_PER_CPU_SYMBOL_GPL (gdt_page); +#ifdef CONFIG_X86_32 static int cachesize_override__cpuinitdata =-1 ;static int disable_x86_serial_nr__cpuinitdata =1 ;
@@ -195,6 +196,13 @@ static int __init x86_serial_nr_setup(char *s) return 1; }__setup ("serialnumber" , x86_serial_nr_setup); +#else +/* Probe for the CPUID instruction */ +static inline int have_cpuid_p (void ) +{ +return 1 ; +} +#endif __u32 cleared_cpu_caps[NCAPINTS ]__cpuinitdata ;
arch/x86/kernel/cpu/common_64.c +111 -0
117 lines not on this page · raw message
Signature · 1 line
1.5.4.5
PATCH 5/16 x86: cpu common make 32bit have 64bit only funcs
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 138 +++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/common_64.c | 12 ++++ 2 files changed, 150 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/common.c +138 -0
@@ -750,6 +750,143 @@ __setup("clearcpuid=", setup_disablecpuid);cpumask_t cpu_initialized__cpuinitdata =CPU_MASK_NONE ; +#ifdef CONFIG_X86_64 +struct x8664_pda **_cpu_pda__read_mostly ; +EXPORT_SYMBOL (_cpu_pda); + +struct desc_ptr idt_descr = {256 *16 -1 , (unsigned long ) idt_table }; + +char boot_cpu_stack[IRQSTACKSIZE] __page_aligned_bss; + +unsigned long __supported_pte_mask__read_mostly = ~0UL ; +EXPORT_SYMBOL_GPL (__supported_pte_mask); + +static int do_not_nx__cpuinitdata ; + +/* noexec=on|off +Control non executable mappings for 64bit processes. + +on Enable(default) +off Disable +*/ +static int __init nonx_setup (char *str) +{ +if (!str) +return -EINVAL ; +if (!strncmp (str,"on" ,2 )) { + __supported_pte_mask |= _PAGE_NX; + do_not_nx =0 ; + }else if (!strncmp (str,"off" ,3 )) { + do_not_nx =1 ; + __supported_pte_mask &= ~_PAGE_NX; + } +return 0 ; +} +early_param ("noexec" , nonx_setup); + +int force_personality32; + +/* noexec32=on|off +Control non executable heap for 32bit processes. +To control the stack too use noexec=off + +on PROT_READ does not imply PROT_EXEC for 32bit processes (default) +off PROT_READ implies PROT_EXEC +*/ +static int __init nonx32_setup (char *str) +{ +if (!strcmp (str,"on" )) + force_personality32 &= ~READ_IMPLIES_EXEC ; +else if (!strcmp (str,"off" )) + force_personality32 |=READ_IMPLIES_EXEC ; +return 1 ; +} +__setup ("noexec32=" , nonx32_setup); + +void pda_init (int cpu) +{ +struct x8664_pda *pda =cpu_pda (cpu); + +/* Setup up data that may be needed in __get_free_pages early */ +loadsegment (fs,0 ); +loadsegment (gs,0 ); +/* Memory clobbers used to order PDA accessed */ +mb (); +wrmsrl (MSR_GS_BASE , pda); +mb (); + + pda->cpunumber = cpu; + pda->irqcount =-1 ; + pda->kernelstack = (unsigned long )stack_thread_info () - +PDA_STACKOFFSET +THREAD_SIZE ; + pda->active_mm = &init_mm; + pda->mmu_state =0 ; + +if (cpu ==0 ) { +/* others are initialized in smpboot.c */ + pda->pcurrent = &init_task; + pda->irqstackptr = boot_cpu_stack; + pda->irqstackptr +=IRQSTACKSIZE -64 ; + }else { +if (!pda->irqstackptr) { + pda->irqstackptr = (char *) +__get_free_pages (GFP_ATOMIC ,IRQSTACK_ORDER ); +if (!pda->irqstackptr) +panic ("cannot allocate irqstack for cpu %d" , + cpu); + pda->irqstackptr +=IRQSTACKSIZE -64 ; + } + +if (pda->nodenumber ==0 &&cpu_to_node (cpu) !=NUMA_NO_NODE ) + pda->nodenumber =cpu_to_node (cpu); + } +} + +char boot_exception_stacks[(N_EXCEPTION_STACKS -1 ) *EXCEPTION_STKSZ + + DEBUG_STKSZ] __page_aligned_bss; + +extern asmlinkage void ignore_sysret(void); + +/* May not be marked __init: used by software suspend */ +void syscall_init (void ) +{ +/* +* LSTAR and STAR live in a bit strange symbiosis. +* They both write to the same internal register. STAR allows to +* set CS/DS but only a 32bit target. LSTAR sets the 64bit rip. +*/ +wrmsrl (MSR_STAR , ((u64 )__USER32_CS)<<48 | ((u64 )__KERNEL_CS)<<32 ); +wrmsrl (MSR_LSTAR , system_call); +wrmsrl (MSR_CSTAR , ignore_sysret); + +#ifdef CONFIG_IA32_EMULATION +syscall32_cpu_init (); +#endif + +/* Flags to clear on syscall */ +wrmsrl (MSR_SYSCALL_MASK , +X86_EFLAGS_TF |X86_EFLAGS_DF |X86_EFLAGS_IF |X86_EFLAGS_IOPL ); +} + +void __cpuinit check_efer (void ) +{ +unsigned long efer; + +rdmsrl (MSR_EFER , efer); +if (!(efer &EFER_NX ) || do_not_nx) + __supported_pte_mask &= ~_PAGE_NX; +} + +unsigned long kernel_eflags; + +/* +* Copies of the original ist values from the tss are only accessed during +* debugging, no special alignment required. +*/ +DEFINE_PER_CPU(struct orig_ist, orig_ist); + +#else +/* Make sure %fs is initialized properly in idle threads */ struct pt_regs *__cpuinit idle_regs (struct pt_regs *regs) {
@@ -757,6 +894,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs) regs->fs = __KERNEL_PERCPU; return regs; } +#endif /* * cpu_init() initializes state that is per-CPU. Some data is already
arch/x86/kernel/cpu/common_64.c +12 -0
@@ -704,6 +704,7 @@ __setup("clearcpuid=", setup_disablecpuid);cpumask_t cpu_initialized__cpuinitdata =CPU_MASK_NONE ; +#ifdef CONFIG_X86_64 struct x8664_pda **_cpu_pda__read_mostly ;EXPORT_SYMBOL (_cpu_pda);
@@ -838,6 +839,17 @@ unsigned long kernel_eflags;*/ DEFINE_PER_CPU(struct orig_ist, orig_ist); +#else + +/* Make sure %fs is initialized properly in idle threads */ +struct pt_regs *__cpuinit idle_regs (struct pt_regs *regs) +{ +memset (regs,0 ,sizeof (struct pt_regs )); + regs->fs = __KERNEL_PERCPU; +return regs; +} +#endif +/* * cpu_init() initializes state that is per-CPU. Some data is already * initialized (naturally) in the bootstrap process, such as the GDT
Signature · 1 line
1.5.4.5
PATCH 6/16 x86: cpu commont have same cpu_init with copying and macro
In reply to Yinghai Luhard to merge by lines... will try do it later
--- arch/x86/kernel/cpu/common.c | 124 +++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/common_64.c | 88 +++++++++++++++++++++++++++- 2 files changed, 211 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/common.c +124 -0
@@ -901,7 +901,129 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)* initialized (naturally) in the bootstrap process, such as the GDT * and IDT. We reload them nevertheless, this function acts as a * 'CPU state barrier', nothing should get across. +* A lot of state is already set up in PDA init for 64 bit */ +#ifdef CONFIG_X86_64 +void __cpuinit cpu_init(void) +{ + int cpu = stack_smp_processor_id(); + struct tss_struct *t = &per_cpu(init_tss, cpu); + struct orig_ist *orig_ist = &per_cpu(orig_ist, cpu); + unsigned long v; + char *estacks = NULL; + struct task_struct *me; + int i; + + /* CPU 0 is initialised in head64.c */ + if (cpu != 0) + pda_init(cpu); + else + estacks = boot_exception_stacks; + + me = current; + + if (cpu_test_and_set(cpu, cpu_initialized)) + panic("CPU#%d already initialized!\n", cpu); + + printk(KERN_INFO "Initializing CPU#%d\n", cpu); + + clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE); + + /* + * Initialize the per-CPU GDT with the boot GDT, + * and set up the GDT descriptor: + */ + + switch_to_new_gdt(); + load_idt((const struct desc_ptr *)&idt_descr); + + memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8); + syscall_init(); + + wrmsrl(MSR_FS_BASE, 0); + wrmsrl(MSR_KERNEL_GS_BASE, 0); + barrier(); + + check_efer(); + if (cpu != 0 && x2apic) + enable_x2apic(); + + /* + * set up and load the per-CPU TSS + */ + if (!orig_ist->ist[0]) { + static const unsigned int order[N_EXCEPTION_STACKS] = { + [0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STACK_ORDER, + [DEBUG_STACK - 1] = DEBUG_STACK_ORDER + }; + for (v = 0; v < N_EXCEPTION_STACKS; v++) { + if (cpu) { + estacks = (char *)__get_free_pages(GFP_ATOMIC, order[v]); + if (!estacks) + panic("Cannot allocate exception " + "stack %ld %d\n", v, cpu); + } + estacks += PAGE_SIZE << order[v]; + orig_ist->ist[v] = t->x86_tss.ist[v] = + (unsigned long)estacks; + } + } + + t->x86_tss.io_bitmap_base = offsetof(struct tss_struct, io_bitmap); + /* + * <= is required because the CPU will access up to + * 8 bits beyond the end of the IO permission bitmap. + */ + for (i = 0; i <= IO_BITMAP_LONGS; i++) + t->io_bitmap[i] = ~0UL; + + atomic_inc(&init_mm.mm_count); + me->active_mm = &init_mm; + if (me->mm) + BUG(); + enter_lazy_tlb(&init_mm, me); + + load_sp0(t, ¤t->thread); + set_tss_desc(cpu, t); + load_TR_desc(); + load_LDT(&init_mm.context); + +#ifdef CONFIG_KGDB + /* + * If the kgdb is connected no debug regs should be altered. This + * is only applicable when KGDB and a KGDB I/O module are built + * into the kernel and you are using early debugging with + * kgdbwait. KGDB will control the kernel HW breakpoint registers. + */ + if (kgdb_connected && arch_kgdb_ops.correct_hw_break) + arch_kgdb_ops.correct_hw_break(); + else { +#endif + /* + * Clear all 6 debug registers: + */ + + set_debugreg(0UL, 0); + set_debugreg(0UL, 1); + set_debugreg(0UL, 2); + set_debugreg(0UL, 3); + set_debugreg(0UL, 6); + set_debugreg(0UL, 7); +#ifdef CONFIG_KGDB + /* If the kgdb is connected no debug regs should be altered. */ + } +#endif + + fpu_init(); + + raw_local_save_flags(kernel_eflags); + + if (is_uv_system()) + uv_cpu_init(); +} + +#else + void __cpuinit cpu_init(void) { int cpu = smp_processor_id();
@@ -982,3 +1104,5 @@ void __cpuinit cpu_uninit(void)per_cpu (cpu_tlbstate, cpu).active_mm = &init_mm; }#endif + +#endif
arch/x86/kernel/cpu/common_64.c +87 -1
98 lines not on this page · raw message
Signature · 1 line
1.5.4.5
PATCH 7/16 x86: cpu common merge switch_to_new_gdt
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 2 ++ arch/x86/kernel/cpu/common_64.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/common.c +2 -0
@@ -215,7 +215,9 @@ void switch_to_new_gdt(void) gdt_descr.address = (long )get_cpu_gdt_table (smp_processor_id ()); gdt_descr.size =GDT_SIZE -1 ;load_gdt (&gdt_descr); +#ifdef CONFIG_X86_32 asm("mov %0, %%fs" : :"r" (__KERNEL_PERCPU) :"memory" ); +#endif }static struct cpu_dev *cpu_devs[X86_VENDOR_NUM ] = {};
arch/x86/kernel/cpu/common_64.c +3 -0
@@ -214,6 +214,9 @@ void switch_to_new_gdt(void) gdt_descr.address = (long )get_cpu_gdt_table (smp_processor_id ()); gdt_descr.size =GDT_SIZE -1 ;load_gdt (&gdt_descr); +#ifdef CONFIG_X86_32 + asm("mov %0, %%fs" : :"r" (__KERNEL_PERCPU) :"memory" ); +#endif }static struct cpu_dev *cpu_devs[X86_VENDOR_NUM ] = {};
Signature · 1 line
1.5.4.5
PATCH 8/16 x86: cpu common merge default_init
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 4 ++++ arch/x86/kernel/cpu/common_64.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/common.c +4 -0
@@ -224,6 +224,9 @@ static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};static void __cpuinit default_init (struct cpuinfo_x86 *c) { +#ifdef CONFIG_X86_64 +display_cacheinfo (c); +#else /* Not much we can do here... */ /* Check if at least it has cpuid */ if (c->cpuid_level ==-1 ) {
@@ -233,6 +236,7 @@ static void __cpuinit default_init(struct cpuinfo_x86 *c) else if (c->x86 == 3) strcpy(c->x86_model_id, "386"); } +#endif } static struct cpu_dev __cpuinitdata default_cpu = {
arch/x86/kernel/cpu/common_64.c +12 -0
@@ -223,7 +223,19 @@ static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};static void __cpuinit default_init (struct cpuinfo_x86 *c) { +#ifdef CONFIG_X86_64 display_cacheinfo (c); +#else +/* Not much we can do here... */ +/* Check if at least it has cpuid */ +if (c->cpuid_level ==-1 ) { +/* No cpuid. It must be an ancient CPU */ +if (c->x86 ==4 ) +strcpy (c->x86_model_id,"486" ); +else if (c->x86 ==3 ) +strcpy (c->x86_model_id,"386" ); + } +#endif }static struct cpu_dev __cpuinitdata default_cpu = {
Signature · 1 line
1.5.4.5
PATCH 9/16 x86: cpu common merge display_cacheinfo
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 8 ++++++++ arch/x86/kernel/cpu/common_64.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/common.c +8 -0
@@ -285,6 +285,10 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)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 ); +#ifdef CONFIG_X86_64 +/* On K8 L1 TLB is inclusive, so don't count it */ + c->x86_tlbsize =0 ; +#endif }if (n <0x80000006 )/* Some chips just has a large L1. */
@@ -293,6 +297,9 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)cpuid (0x80000006 , &dummy, &ebx, &ecx, &edx); l2size = ecx >>16 ; +#ifdef CONFIG_X86_64 + c->x86_tlbsize += ((ebx >>16 ) &0xfff ) + (ebx &0xfff ); +#else /* do processor-specific cache resizing */ if (this_cpu->c_size_cache) l2size = this_cpu->c_size_cache (c, l2size);
@@ -303,6 +310,7 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)if (l2size ==0 )return ;/* Again, no L2 cache is possible */ +#endif c->x86_cache_size = l2size;
arch/x86/kernel/cpu/common_64.c +17 -0
@@ -285,8 +285,10 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)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 ); +#ifdef CONFIG_X86_64 /* On K8 L1 TLB is inclusive, so don't count it */ c->x86_tlbsize =0 ; +#endif }if (n <0x80000006 )/* Some chips just has a large L1. */
@@ -294,7 +296,22 @@ void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)cpuid (0x80000006 , &dummy, &ebx, &ecx, &edx); l2size = ecx >>16 ; + +#ifdef CONFIG_X86_64 c->x86_tlbsize += ((ebx >>16 ) &0xfff ) + (ebx &0xfff ); +#else + +/* do processor-specific cache resizing */ +if (this_cpu->c_size_cache) + l2size = this_cpu->c_size_cache (c, l2size); + +/* Allow user to override all this if necessary. */ +if (cachesize_override !=-1 ) + l2size = cachesize_override; + +if (l2size ==0 ) +return ;/* Again, no L2 cache is possible */ +#endif c->x86_cache_size = l2size;
Signature · 1 line
1.5.4.5
PATCH 10/16 x86: cpu common merge detect_ht
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 13 ++++++++++++- arch/x86/kernel/cpu/common_64.c | 9 +++++++++ 2 files changed, 21 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/common.c +12 -1
@@ -330,6 +330,9 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)if (cpu_has (c,X86_FEATURE_CMP_LEGACY )) goto out; +if (cpu_has (c,X86_FEATURE_XTOPOLOGY )) +return ; +cpuid (1 , &eax, &ebx, &ecx, &edx); smp_num_siblings = (ebx &0xff0000 ) >>16 ;
@@ -346,8 +349,11 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) } index_msb =get_count_order (smp_num_siblings); +#ifdef CONFIG_X86_64 + c->phys_proc_id =phys_pkg_id (index_msb); +#else c->phys_proc_id =phys_pkg_id (c->initial_apicid, index_msb); - +#endif smp_num_siblings = smp_num_siblings / c->x86_max_cores;
@@ -355,8 +361,13 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) core_bits =get_count_order (c->x86_max_cores); +#ifdef CONFIG_X86_64 + c->cpu_core_id =phys_pkg_id (index_msb) & + ((1 << core_bits) -1 ); +#else c->cpu_core_id =phys_pkg_id (c->initial_apicid, index_msb) & ((1 << core_bits) -1 ); +#endif } out:
arch/x86/kernel/cpu/common_64.c +9 -0
@@ -349,7 +349,11 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) } index_msb =get_count_order (smp_num_siblings); +#ifdef CONFIG_X86_64 c->phys_proc_id =phys_pkg_id (index_msb); +#else + c->phys_proc_id =phys_pkg_id (c->initial_apicid, index_msb); +#endif smp_num_siblings = smp_num_siblings / c->x86_max_cores;
@@ -357,8 +361,13 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) core_bits =get_count_order (c->x86_max_cores); +#ifdef CONFIG_X86_64 c->cpu_core_id =phys_pkg_id (index_msb) & ((1 << core_bits) -1 ); +#else + c->cpu_core_id =phys_pkg_id (c->initial_apicid, index_msb) & + ((1 << core_bits) -1 ); +#endif } out:
Signature · 1 line
1.5.4.5
PATCH 11/16 x86: cpu common merge get_cpu_cap
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 20 ++++++++++++++++++++ arch/x86/kernel/cpu/common_64.c | 2 ++ 2 files changed, 22 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/common.c +20 -0
@@ -458,6 +458,26 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c) c->x86_capability[6 ] =cpuid_ecx (0x80000001 ); } } + +#ifdef CONFIG_X86_64 +/* Transmeta-defined flags: level 0x80860001 */ + xlvl =cpuid_eax (0x80860000 ); +if ((xlvl &0xffff0000 ) ==0x80860000 ) { +/* Don't set x86_cpuid_level here for now to not confuse. */ +if (xlvl >=0x80860001 ) + c->x86_capability[2 ] =cpuid_edx (0x80860001 ); + } + +if (c->extended_cpuid_level >=0x80000007 ) + c->x86_power =cpuid_edx (0x80000007 ); + +if (c->extended_cpuid_level >=0x80000008 ) { +u32 eax =cpuid_eax (0x80000008 ); + + c->x86_virt_bits = (eax >>8 ) &0xff ; + c->x86_phys_bits = eax &0xff ; + } +#endif }/* * Do minimum CPU detection early.
arch/x86/kernel/cpu/common_64.c +2 -0
@@ -461,6 +461,7 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c) } } +#ifdef CONFIG_X86_64 /* Transmeta-defined flags: level 0x80860001 */ xlvl =cpuid_eax (0x80860000 );if ((xlvl &0xffff0000 ) ==0x80860000 ) {
@@ -478,6 +479,7 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c) c->x86_virt_bits = (eax >>8 ) &0xff ; c->x86_phys_bits = eax & 0xff; } +#endif }/* Do some early cpuid on the boot CPU to get some parameter that are
Signature · 1 line
1.5.4.5
PATCH 12/16 x86: cpu common merge early_identify_cpu
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 4 ++++ arch/x86/kernel/cpu/common_64.c | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/common.c +4 -0
@@ -490,7 +490,11 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)*/ static void __init early_identify_cpu (struct cpuinfo_x86 *c) { +#ifdef CONFIG_X86_64 + c->x86_clflush_size =64 ; +#else c->x86_clflush_size =32 ; +#endif c->x86_cache_alignment = c->x86_clflush_size;if (!have_cpuid_p ())
arch/x86/kernel/cpu/common_64.c +16 -3
@@ -482,15 +482,28 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)#endif } -/* Do some early cpuid on the boot CPU to get some parameter that are -needed before check_bugs. Everything advanced is in identify_cpu -below. */ +/* +* Do minimum CPU detection early. +* Fields really needed: vendor, cpuid_level, family, model, mask, +* cache alignment. +* The others are not touched to avoid unwanted side effects. +* +* WARNING: this function is only called on the BP. Don't add code here +* that is supposed to run on all CPUs. +*/ static void __init early_identify_cpu (struct cpuinfo_x86 *c) { +#ifdef CONFIG_X86_64 c->x86_clflush_size =64 ; +#else + c->x86_clflush_size =32 ; +#endif c->x86_cache_alignment = c->x86_clflush_size; +if (!have_cpuid_p ()) +return ; +memset (&c->x86_capability,0 ,sizeof c->x86_capability); c->extended_cpuid_level =0 ;
Signature · 1 line
1.5.4.5
PATCH 13/16 x86: cpu common merge print_cpu_info
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common_64.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/common_64.c +12 -0
@@ -730,8 +730,20 @@ __setup("noclflush", setup_noclflush);void __cpuinit print_cpu_info (struct cpuinfo_x86 *c) { +char *vendor =NULL ; + +if (c->x86_vendor <X86_VENDOR_NUM ) + vendor = this_cpu->c_vendor; +else if (c->cpuid_level >=0 ) + vendor = c->x86_vendor_id; + +if (vendor &&strncmp (c->x86_model_id, vendor,strlen (vendor))) +printk (KERN_CONT "%s " , vendor); +if (c->x86_model_id[0 ])printk (KERN_CONT "%s" , c->x86_model_id); +else +printk (KERN_CONT "%d86" , c->x86);if (c->x86_mask || c->cpuid_level >=0 )printk (KERN_CONT " stepping %02x\n" , c->x86_mask);
Signature · 1 line
1.5.4.5
PATCH 14/16 x86: cpu common merge generic_identify
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 15 ++++++++++++--- arch/x86/kernel/cpu/common_64.c | 19 ++++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/common.c +12 -3
@@ -548,6 +548,10 @@ void __init early_cpu_init(void)* of early VIA chips and (more importantly) broken virtualizers that * are not easy to detect. Hence, probe for it based on first * principles. +* +* Note: no 64-bit chip is known to lack these, but put the code here +* for consistency with 32 bits, and to make it utterly trivial to +* diagnose the problem should it ever surface. */ static void __cpuinit detect_nopl (struct cpuinfo_x86 *c) {
@@ -586,11 +590,16 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)if (c->cpuid_level >=0x00000001 ) { c->initial_apicid = (cpuid_ebx (1 ) >>24 ) &0xFF ; -#ifdef CONFIG_X86_HT +#ifdef CONFIG_X86_32 +# ifdef CONFIG_X86_HT c->apicid =phys_pkg_id (c->initial_apicid,0 ); - c->phys_proc_id = c->initial_apicid; -#else +# else c->apicid = c->initial_apicid; +# endif +#endif + +#ifdef CONFIG_X86_HT + c->phys_proc_id = c->initial_apicid;#endif }
arch/x86/kernel/cpu/common_64.c +16 -3
@@ -581,6 +581,9 @@ static void __cpuinit detect_nopl(struct cpuinfo_x86 *c)static void __cpuinit generic_identify (struct cpuinfo_x86 *c) { +if (!have_cpuid_p ()) +return ; + c->extended_cpuid_level =0 ;cpu_detect (c);
@@ -589,11 +592,21 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)get_cpu_cap (c); - c->initial_apicid = (cpuid_ebx (1 ) >>24 ) &0xff ; -#ifdef CONFIG_SMP - c->phys_proc_id = c->initial_apicid; +if (c->cpuid_level >=0x00000001 ) { + c->initial_apicid = (cpuid_ebx (1 ) >>24 ) &0xFF ; +#ifdef CONFIG_X86_32 +# ifdef CONFIG_X86_HT + c->apicid =phys_pkg_id (c->initial_apicid,0 ); +# else + c->apicid = c->initial_apicid; +# endif #endif +#ifdef CONFIG_X86_HT + c->phys_proc_id = c->initial_apicid; +#endif + } +if (c->extended_cpuid_level >=0x80000004 )get_model_name (c);/* Default name */
Signature · 1 line
1.5.4.5
PATCH 15/16 x86: cpu common merge identify_cpu
In reply to Yinghai Lu--- arch/x86/kernel/cpu/common.c | 89 ++++++++++++++++++++---------- arch/x86/kernel/cpu/common_64.c | 116 +++++++++++++++++++++++++++++---------- 2 files changed, 147 insertions(+), 58 deletions(-)
arch/x86/kernel/cpu/common.c +60 -29
@@ -104,34 +104,6 @@ static int __init cachesize_setup(char *str) }__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 );
@@ -197,13 +169,48 @@ static int __init x86_serial_nr_setup(char *s) }__setup ("serialnumber" , x86_serial_nr_setup);#else +static inline int flag_is_changeable_p (u32 flag) +{ +return 1 ; +}/* Probe for the CPUID instruction */ static inline int have_cpuid_p (void ) {return 1 ; } +static inline void squash_the_stupid_serial_number (struct cpuinfo_x86 *c) +{ +}#endif +/* +* 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 */ +} +__u32 cleared_cpu_caps[NCAPINTS ]__cpuinitdata ;/* Current gdt points %fs at the "master" per-cpu area: after this,
@@ -620,12 +627,18 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) c->loops_per_jiffy = loops_per_jiffy; c->x86_cache_size =-1 ; c->x86_vendor =X86_VENDOR_UNKNOWN ; - c->cpuid_level =-1 ;/* CPUID not detected */ 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_max_cores =1 ; +#ifdef CONFIG_X86_64 + c->x86_coreid_bits =0 ; + c->x86_clflush_size =64 ; +#else + c->cpuid_level =-1 ;/* CPUID not detected */ c->x86_clflush_size =32 ; +#endif + c->x86_cache_alignment = c->x86_clflush_size;memset (&c->x86_capability,0 ,sizeof c->x86_capability);if (!have_cpuid_p ()) {
@@ -644,6 +657,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)if (this_cpu->c_identify) this_cpu->c_identify (c); +#ifdef CONFIG_X86_64 + c->apicid =phys_pkg_id (0 ); +#endif +/* * Vendor-specific initialization. In this section we * canonicalize the feature flags, meaning if there are
@@ -677,6 +694,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) c->x86, c->x86_model); } +#ifdef CONFIG_X86_64 +detect_ht (c); +#endif +/* * On SMP, boot_cpu_data holds the common feature set between * all CPUs; so make sure that we indicate which features are
@@ -693,24 +714,34 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)for (i =0 ; i <NCAPINTS ; i++) c->x86_capability[i] &= ~cleared_cpu_caps[i]; +#ifdef CONFIG_X86_MCE /* Init Machine Check Exception if available. */ mcheck_init (c); +#endif select_idle_routine (c); + +#if defined(CONFIG_NUMA ) && defined(CONFIG_X86_64 ) +numa_add_cpu (smp_processor_id ()); +#endif }void __init identify_boot_cpu (void ) {identify_cpu (&boot_cpu_data); +#ifdef CONFIG_X86_32 sysenter_setup ();enable_sep_cpu (); +#endif }void __cpuinit identify_secondary_cpu (struct cpuinfo_x86 *c) {BUG_ON (c == &boot_cpu_data);identify_cpu (c); +#ifdef CONFIG_X86_32 enable_sep_cpu (); +#endif mtrr_ap_init (); }
arch/x86/kernel/cpu/common_64.c +87 -29
178 lines not on this page · raw message
Signature · 1 line
1.5.4.5
PATCH 16/16 x86: use common.c for 64 bit
In reply to Yinghai Luand remove common_64.c
--- arch/x86/kernel/cpu/Makefile | 6 +- arch/x86/kernel/cpu/common_64.c | 1201 --------------------------------------- 2 files changed, 3 insertions(+), 1204 deletions(-) delete mode 100644 arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/Makefile +3 -3
@@ -3,10 +3,10 @@ # obj-y := intel_cacheinfo.o addon_cpuid_features.o -obj-y += proc.o capflags.o powerflags.o +obj-y += proc.o capflags.o powerflags.o common.o -obj-$(CONFIG_X86_32) += common.o bugs.o cmpxchg.o -obj-$(CONFIG_X86_64) += common_64.o bugs_64.o +obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o +obj-$(CONFIG_X86_64) += bugs_64.o obj-$(CONFIG_CPU_SUP_INTEL_32) += intel.o obj-$(CONFIG_CPU_SUP_INTEL_64) += intel_64.o
arch/x86/kernel/cpu/common_64.c deleted +0 -1201
1,201 lines not on this page · raw message
Signature · 1 line
1.5.4.5
Re: [PATCH 16/16] x86: use common.c for 64 bit
Quoted 8 lines · Yinghai Lu
and remove
common_64.cSigned-off-by Yinghai <[email protected]>--- arch/x86/kernel/cpu/Makefile | 6 +- arch/x86/kernel/cpu/common_64.c | 1201 --------------------------------------- 2 files changed, 3 insertions(+), 1204 deletions(-) delete mode 100644 arch/x86/kernel/cpu/common_64.c
very nice patchset!
I've created a new topic for this: tip/x86/unify-cpu-detect, with these commits:
f5017cf: x86: use cpu/common.c on 64 bit
143b604: x86: cpu/common*.c, merge whitespaces
102bbe3: x86: cpu/common*.c, merge identify_cpu()
b89d3b3: x86: cpu/common*.c, merge generic_identify()
56f0d03: x86: cpu/common*.c: merge print_cpu_info()
6627d24: x86: cpu/common*.c, merge early_identify_cpu() 5122c89: x86: cpu/common.c: merge get_cpu_cap()
1cd7877: x86: cpu/common*.c, merge detect_ht()
140fc72: x86: cpu/common*.c, merge display_cacheinfo()
b9e67f0: x86: cpu/common.c, merge default_init()
fab334c: x86: cpu/common*.c, merge switch_to_new_gdt() 1ba7658: x86: cpu/common*.c have same cpu_init(), with copying and #ifdef
d5494d4: x86: cpu/common*.c, make 32-bit have 64-bit only functions
ba51dce: x86: cpu/common.c, let 64-bit code have 32-bit only functions 950ad7f: x86: same gdt_page with macro
f0fc4af: x86: make header file the same in arch/x86/kernel/cpu/common_xx.c 97e4db7: x86: make detect_ht depend on CONFIG_X86_HT
One small detail: i've added commit 143b604 before the final commit with the whitespace deltas, to make the final commit a pure, mechanic file-delete. The end result is still the same.
btw., the total effect of the unification is:
4 files changed, 433 insertions(+), 861 deletions(-)
which is nice!
Ingo