[Xenomai-core] [PATCH] detect conflict with INPUT_PCSPKR

[Xenomai-core] [PATCH] detect conflict with INPUT_PCSPKR

[Jan Kiszka]

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

This is a simple patch to catch the very rare but fatal conflict between
Xenomai's TSC emulation and the PC speaker driver on 2.6/x86.

Jan


--- include/asm-i386/hal.h      (Revision 1390)
+++ include/asm-i386/hal.h      (Arbeitskopie)
@@ -169,6 +169,11 @@ static inline unsigned long long rthal_r
     return t;
 }
 #else  /* !CONFIG_X86_TSC */
+#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
+#error Please disable PC speaker driver (CONFIG_INPUT_PCSPKR).
+#error It conflicts with Xenomai's TSC emulation.
+#endif /* CONFIG_INPUT_PCSPKR */
+
 #define RTHAL_8254_COUNT2LATCH  0xfffe
 void rthal_setup_8254_tsc(void);
 rthal_time_t rthal_get_8254_tsc(void);



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

Re: [Xenomai-core] [PATCH] detect conflict with INPUT_PCSPKR

[Gilles Chanteperdrix]

[-- Attachment #1: message body and .signature --]
[-- Type: text/plain, Size: 839 bytes --]

Jan Kiszka wrote:
 > This is a simple patch to catch the very rare but fatal conflict between
 > Xenomai's TSC emulation and the PC speaker driver on 2.6/x86.
 > 
 > Jan
 > 
 > 
 > --- include/asm-i386/hal.h      (Revision 1390)
 > +++ include/asm-i386/hal.h      (Arbeitskopie)
 > @@ -169,6 +169,11 @@ static inline unsigned long long rthal_r
 >      return t;
 >  }
 >  #else  /* !CONFIG_X86_TSC */
 > +#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
 > +#error Please disable PC speaker driver (CONFIG_INPUT_PCSPKR).
 > +#error It conflicts with Xenomai's TSC emulation.
 > +#endif /* CONFIG_INPUT_PCSPKR */
 > +
 >  #define RTHAL_8254_COUNT2LATCH  0xfffe
 >  void rthal_setup_8254_tsc(void);
 >  rthal_time_t rthal_get_8254_tsc(void);

How about solving this in Kconfig ?


-- 


					    Gilles Chanteperdrix.

[-- Attachment #2: xeno-forbid-pcspkr-in-kconfig.diff --]
[-- Type: text/plain, Size: 351 bytes --]

Index: scripts/Kconfig.frag
===================================================================
--- scripts/Kconfig.frag	(revision 1388)
+++ scripts/Kconfig.frag	(working copy)
@@ -2,6 +2,7 @@
 menu "Real-time sub-system"
 
 config XENOMAI
+	depends on CONFIG_X86_TSC || !X86 || !CONFIG_INPUT_PCSPKR
 	bool "Xenomai"
 	default y
         select IPIPE

Re: [Xenomai-core] [PATCH] detect conflict with INPUT_PCSPKR

[Gilles Chanteperdrix]

[-- Attachment #1: message body and .signature --]
[-- Type: text/plain, Size: 509 bytes --]

Gilles Chanteperdrix wrote:
 > How about solving this in Kconfig ?
 > Index: scripts/Kconfig.frag
 > ===================================================================
 > --- scripts/Kconfig.frag	(revision 1388)
 > +++ scripts/Kconfig.frag	(working copy)
 > @@ -2,6 +2,7 @@
 >  menu "Real-time sub-system"
 >  
 >  config XENOMAI
 > +	depends on CONFIG_X86_TSC || !X86 || !CONFIG_INPUT_PCSPKR
 >  	bool "Xenomai"
 >  	default y
 >          select IPIPE

Sorry, I meant:

-- 


					    Gilles Chanteperdrix.

[-- Attachment #2: xeno-forbid-pcspkr-in-kconfig.diff --]
[-- Type: text/plain, Size: 337 bytes --]

Index: scripts/Kconfig.frag
===================================================================
--- scripts/Kconfig.frag	(revision 1388)
+++ scripts/Kconfig.frag	(working copy)
@@ -2,6 +2,7 @@
 menu "Real-time sub-system"
 
 config XENOMAI
+	depends on X86_TSC || !X86 || !INPUT_PCSPKR
 	bool "Xenomai"
 	default y
         select IPIPE

Re: [Xenomai-core] [PATCH] detect conflict with INPUT_PCSPKR

[Jan Kiszka]

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

Gilles Chanteperdrix wrote:
> Gilles Chanteperdrix wrote:
>  > How about solving this in Kconfig ?
>  > Index: scripts/Kconfig.frag
>  > ===================================================================
>  > --- scripts/Kconfig.frag	(revision 1388)
>  > +++ scripts/Kconfig.frag	(working copy)
>  > @@ -2,6 +2,7 @@
>  >  menu "Real-time sub-system"
>  >  
>  >  config XENOMAI
>  > +	depends on CONFIG_X86_TSC || !X86 || !CONFIG_INPUT_PCSPKR
>  >  	bool "Xenomai"
>  >  	default y
>  >          select IPIPE
> 
> Sorry, I meant:
> 
> 
> 
> ------------------------------------------------------------------------
> 
> Index: scripts/Kconfig.frag
> ===================================================================
> --- scripts/Kconfig.frag	(revision 1388)
> +++ scripts/Kconfig.frag	(working copy)
> @@ -2,6 +2,7 @@
>  menu "Real-time sub-system"
>  
>  config XENOMAI
> +	depends on X86_TSC || !X86 || !INPUT_PCSPKR
>  	bool "Xenomai"
>  	default y
>          select IPIPE

No problem, but only when combining with a

comment "Switch off CONFIG_INPUT_PCSPKR to use Xenomai" (or so)
	depends on !X86_TSC && X86 && INPUT_PCSPKR

Otherwise the user will be left alone here with a non-selectable Xenomai
option...

This actually remind me of my suggestion some months ago to add Kconfig
warnings for CONFIG_CPU_FREQ & friends. Might be a good chance to catch
this all. Is scripts/Kconfig.frag the preferred place to add it?

Jan


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

Re: [Xenomai-core] [PATCH] detect conflict with INPUT_PCSPKR

[Gilles Chanteperdrix]

[-- Attachment #1: message body and .signature --]
[-- Type: text/plain, Size: 600 bytes --]

Jan Kiszka wrote:
 > No problem, but only when combining with a
 > 
 > comment "Switch off CONFIG_INPUT_PCSPKR to use Xenomai" (or so)
 > 	depends on !X86_TSC && X86 && INPUT_PCSPKR
 > 
 > Otherwise the user will be left alone here with a non-selectable Xenomai
 > option...
 > 
 > This actually remind me of my suggestion some months ago to add Kconfig
 > warnings for CONFIG_CPU_FREQ & friends. Might be a good chance to catch
 > this all. Is scripts/Kconfig.frag the preferred place to add it?


Why not? Here is a second patch that follows your suggestions.

-- 


					    Gilles Chanteperdrix.

[-- Attachment #2: xeno-forbid-pcspkr-in-kconfig.diff --]
[-- Type: text/plain, Size: 899 bytes --]

Index: scripts/Kconfig.frag
===================================================================
--- scripts/Kconfig.frag	(revision 1402)
+++ scripts/Kconfig.frag	(working copy)
@@ -1,7 +1,20 @@
 
 menu "Real-time sub-system"
 
+comment "WARNING! You enabled CPU Frequency scaling or use of ACPI"
+	depends on CPU_FREQ || ACPI_PROCESSOR
+comment "processor C states as idle handler (ACPI 'processor' option)."
+	depends on CPU_FREQ || ACPI_PROCESSOR
+comment "These options are known to cause troubles with Xenomai."
+	depends on CPU_FREQ || ACPI_PROCESSOR
+
+comment "NOTE: Xenomai conflicts with PC speaker support."
+	depends on !X86_TSC && X86 && INPUT_PCSPKR
+comment "(menu Device Drivers/Input device support/Miscellaneous devices)"
+	depends on !X86_TSC && X86 && INPUT_PCSPKR
+
 config XENOMAI
+	depends on X86_TSC || !X86 || !INPUT_PCSPKR
 	bool "Xenomai"
 	default y
         select IPIPE

Re: [Xenomai-core] [PATCH] detect conflict with INPUT_PCSPKR

[Jan Kiszka]

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

Gilles Chanteperdrix wrote:
> Jan Kiszka wrote:
>  > No problem, but only when combining with a
>  > 
>  > comment "Switch off CONFIG_INPUT_PCSPKR to use Xenomai" (or so)
>  > 	depends on !X86_TSC && X86 && INPUT_PCSPKR
>  > 
>  > Otherwise the user will be left alone here with a non-selectable Xenomai
>  > option...
>  > 
>  > This actually remind me of my suggestion some months ago to add Kconfig
>  > warnings for CONFIG_CPU_FREQ & friends. Might be a good chance to catch
>  > this all. Is scripts/Kconfig.frag the preferred place to add it?
> 
> 
> Why not? Here is a second patch that follows your suggestions.

No objections! Looks good to me. But shouldn't we add APM as well?

Jan

> 
> 
> 
> ------------------------------------------------------------------------
> 
> Index: scripts/Kconfig.frag
> ===================================================================
> --- scripts/Kconfig.frag	(revision 1402)
> +++ scripts/Kconfig.frag	(working copy)
> @@ -1,7 +1,20 @@
>  
>  menu "Real-time sub-system"
>  
> +comment "WARNING! You enabled CPU Frequency scaling or use of ACPI"
> +	depends on CPU_FREQ || ACPI_PROCESSOR
> +comment "processor C states as idle handler (ACPI 'processor' option)."
> +	depends on CPU_FREQ || ACPI_PROCESSOR
> +comment "These options are known to cause troubles with Xenomai."
> +	depends on CPU_FREQ || ACPI_PROCESSOR
> +
> +comment "NOTE: Xenomai conflicts with PC speaker support."
> +	depends on !X86_TSC && X86 && INPUT_PCSPKR
> +comment "(menu Device Drivers/Input device support/Miscellaneous devices)"
> +	depends on !X86_TSC && X86 && INPUT_PCSPKR
> +
>  config XENOMAI
> +	depends on X86_TSC || !X86 || !INPUT_PCSPKR
>  	bool "Xenomai"
>  	default y
>          select IPIPE



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

Re: [Xenomai-core] [PATCH] detect conflict with INPUT_PCSPKR

[Gilles Chanteperdrix]

[-- Attachment #1: message body and .signature --]
[-- Type: text/plain, Size: 843 bytes --]

Jan Kiszka wrote:
 > Gilles Chanteperdrix wrote:
 > > Jan Kiszka wrote:
 > >  > No problem, but only when combining with a
 > >  > 
 > >  > comment "Switch off CONFIG_INPUT_PCSPKR to use Xenomai" (or so)
 > >  > 	depends on !X86_TSC && X86 && INPUT_PCSPKR
 > >  > 
 > >  > Otherwise the user will be left alone here with a non-selectable Xenomai
 > >  > option...
 > >  > 
 > >  > This actually remind me of my suggestion some months ago to add Kconfig
 > >  > warnings for CONFIG_CPU_FREQ & friends. Might be a good chance to catch
 > >  > this all. Is scripts/Kconfig.frag the preferred place to add it?
 > > 
 > > 
 > > Why not? Here is a second patch that follows your suggestions.
 > 
 > No objections! Looks good to me. But shouldn't we add APM as well?

With APM, as well as with warnings for 2.4.

-- 


					    Gilles Chanteperdrix.

[-- Attachment #2: xeno-kconfig-warnings.diff --]
[-- Type: text/plain, Size: 1645 bytes --]

Index: scripts/Kconfig.frag
===================================================================
--- scripts/Kconfig.frag	(revision 1402)
+++ scripts/Kconfig.frag	(working copy)
@@ -1,7 +1,20 @@
 
 menu "Real-time sub-system"
 
+comment "WARNING! You enabled APM, CPU Frequency scaling or use of ACPI"
+	depends on APM || CPU_FREQ || ACPI_PROCESSOR
+comment "processor C states as idle handler (ACPI 'processor' option)."
+	depends on APM || CPU_FREQ || ACPI_PROCESSOR
+comment "These options are known to cause troubles with Xenomai."
+	depends on APM || CPU_FREQ || ACPI_PROCESSOR
+
+comment "NOTE: Xenomai conflicts with PC speaker support."
+	depends on !X86_TSC && X86 && INPUT_PCSPKR
+comment "(menu Device Drivers/Input device support/Miscellaneous devices)"
+	depends on !X86_TSC && X86 && INPUT_PCSPKR
+
 config XENOMAI
+	depends on X86_TSC || !X86 || !INPUT_PCSPKR
 	bool "Xenomai"
 	default y
         select IPIPE
Index: ksrc/arch/i386/Config.in
===================================================================
--- ksrc/arch/i386/Config.in	(revision 1402)
+++ ksrc/arch/i386/Config.in	(working copy)
@@ -1,6 +1,12 @@
 mainmenu_option next_comment
 comment 'Real-time sub-system'
 
+if [ "$CONFIG_APM" != "n" -o "$CONFIG_APM_CPU_IDLE" != "n" -o "$CONFIG_APM_DISPLAY_BLANK" != "n" -o "$CONFIG_ACPI_PROCESSOR" != "n" ]; then
+    comment "WARNING! You enabled APM or use of ACPI processor C states as"
+    comment "idle handler (ACPI 'processor' option)."
+    comment "These options are known to cause troubles with Xenomai"
+fi
+
 if [ "$CONFIG_IPIPE" = "n" ]; then
     comment "Xenomai depends on Adeos interrupt pipeline"
 else

Re: [Xenomai-core] [PATCH] detect conflict with INPUT_PCSPKR

[Philippe Gerum]

On Mon, 2006-07-31 at 19:29 +0200, Gilles Chanteperdrix wrote:
> Jan Kiszka wrote:
>  > Gilles Chanteperdrix wrote:
>  > > Jan Kiszka wrote:
>  > >  > No problem, but only when combining with a
>  > >  > 
>  > >  > comment "Switch off CONFIG_INPUT_PCSPKR to use Xenomai" (or so)
>  > >  > 	depends on !X86_TSC && X86 && INPUT_PCSPKR
>  > >  > 
>  > >  > Otherwise the user will be left alone here with a non-selectable Xenomai
>  > >  > option...
>  > >  > 
>  > >  > This actually remind me of my suggestion some months ago to add Kconfig
>  > >  > warnings for CONFIG_CPU_FREQ & friends. Might be a good chance to catch
>  > >  > this all. Is scripts/Kconfig.frag the preferred place to add it?
>  > > 
>  > > 
>  > > Why not? Here is a second patch that follows your suggestions.
>  > 
>  > No objections! Looks good to me. But shouldn't we add APM as well?
> 
> With APM, as well as with warnings for 2.4.
> 

Ack. Applique directement stp.

A+

> plain text document attachment (xeno-kconfig-warnings.diff)
> Index: scripts/Kconfig.frag
> ===================================================================
> --- scripts/Kconfig.frag	(revision 1402)
> +++ scripts/Kconfig.frag	(working copy)
> @@ -1,7 +1,20 @@
>  
>  menu "Real-time sub-system"
>  
> +comment "WARNING! You enabled APM, CPU Frequency scaling or use of ACPI"
> +	depends on APM || CPU_FREQ || ACPI_PROCESSOR
> +comment "processor C states as idle handler (ACPI 'processor' option)."
> +	depends on APM || CPU_FREQ || ACPI_PROCESSOR
> +comment "These options are known to cause troubles with Xenomai."
> +	depends on APM || CPU_FREQ || ACPI_PROCESSOR
> +
> +comment "NOTE: Xenomai conflicts with PC speaker support."
> +	depends on !X86_TSC && X86 && INPUT_PCSPKR
> +comment "(menu Device Drivers/Input device support/Miscellaneous devices)"
> +	depends on !X86_TSC && X86 && INPUT_PCSPKR
> +
>  config XENOMAI
> +	depends on X86_TSC || !X86 || !INPUT_PCSPKR
>  	bool "Xenomai"
>  	default y
>          select IPIPE
> Index: ksrc/arch/i386/Config.in
> ===================================================================
> --- ksrc/arch/i386/Config.in	(revision 1402)
> +++ ksrc/arch/i386/Config.in	(working copy)
> @@ -1,6 +1,12 @@
>  mainmenu_option next_comment
>  comment 'Real-time sub-system'
>  
> +if [ "$CONFIG_APM" != "n" -o "$CONFIG_APM_CPU_IDLE" != "n" -o "$CONFIG_APM_DISPLAY_BLANK" != "n" -o "$CONFIG_ACPI_PROCESSOR" != "n" ]; then
> +    comment "WARNING! You enabled APM or use of ACPI processor C states as"
> +    comment "idle handler (ACPI 'processor' option)."
> +    comment "These options are known to cause troubles with Xenomai"
> +fi
> +
>  if [ "$CONFIG_IPIPE" = "n" ]; then
>      comment "Xenomai depends on Adeos interrupt pipeline"
>  else
> _______________________________________________
> Xenomai-core mailing list
> Xenomai-core@domain.hid
> https://mail.gna.org/listinfo/xenomai-core
-- 
Philippe.