x86: add ->pre_time_init to x86_quirks

yhlu · Ingo Molnar · commit 63b5d7af2556 · 2008-07-20T09:25:52.000+02:00
so NUMAQ can use that to call numaq_pre_time_init()

This allows us to remove a NUMAQ special from arch/x86/kernel/setup.c.

(and paves the way to remove the NUMAQ subarch)

Signed-off-by: Yinghai Lu &lt;yhlu.kernel@gmail.com&gt;
Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
@@ -84,6 +84,12 @@ void __init numaq_tsc_disable(void)
 	}
 }
 
+static int __init numaq_pre_time_init(void)
+{
+	numaq_tsc_disable();
+	return 0;
+}
+
 int found_numaq;
 /*
  * Have to match translation table entries to main table entries by counter
@@ -224,6 +230,7 @@ static void __init smp_read_mpc_oem(struct mp_config_oemtable *oemtable,
 }
 
 static struct x86_quirks numaq_x86_quirks __initdata = {
+	.arch_pre_time_init	= numaq_pre_time_init,
 	.arch_time_init		= NULL,
 	.arch_pre_intr_init	= NULL,
 	.arch_memory_setup	= NULL,
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
@@ -853,14 +853,6 @@ 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();
 
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c
@@ -129,6 +129,7 @@ void __init hpet_time_init(void)
  */
 void __init time_init(void)
 {
+	pre_time_init_hook();
 	tsc_init();
 	late_time_init = choose_time_init();
 }
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c
@@ -102,6 +102,16 @@ static struct irqaction irq0  = {
 	.name = "timer"
 };
 
+/**
+ * pre_time_init_hook - do any specific initialisations before.
+ *
+ **/
+void __init pre_time_init_hook(void)
+{
+	if (x86_quirks->arch_pre_time_init)
+		x86_quirks->arch_pre_time_init();
+}
+
 /**
  * time_init_hook - do any specific initialisations for the system timer.
  *
diff --git a/include/asm-x86/arch_hooks.h b/include/asm-x86/arch_hooks.h
@@ -21,6 +21,7 @@ extern void intr_init_hook(void);
 extern void pre_intr_init_hook(void);
 extern void pre_setup_arch_hook(void);
 extern void trap_init_hook(void);
+extern void pre_time_init_hook(void);
 extern void time_init_hook(void);
 extern void mca_nmi_hook(void);
 
diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h
@@ -23,6 +23,7 @@ struct mpc_config_processor;
 struct mpc_config_bus;
 struct mp_config_oemtable;
 struct x86_quirks {
+	int (*arch_pre_time_init)(void);
 	int (*arch_time_init)(void);
 	int (*arch_pre_intr_init)(void);
 	int (*arch_intr_init)(void);

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,12 @@ void __init numaq_tsc_disable(void)`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
	`87`	`+static int __init numaq_pre_time_init(void)`
	`88`	`+{`
	`89`	`+ numaq_tsc_disable();`
	`90`	`+ return 0;`
	`91`	`+}`
	`92`	`+`
`87`	`93`	`int found_numaq;`
`88`	`94`	`/*`
`89`	`95`	`* Have to match translation table entries to main table entries by counter`
`@@ -224,6 +230,7 @@ static void __init smp_read_mpc_oem(struct mp_config_oemtable *oemtable,`
`224`	`230`	`}`
`225`	`231`
`226`	`232`	`static struct x86_quirks numaq_x86_quirks __initdata = {`
	`233`	`+ .arch_pre_time_init = numaq_pre_time_init,`
`227`	`234`	`.arch_time_init = NULL,`
`228`	`235`	`.arch_pre_intr_init = NULL,`
`229`	`236`	`.arch_memory_setup = NULL,`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ void __init hpet_time_init(void)`
`129`	`129`	`*/`
`130`	`130`	`void __init time_init(void)`
`131`	`131`	`{`
	`132`	`+ pre_time_init_hook();`
`132`	`133`	`tsc_init();`
`133`	`134`	`late_time_init = choose_time_init();`
`134`	`135`	`}`