All of lore.kernel.org
 help / color / mirror / Atom feed
* [Xenomai-core] [PATCH] Catch HPET conflict
@ 2007-02-20 21:23 Jan Kiszka
  2007-02-23 18:57 ` Philippe Gerum
  0 siblings, 1 reply; 4+ messages in thread
From: Jan Kiszka @ 2007-02-20 21:23 UTC (permalink / raw)
  To: xenomai-core

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

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

Jan


Index: scripts/Kconfig.frag
===================================================================
--- scripts/Kconfig.frag	(Revision 2216)
+++ scripts/Kconfig.frag	(Arbeitskopie)
@@ -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



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 250 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Xenomai-core] [PATCH] Catch HPET conflict
  2007-02-20 21:23 [Xenomai-core] [PATCH] Catch HPET conflict Jan Kiszka
@ 2007-02-23 18:57 ` Philippe Gerum
  2007-02-23 22:32   ` Philippe Gerum
  0 siblings, 1 reply; 4+ messages in thread
From: Philippe Gerum @ 2007-02-23 18:57 UTC (permalink / raw)
  To: Jan Kiszka; +Cc: xenomai-core

On Tue, 2007-02-20 at 22:23 +0100, Jan Kiszka wrote:
> As long as there is obviously a conflict, catch it during kernel
> configuration and urge the user to disable CONFIG_HPET_TIMER.
> 

Applied, thanks.

-- 
Philippe.




^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Xenomai-core] [PATCH] Catch HPET conflict
  2007-02-23 18:57 ` Philippe Gerum
@ 2007-02-23 22:32   ` Philippe Gerum
  2007-02-23 23:00     ` Jan Kiszka
  0 siblings, 1 reply; 4+ messages in thread
From: Philippe Gerum @ 2007-02-23 22:32 UTC (permalink / raw)
  To: Jan Kiszka; +Cc: xenomai-core

On Fri, 2007-02-23 at 19:57 +0100, Philippe Gerum wrote:
> On Tue, 2007-02-20 at 22:23 +0100, Jan Kiszka wrote:
> > 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.

-- 
Philippe.




^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Xenomai-core] [PATCH] Catch HPET conflict
  2007-02-23 22:32   ` Philippe Gerum
@ 2007-02-23 23:00     ` Jan Kiszka
  0 siblings, 0 replies; 4+ messages in thread
From: Jan Kiszka @ 2007-02-23 23:00 UTC (permalink / raw)
  To: rpm; +Cc: xenomai-core


[-- Attachment #1.1: Type: text/plain, Size: 602 bytes --]

Philippe Gerum wrote:
> On Fri, 2007-02-23 at 19:57 +0100, Philippe Gerum wrote:
>> On Tue, 2007-02-20 at 22:23 +0100, Jan Kiszka wrote:
>>> 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

[-- Attachment #1.2: hpet-v2.patch --]
[-- Type: text/plain, Size: 758 bytes --]

Index: scripts/Kconfig.frag
===================================================================
--- scripts/Kconfig.frag	(Revision 2238)
+++ scripts/Kconfig.frag	(Arbeitskopie)
@@ -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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 250 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2007-02-23 23:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-20 21:23 [Xenomai-core] [PATCH] Catch HPET conflict Jan Kiszka
2007-02-23 18:57 ` Philippe Gerum
2007-02-23 22:32   ` Philippe Gerum
2007-02-23 23:00     ` Jan Kiszka

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.