[ PATCH ]: disable pcspeaker kernel: 2.4.2 - 2.4.5

[ PATCH ]: disable pcspeaker kernel: 2.4.2 - 2.4.5

[Nico Schottelius]

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



Hello!

As I read that Alan and Linus are more than busy,
I just retry sending the patch to the list.

The patch allows you to switch off the builtin pc speaker
with sysctl options. No program will then be able to
beep under Linux, nor under X neither in the console.

Normally the speaker keeps enabled, unless you

echo 0 > /proc/sys/kernel/pcspeaker

With all values != 0 it is turned on (documented is 1).

The support is included for i386, ia64, alpha, mips and mips64.

It is tested under i386 with several kernels / machines.
No problem occurs.
The code should not make any problems on the other
processors, but I would be nice if I could get feedback
from people using this on alpha,...

I (and maybe others ?) would be happy if someone
applies the patch to 2.4.6.

Thank you,

Nico

P.S.: I also attached an init script. This is from the clinux
distrubtion
and has to be changed to run without /etc/sys/combined and
/etc/sys/boot/kernelsettings.
If somebody is interested, I can send him/her the /etc/sys/ files.



[-- Attachment #2: set_pcspeaker --]
[-- Type: text/plain, Size: 733 bytes --]

#!/bin/sh
# 
# Author: Nico Schottelius <nico AT schottelius DOT org>
# Date: 15th of May 2k+1
# Last Changed: 15th of May 2k+1
# Comment: Sub script of kernel/ settings script. Set pcspeaker on/off
#

. /etc/sys/combined
. /etc/sys/boot/kernelsettings

case "$1" in
    on)		$SYS_ECHO -n "$SET $PC_SPEAKER_TEXT $WILL_TEXT "
		echo 1 > $PC_SPEAKER_FILE
		$SYS_ECHO $ON
		;;
    off)	$SYS_ECHO -n "$SET $PC_SPEAKER_TEXT $WILL_TEXT "
		echo 0 > $PC_SPEAKER_FILE
		$SYS_ECHO $OFF
              	;;

    status)	$SYS_ECHO -n "$STATUS $PC_SPEAKER_TEXT $IS_TEXT "
    		if [ `cat $PC_SPEAKER_FILE` -eq 0 ]; then
			$SYS_ECHO $OFF
		else
			$SYS_ECHO $ON
		fi
    		;;
    *)		$SYS_ECHO  "$USAGE $0 {on|off|status}"
		exit 1
esac

exit 0



[-- Attachment #3: pc_speaker.patch --]
[-- Type: text/plain, Size: 7763 bytes --]

diff -u --recursive linux-2.4.5/Documentation/Configure.help linux-2.4.5-nc/Documentation/Configure.help
--- linux-2.4.5/Documentation/Configure.help	Tue May 29 17:56:15 2001
+++ linux-2.4.5-nc/Documentation/Configure.help	Mon May 28 19:23:47 2001
@@ -333,6 +333,23 @@
 
   Most users will answer N here.
 
+Disables the PC or internal speaker
+CONFIG_DISABLE_PC_SPEAKER
+  Whenever you don't want your computer to be able to beep,
+  choose this option. Actually, choosing this will still not
+  disable the speaker, you have to use sysctl for this:
+
+     echo 0 > /proc/sys/kernel/pcspeaker # disable speaker
+
+     echo 1 > /proc/sys/kernel/pcspeaker # enable speaker (default)
+
+  Attention: This will not catch the beeps made directly by the
+  BIOS (mostly this happens when using a notebook and pressing
+  special key codes). To disable this "BIOS-beep" enter the
+  BIOS and change it there.
+
+  If you are unsure, say N.
+
 Network Block Device support
 CONFIG_BLK_DEV_NBD
   Saying Y here will allow your computer to be a client for network
diff -u --recursive linux-2.4.5/arch/alpha/config.in linux-2.4.5-nc/arch/alpha/config.in
--- linux-2.4.5/arch/alpha/config.in	Tue May 29 17:56:15 2001
+++ linux-2.4.5-nc/arch/alpha/config.in	Tue May 29 18:37:02 2001
@@ -240,6 +240,11 @@
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 tristate 'Kernel support for Linux/Intel ELF binaries' CONFIG_BINFMT_EM86
 source drivers/parport/Config.in
+
+if [ "$CONFIG_SYSCTL" = "y" ]; then
+   bool '  Disable the PC-Speaker' CONFIG_DISABLE_PC_SPEAKER
+fi
+
 endmenu
 
 source drivers/mtd/Config.in
diff -u --recursive linux-2.4.5/arch/arm/config.in linux-2.4.5-nc/arch/arm/config.in
--- linux-2.4.5/arch/arm/config.in	Tue May 29 17:55:36 2001
+++ linux-2.4.5-nc/arch/arm/config.in	Tue May 29 18:49:17 2001
@@ -372,6 +372,12 @@
    source net/ax25/Config.in
 
    source net/irda/Config.in
+
+if [ "$CONFIG_SYSCTL" = "y" ]; then
+   bool '  Disable the PC-Speaker' CONFIG_DISABLE_PC_SPEAKER
+fi
+
 fi
 
 mainmenu_option next_comment
diff -u --recursive linux-2.4.5/arch/i386/config.in linux-2.4.5-nc/arch/i386/config.in
--- linux-2.4.5/arch/i386/config.in	Tue May 29 17:56:16 2001
+++ linux-2.4.5-nc/arch/i386/config.in	Tue May 29 18:36:20 2001
@@ -258,6 +258,10 @@
    bool '    Use real mode APM BIOS call to power off' CONFIG_APM_REAL_MODE_POWER_OFF
 fi
 
+if [ "$CONFIG_SYSCTL" = "y" ]; then
+   bool '  Disable the PC-Speaker' CONFIG_DISABLE_PC_SPEAKER
+fi
+
 endmenu
 
 source drivers/mtd/Config.in
diff -u --recursive linux-2.4.5/arch/ia64/config.in linux-2.4.5-nc/arch/ia64/config.in
--- linux-2.4.5/arch/ia64/config.in	Tue May 29 17:55:36 2001
+++ linux-2.4.5-nc/arch/ia64/config.in	Tue May 29 18:41:58 2001
@@ -137,6 +137,10 @@
 
 fi # !HP_SIM
 
+if [ "$CONFIG_SYSCTL" = "y" ]; then
+   bool '  Disable the PC-Speaker' CONFIG_DISABLE_PC_SPEAKER
+fi
+
 endmenu
 
 if [ "$CONFIG_NET" = "y" ]; then
diff -u --recursive linux-2.4.5/arch/mips/config.in linux-2.4.5-nc/arch/mips/config.in
--- linux-2.4.5/arch/mips/config.in	Tue May 29 17:55:37 2001
+++ linux-2.4.5-nc/arch/mips/config.in	Tue May 29 18:43:56 2001
@@ -180,6 +180,11 @@
 #	bool ' Access.Bus support' CONFIG_ACCESSBUS
 #    fi
 fi
+
+if [ "$CONFIG_SYSCTL" = "y" ]; then
+   bool '  Disable the PC-Speaker' CONFIG_DISABLE_PC_SPEAKER
+fi
+
 endmenu
 
 if [ "$CONFIG_ISA" = "y" ]; then
diff -u --recursive linux-2.4.5/arch/mips64/config.in linux-2.4.5-nc/arch/mips64/config.in
--- linux-2.4.5/arch/mips64/config.in	Tue May 29 17:55:38 2001
+++ linux-2.4.5-nc/arch/mips64/config.in	Tue May 29 18:44:27 2001
@@ -113,6 +113,10 @@
 fi
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 
+if [ "$CONFIG_SYSCTL" = "y" ]; then
+   bool '  Disable the PC-Speaker' CONFIG_DISABLE_PC_SPEAKER
+fi
+
 endmenu
 
 mainmenu_option next_comment
diff -u --recursive linux-2.4.5/arch/sh/config.in linux-2.4.5-nc/arch/sh/config.in
--- linux-2.4.5/arch/sh/config.in	Tue May 29 17:55:38 2001
+++ linux-2.4.5-nc/arch/sh/config.in	Tue May 29 18:50:45 2001
@@ -141,6 +141,10 @@
 
 source drivers/parport/Config.in
 
+if [ "$CONFIG_SYSCTL" = "y" ]; then
+   bool '  Disable the PC-Speaker' CONFIG_DISABLE_PC_SPEAKER
+fi
+
 endmenu
 
 source drivers/mtd/Config.in
diff -u --recursive linux-2.4.5/drivers/char/vt.c linux-2.4.5-nc/drivers/char/vt.c
--- linux-2.4.5/drivers/char/vt.c	Fri Feb  9 20:30:22 2001
+++ linux-2.4.5-nc/drivers/char/vt.c	Wed May  9 23:47:36 2001
@@ -7,6 +7,7 @@
  *  Dynamic keymap and string allocation - aeb@cwi.nl - May 1994
  *  Restrict VT switching via ioctl() - grif@cs.ucr.edu - Dec 1995
  *  Some code moved for less code duplication - Andi Kleen - Mar 1997
+ *  Added ability to disable the pc speaker - nico@schottelius.org - May 2001
  */
 
 #include <linux/config.h>
@@ -40,6 +41,10 @@
 #include <asm/vc_ioctl.h>
 #endif /* CONFIG_FB_COMPAT_XPMAC */
 
+#ifdef CONFIG_DISABLE_PC_SPEAKER
+extern int pcspeaker_enabled; /* disable the pcspeaker */
+#endif
+
 char vt_dont_switch;
 extern struct tty_driver console_driver;
 
@@ -112,6 +117,12 @@
 	unsigned int count = 0;
 	unsigned long flags;
 
+#ifdef CONFIG_DISABLE_PC_SPEAKER
+	/* is the pcspeaker enabled or disabled ? 0=disabled,1=enabled */
+	if(!pcspeaker_enabled)
+		return;
+#endif
+
 	if (hz > 20 && hz < 32767)
 		count = 1193180 / hz;
 	
@@ -137,7 +148,7 @@
 	return;
 }
 
-#else
+#else /* else of machine check */
 
 void
 _kd_mksound(unsigned int hz, unsigned int ticks)
diff -u --recursive linux-2.4.5/include/linux/sysctl.h linux-2.4.5-nc/include/linux/sysctl.h
--- linux-2.4.5/include/linux/sysctl.h	Tue May 29 17:56:29 2001
+++ linux-2.4.5-nc/include/linux/sysctl.h	Mon May 28 19:24:08 2001
@@ -118,7 +118,8 @@
 	KERN_SHMPATH=48,	/* string: path to shm fs */
 	KERN_HOTPLUG=49,	/* string: path to hotplug policy agent */
 	KERN_IEEE_EMULATION_WARNINGS=50, /* int: unimplemented ieee instructions */
-	KERN_S390_USER_DEBUG_LOGGING=51  /* int: dumps of user faults */
+	KERN_S390_USER_DEBUG_LOGGING=51,  /* int: dumps of user faults */
+	KERN_DISABLE_PC_SPEAKER=52 /* int: speaker on or off */
 };
 
 
diff -u --recursive linux-2.4.5/kernel/sys.c linux-2.4.5-nc/kernel/sys.c
--- linux-2.4.5/kernel/sys.c	Tue May 29 17:55:59 2001
+++ linux-2.4.5-nc/kernel/sys.c	Wed May  9 23:45:26 2001
@@ -40,6 +40,14 @@
 
 int C_A_D = 1;
 
+/*
+ * whether to enable or disable the pcspeaker. default is to enable it.
+ */
+
+#ifdef CONFIG_DISABLE_PC_SPEAKER
+int pcspeaker_enabled = 1;
+#endif 
+
 
 /*
  *	Notifier list for kernel code which wants to be called
diff -u --recursive linux-2.4.5/kernel/sysctl.c linux-2.4.5-nc/kernel/sysctl.c
--- linux-2.4.5/kernel/sysctl.c	Tue May 29 17:55:59 2001
+++ linux-2.4.5-nc/kernel/sysctl.c	Wed May  9 23:44:30 2001
@@ -16,6 +16,7 @@
  *  Wendling.
  * The list_for_each() macro wasn't appropriate for the sysctl loop.
  *  Removed it and replaced it with older style, 03/23/00, Bill Wendling
+ * disable pc_speaker support, 8th of May 2001, Nico Schottelius
  */
 
 #include <linux/config.h>
@@ -48,6 +49,10 @@
 extern int nr_queued_signals, max_queued_signals;
 extern int sysrq_enabled;
 
+#ifdef CONFIG_DISABLE_PC_SPEAKER
+extern int pcspeaker_enabled; /* don't waste ram unless really needed */
+#endif
+
 /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
 static int maxolduid = 65535;
 static int minolduid;
@@ -212,6 +217,12 @@
 	 0444, NULL, &proc_dointvec},
 	{KERN_RTSIGMAX, "rtsig-max", &max_queued_signals, sizeof(int),
 	 0644, NULL, &proc_dointvec},
+
+#ifdef CONFIG_DISABLE_PC_SPEAKER
+	{KERN_DISABLE_PC_SPEAKER, "pcspeaker", &pcspeaker_enabled, sizeof(int),
+	 0644, NULL, &proc_dointvec},
+#endif
+
 #ifdef CONFIG_SYSVIPC
 	{KERN_SHMMAX, "shmmax", &shm_ctlmax, sizeof (size_t),
 	 0644, NULL, &proc_doulongvec_minmax},

Re: [ PATCH ]: disable pcspeaker kernel: 2.4.2 - 2.4.5

[Ingo Molnar]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 158 bytes --]


By making this (logical, and needed) feature unconditional, your patch's
size and complexity is reduced by 80%. (see the attached
pc_speaker.patch2)

	Ingo


[-- Attachment #2: Type: TEXT/PLAIN, Size: 2135 bytes --]

diff -u --recursive linux-2.4.5/drivers/char/vt.c linux-2.4.5-nc/drivers/char/vt.c
--- linux-2.4.5/drivers/char/vt.c	Fri Feb  9 20:30:22 2001
+++ linux-2.4.5-nc/drivers/char/vt.c	Wed May  9 23:47:36 2001
@@ -40,6 +41,7 @@
 #include <asm/vc_ioctl.h>
 #endif /* CONFIG_FB_COMPAT_XPMAC */
 
+extern int pcspeaker_enabled;
 char vt_dont_switch;
 extern struct tty_driver console_driver;
 
@@ -112,6 +117,9 @@
 	unsigned int count = 0;
 	unsigned long flags;
 
+	/* is the pcspeaker enabled or disabled ? 0=disabled,1=enabled */
+	if (!pcspeaker_enabled)
+		return;
 	if (hz > 20 && hz < 32767)
 		count = 1193180 / hz;
 	
diff -u --recursive linux-2.4.5/include/linux/sysctl.h linux-2.4.5-nc/include/linux/sysctl.h
--- linux-2.4.5/include/linux/sysctl.h	Tue May 29 17:56:29 2001
+++ linux-2.4.5-nc/include/linux/sysctl.h	Mon May 28 19:24:08 2001
@@ -118,7 +118,8 @@
 	KERN_SHMPATH=48,	/* string: path to shm fs */
 	KERN_HOTPLUG=49,	/* string: path to hotplug policy agent */
 	KERN_IEEE_EMULATION_WARNINGS=50, /* int: unimplemented ieee instructions */
-	KERN_S390_USER_DEBUG_LOGGING=51  /* int: dumps of user faults */
+	KERN_S390_USER_DEBUG_LOGGING=51,  /* int: dumps of user faults */
+	KERN_DISABLE_PC_SPEAKER=52 /* int: speaker on or off */
 };
 
 
diff -u --recursive linux-2.4.5/kernel/sysctl.c linux-2.4.5-nc/kernel/sysctl.c
--- linux-2.4.5/kernel/sysctl.c	Tue May 29 17:55:59 2001
+++ linux-2.4.5-nc/kernel/sysctl.c	Wed May  9 23:44:30 2001
@@ -48,6 +49,7 @@
 extern int nr_queued_signals, max_queued_signals;
 extern int sysrq_enabled;
 
+int pcspeaker_enabled;
 /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
 static int maxolduid = 65535;
 static int minolduid;
@@ -212,6 +217,8 @@
 	 0444, NULL, &proc_dointvec},
 	{KERN_RTSIGMAX, "rtsig-max", &max_queued_signals, sizeof(int),
 	 0644, NULL, &proc_dointvec},
+	{KERN_DISABLE_PC_SPEAKER, "pcspeaker", &pcspeaker_enabled, sizeof(int),
+	 0644, NULL, &proc_dointvec},
 #ifdef CONFIG_SYSVIPC
 	{KERN_SHMMAX, "shmmax", &shm_ctlmax, sizeof (size_t),
 	 0644, NULL, &proc_doulongvec_minmax},

Re: [ PATCH ]: disable pcspeaker kernel: 2.4.2 - 2.4.5

[Nico Schottelius]

Hi!


Where did you put the config.in entries to ?
This way it would be enabled all the time... okay...
I like that, too.
In the version I set up, I used the config.in entries,
because if you use disable pc_speaker, there is at
least one more int in the kernel. This is surely now much,
but as it is not needed all the time, I thought about choosing it
from menuconfig/config/...

So in short:

less code / one int more in the kernel
or
more code and #ifs / one int less in the kernel

What do you think is better ? I agree that the above one
is nicer code, but in fact I would prefer the second solution.

And what about the code from kernel/sys.c ?
The version you provided doesn't take care of what's
the default value of pcspeaker. This would make it
undefined, which is not really good.

Regards,

Nico

Re: [ PATCH ]: disable pcspeaker kernel: 2.4.2 - 2.4.5

[Masoud Sharbiani]

Hi!



> And what about the code from kernel/sys.c ?
> The version you provided doesn't take care of what's
> the default value of pcspeaker. This would make it
> undefined, which is not really good.


Since the variable is global in kernel/sysctl.c (and not kernel/sys.c),
and globals are set to zero when linking by GCC. (am I wrong?).
cheers,

Masoud

Re: [ PATCH ]: disable pcspeaker kernel: 2.4.2 - 2.4.5

[Ingo Molnar]

> less code / one int more in the kernel
> or
> more code and #ifs / one int less in the kernel

if the #ifdefs bloat the code 4 times the size of the simple patch, then
we obviously want 4 bytes more in the kernel.

> And what about the code from kernel/sys.c ? The version you provided
> doesn't take care of what's the default value of pcspeaker. This would
> make it undefined, which is not really good.

the default value is 0, that is good enough.

	Ingo

Re: [ PATCH ]: disable pcspeaker kernel: 2.4.2 - 2.4.5

[Nico Schottelius]

> > less code / one int more in the kernel
> > or
> > more code and #ifs / one int less in the kernel
>
> if the #ifdefs bloat the code 4 times the size of the simple patch, then
> we obviously want 4 bytes more in the kernel.

Okay.

> > And what about the code from kernel/sys.c ? The version you provided
> > doesn't take care of what's the default value of pcspeaker. This would
> > make it undefined, which is not really good.
>
> the default value is 0, that is good enough.

hmm.. I don't think so... value of 1 would be much better, because
0 normally disables the speaker.
So setting somewhere pcspeaker_enabled = 1 should be better
than having it with 0.

So in kernel/sysctl.c:

int pcspeaker_enabled = 1;

or anybody against this ?

Nico

Re: [ PATCH ]: disable pcspeaker kernel: 2.4.2 - 2.4.5

[Ingo Molnar]

On Wed, 30 May 2001, Nico Schottelius wrote:

> > the default value is 0, that is good enough.
>
> hmm.. I don't think so... value of 1 would be much better, because
> 0 normally disables the speaker.

i confused the value. Yes, an initialization to 1 would be the correct,
ie.:

+++ linux-2.4.5-nc/kernel/sysctl.c      Wed May  9 23:44:30 2001
@@ -48,6 +49,7 @@
 extern int nr_queued_signals, max_queued_signals;
 extern int sysrq_enabled;

+int pcspeaker_enabled = 1;

	Ingo

Re: [ PATCH ]: disable pcspeaker kernel: 2.4.2 - 2.4.5

[Daniel Phillips]

On Wednesday 30 May 2001 17:25, Ingo Molnar wrote:
> On Wed, 30 May 2001, Nico Schottelius wrote:
> > > the default value is 0, that is good enough.
> >
> > hmm.. I don't think so... value of 1 would be much better, because
> > 0 normally disables the speaker.
>
> i confused the value. Yes, an initialization to 1 would be the
> correct, ie.:
>
> +++ linux-2.4.5-nc/kernel/sysctl.c      Wed May  9 23:44:30 2001
> @@ -48,6 +49,7 @@
>  extern int nr_queued_signals, max_queued_signals;
>  extern int sysrq_enabled;
>
> +int pcspeaker_enabled = 1;

I'd go and change the whole patch so that speaker_disabled = 0 is the 
default, but that's just me.

--
Daniel

Re: [ PATCH ]: disable pcspeaker kernel: 2.4.2 - 2.4.5

[Nico Schottelius]

Daniel Phillips wrote:

> On Wednesday 30 May 2001 17:25, Ingo Molnar wrote:
> > On Wed, 30 May 2001, Nico Schottelius wrote:
> > > > the default value is 0, that is good enough.
> > >
> > > hmm.. I don't think so... value of 1 would be much better, because
> > > 0 normally disables the speaker.
> >
> > i confused the value. Yes, an initialization to 1 would be the
> > correct, ie.:
> >
> > +++ linux-2.4.5-nc/kernel/sysctl.c      Wed May  9 23:44:30 2001
> > @@ -48,6 +49,7 @@
> >  extern int nr_queued_signals, max_queued_signals;
> >  extern int sysrq_enabled;
> >
> > +int pcspeaker_enabled = 1;
>
> I'd go and change the whole patch so that speaker_disabled = 0 is the
> default, but that's just me.

Hmm...I thinking positive is more likely for humans, and double
negotation, like "not_disable" is less taken than just "enable".

So I agree with ingo, just setting pcspeaker_enabled = 1 at
normal would be the very best way.

Just after discussing about that, is it possible
someone adds the final patch ?


Nico