Skip to contentSkip to conversation

x86/mrst: parse SFI timer table for all timer configs

PATCH New Alan Cox 1 participant 1 message Sep 28, 2010 x86

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 x86/mrst: parse SFI timer table for all timer configs

From: Jacob Pan <[email protected]>

Penwell has APB timer based watchdog timers, it requires platform code to parse SFI MTMR tables in order to claim its timer.

This patch will always parse SFI MTMR regardless of system timer configuration choices. Otherwise, SFI MTMR table may not get parsed if running on Medfield with always-on local APIC timers and constant TSC. Watchdog timer driver will not get a timer to use.

(Prerequisite to merging the Intel MID watchdog support)

---

 arch/x86/kernel/mrst.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/mrst.c +1 -1
index 0bf74c5..2abbcaf 100644
@@ -218,6 +218,7 @@ static unsigned long __init mrst_calibrate_tsc(void)
 
 void __init mrst_time_init(void)
 {
+	sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr);
 	switch (mrst_timer_options) {
 	case MRST_TIMER_APBT_ONLY:
 		break;
@@ -233,7 +234,6 @@ void __init mrst_time_init(void)
 		return;
 	}
 	/* we need at least one APB timer */
-	sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr);
 	pre_init_apic_IRQ0();
 	apbt_time_init();
 }