Skip to contentSkip to conversation

Catch HPET conflict

PATCH Applied Jan Kiszka 2 participants 4 messages Feb 20, 2007 – Feb 23, 2007

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 Catch HPET conflict

As long as there is obviously a conflict, catch it during kernel configuration and urge the user to disable CONFIG_HPET_TIMER.

Jan

Kconfig.frag +6 -1
Index: scripts/Kconfig.frag
===================================================================
@@ -11,8 +11,13 @@ comment "NOTE: Xenomai conflicts with PC
 comment "(menu Device Drivers/Input device support/Miscellaneous devices)"
 	depends on !X86_TSC && X86 && INPUT_PCSPKR
 
+comment "NOTE: Xenomai currently conflicts with HPET support."
+	depends on HPET_TIMER
+comment "(menu Processor type and features)"
+	depends on HPET_TIMER
+
 config XENOMAI
-	depends on X86_TSC || !X86 || !INPUT_PCSPKR
+	depends on (X86_TSC || !X86 || !INPUT_PCSPKR) && !HPET_TIMER
 	bool "Xenomai"
 	default y
         select IPIPE
#1 lore raw
Quoted 3 lines · Jan Kiszka

As long as there is obviously a conflict, catch it during kernel configuration and urge the user to disable CONFIG_HPET_TIMER.

Applied, thanks.

Signature · 1 line
Philippe.
#2 lore raw
Quoted 7 lines · Philippe Gerum
Quoted 3 lines · Jan Kiszka

As long as there is obviously a conflict, catch it during kernel configuration and urge the user to disable CONFIG_HPET_TIMER.

Applied, thanks.

Reverted from the trunk/ though, since this won't work as is for x86_64.

Signature · 1 line
Philippe.
author
#3 lore raw
Quoted 10 lines · Philippe Gerum
Quoted 6 lines · Philippe Gerum
Quoted 3 lines · Jan Kiszka

As long as there is obviously a conflict, catch it during kernel configuration and urge the user to disable CONFIG_HPET_TIMER.

Applied, thanks.

Reverted from the trunk/ though, since this won't work as is for x86_64.

Yeah, noticed this as well. The attached version works, but... could you explain to me what I'm patching here? What is different about our HPET issue on x86_64 so that we are not being bitten there?

Jan

Kconfig.frag +3 -3
Index: scripts/Kconfig.frag
===================================================================
@@ -12,12 +12,12 @@ comment "(menu Device Drivers/Input devi
 	depends on !X86_TSC && X86 && INPUT_PCSPKR
 
 comment "NOTE: Xenomai currently conflicts with HPET support."
-       depends on HPET_TIMER
+	depends on HPET_TIMER && !X86_64
 comment "(menu Processor type and features)"
-       depends on HPET_TIMER
+	depends on HPET_TIMER && !X86_64
 
 config XENOMAI
-       depends on (X86_TSC || !X86 || !INPUT_PCSPKR) && !HPET_TIMER
+	depends on (X86_TSC || !X86 || !INPUT_PCSPKR) && (!HPET_TIMER || X86_64)
 	bool "Xenomai"
 	default y
         select IPIPE