x86: fix numaq_tsc_disable calling
authorYinghai Lu <yhlu.kernel@gmail.com>
Sun, 13 Jul 2008 05:52:55 +0000 (22:52 -0700)
committerIngo Molnar <mingo@elte.hu>
Sun, 13 Jul 2008 06:19:45 +0000 (08:19 +0200)
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>
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/numaq_32.c
arch/x86/kernel/setup.c
include/asm-x86/numaq.h

index fe9224c51d37ee1ca4cd36d6e7265e8124059012..70609efdf1da3ae7fea3a311ffbb1639e3f5675e 100644 (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)
index f0f1de1c4a1de4465cf53aae7e50c9bbcb7af0c1..5b20a5e7ac28933e8200c269880cc167603cafeb 100644 (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);
index 987b6fde3a99c51b5acfd6c0acbf69b866337bb2..36c540d4ac4b6164dbd02d6b23951ea1315f134f 100644 (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();
 
index ef068d2465d691a785c274389ea94f2f047364dd..34b92d581fa326839f7c2568b82d9033472d44dd 100644 (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)
 {