leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: fix numaq_tsc_disable calling

Browse Source 
got this on a test-system:

 calling  numaq_tsc_disable+0x0/0x39
 NUMAQ: disabling TSC
 initcall numaq_tsc_disable+0x0/0x39 returned 0 after 0 msecs

that's because we should not be using arch_initcall to call numaq_tsc_disable.

need to call it in setup_arch before time_init()/tsc_init()
and call it in init_intel() to make the cpu feature bits right.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-07-12 22:52:55 -07:00 committed by Ingo Molnar
parent 7b479becdb
commit 3d88cca708
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/cpu/intel.c
View File

@ -226,6 +226,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
if (cpu_has_bts)
ds_init_intel(c);
#ifdef CONFIG_X86_NUMAQ
numaq_tsc_disable();
#endif
}
static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)

7
arch/x86/kernel/numaq_32.c
View File

@ -93,12 +93,13 @@ int __init get_memcfg_numaq(void)
return 1;
}
static int __init numaq_tsc_disable(void)
void __init numaq_tsc_disable(void)
{
if (!found_numaq)
return -1;
if (num_online_nodes() > 1) {
printk(KERN_DEBUG "NUMAQ: disabling TSC\n");
setup_clear_cpu_cap(X86_FEATURE_TSC);
}
return 0;
}
arch_initcall(numaq_tsc_disable);

8
arch/x86/kernel/setup.c
View File

@ -849,6 +849,14 @@ void __init setup_arch(char **cmdline_p)
init_cpu_to_node();
#endif
#ifdef CONFIG_X86_NUMAQ
/*
* need to check online nodes num, call it
* here before time_init/tsc_init
*/
numaq_tsc_disable();
#endif
init_apic_mappings();
ioapic_init_mappings();

2
include/asm-x86/numaq.h
View File

@ -157,6 +157,8 @@ struct sys_cfg_data {
struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */
};
void numaq_tsc_disable(void);
#else
static inline int get_memcfg_numaq(void)
{