Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d88cca7 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: fix numaq_tsc_disable calling 



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: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7b479bec

arch/x86/kernel/cpu/intel.c

+4 −0
Original line number Diff line number Diff line
@@ -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)

arch/x86/kernel/numaq_32.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/setup.c

+8 −0
Original line number Diff line number Diff line
@@ -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();

include/asm-x86/numaq.h

+2 −0
Original line number Diff line number Diff line
@@ -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)

{