[PATCH] [POWERPC] Add the PC speaker only when requested so

This will cause this minor boot-time debugging error message to go away:

[    1.316451] calling  add_pcspkr+0x0/0x84
[    1.316478] initcall add_pcspkr+0x0/0x84 returned -19 after 0 msecs

Signed-off-by: Emil Medve <redacted>
---

scripts/checkpatch.pl 0001--POWERPC-Add-the-PC-speaker-only-when-requested-so.patch 

total: 0 errors, 0 warnings, 14 lines checked

0001--POWERPC-Add-the-PC-speaker-only-when-requested-so.patch has no obvious style problems and is ready for submission.

 arch/powerpc/kernel/setup-common.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index db540ea..61a3f41 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c

@@ -500,6 +500,7 @@ void __init smp_setup_cpu_sibling_map(void)
 }
 #endif /* CONFIG_SMP */
 
+#ifdef CONFIG_PCSPKR_PLATFORM
 static __init int add_pcspkr(void)
 {
 	struct device_node *np;

@@ -522,6 +523,7 @@ static __init int add_pcspkr(void)
 	return ret;
 }
 device_initcall(add_pcspkr);
+#endif	/* CONFIG_PCSPKR_PLATFORM */
 
 void probe_machine(void)
 {

-- 
1.5.5.GIT

On Thu, May 22, 2008 at 4:40 PM, Emil Medve [off-list ref] wrote:

This will cause this minor boot-time debugging error message to go away:

[    1.316451] calling  add_pcspkr+0x0/0x84
[    1.316478] initcall add_pcspkr+0x0/0x84 returned -19 after 0 msecs

What situation are you hitting this in?  The code should only run if
there is a "pnpPNP,100" compatible node in the device tree.

Also, where is CONFIG_PCSPKR_PLATFORM defined?  I don't see it
anywhere in powerpc code and only a reference to it in an x86
Makefile.  As it stands, it looks like this patch unconditionally
disables the pcspkr code.

Cheers,
g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

On May 22, 2008, at 6:27 PM, Grant Likely wrote:

On Thu, May 22, 2008 at 4:40 PM, Emil Medve <Emilian.Medve@freescale.com

quoted

wrote:
This will cause this minor boot-time debugging error message to go away:

[    1.316451] calling  add_pcspkr+0x0/0x84
[    1.316478] initcall add_pcspkr+0x0/0x84 returned -19 after 0 msecs

What situation are you hitting this in?  The code should only run if
there is a "pnpPNP,100" compatible node in the device tree.

The code always runs, the -19 is from the fact that the code returns -ENODEV when it doesn't find the device in the tree.

I don't see any reason we should be ALWAYS be probing for a PC speaker.  Seems like a reasonable patch.

Also, where is CONFIG_PCSPKR_PLATFORM defined?  I don't see it
anywhere in powerpc code and only a reference to it in an x86
Makefile.  As it stands, it looks like this patch unconditionally
disables the pcspkr code.

Its defined in init/Kconfig.

- k

On Thu, May 22, 2008 at 9:34 PM, Kumar Gala [off-list ref] wrote:

On May 22, 2008, at 6:27 PM, Grant Likely wrote:

quoted

On Thu, May 22, 2008 at 4:40 PM, Emil Medve [off-list ref]
wrote:

quoted

This will cause this minor boot-time debugging error message to go away:

[    1.316451] calling  add_pcspkr+0x0/0x84
[    1.316478] initcall add_pcspkr+0x0/0x84 returned -19 after 0 msecs

What situation are you hitting this in?  The code should only run if
there is a "pnpPNP,100" compatible node in the device tree.

The code always runs, the -19 is from the fact that the code returns -ENODEV
when it doesn't find the device in the tree.

I don't see any reason we should be ALWAYS be probing for a PC speaker.
 Seems like a reasonable patch.

Fair enough; I was just wondering if it was a complete fix.  But now
that I dig into the code I see that the calling...initcall returned...
messages are just debug stuff that isn't always turned on.

I have no problem with the patch.

quoted

Also, where is CONFIG_PCSPKR_PLATFORM defined?  I don't see it
anywhere in powerpc code and only a reference to it in an x86
Makefile.  As it stands, it looks like this patch unconditionally
disables the pcspkr code.

Its defined in init/Kconfig.

Apparently my grep-foo isn't what it used to be...

Cheers,
g.



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Hello Grant,


You can reproduce this by adding initcall_debug to your kernel
parameters. I'm encountering this situation on an MPC85xx board, but
from looking at the code that seems irrelevant as add_pcspkr() will get
executed anyway. True, "pnpPNP,100" is looked after before the platform
code runs and it will fail if it can't find "pnpPNP,100", but the error
message will show up. As mentioned below, this saves some memory and a
few boot-up CPU cycles...

PCSPKR_PLATFORM is an option in init/Kconfig:

        ...
config PCSPKR_PLATFORM
	bool "Enable PC-Speaker support" if EMBEDDED
	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP ||
PPC_PSERIES
	default y
	help
          This option allows to disable the internal PC-Speaker
          support, saving some memory.
        ...


Cheers,
Emil.

-----Original Message-----
From: <redacted> [mailto:<redacted>] On=20
Behalf Of Grant Likely
Sent: Thursday, May 22, 2008 6:28 PM
To: Medve Emilian
Cc: <redacted>; <redacted>;=20
linuxppc-dev@ozlabs.org; linuxppc-embedded@ozlabs.org
Subject: Re: [PATCH] [POWERPC] Add the PC speaker only when=20
requested so
=20
On Thu, May 22, 2008 at 4:40 PM, Emil Medve=20
[off-list ref] wrote:

quoted

This will cause this minor boot-time debugging error=20

message to go away:

quoted

[    1.316451] calling  add_pcspkr+0x0/0x84
[    1.316478] initcall add_pcspkr+0x0/0x84 returned -19=20

after 0 msecs
=20
What situation are you hitting this in?  The code should only run if
there is a "pnpPNP,100" compatible node in the device tree.
=20
Also, where is CONFIG_PCSPKR_PLATFORM defined?  I don't see it
anywhere in powerpc code and only a reference to it in an x86
Makefile.  As it stands, it looks like this patch unconditionally
disables the pcspkr code.
=20
Cheers,
g.
=20

quoted

Signed-off-by: Emil Medve <redacted>
---

quoted

scripts/checkpatch.pl=20

0001--POWERPC-Add-the-PC-speaker-only-when-requested-so.patch

quoted

total: 0 errors, 0 warnings, 14 lines checked

=20

0001--POWERPC-Add-the-PC-speaker-only-when-requested-so.patch=20

40 more quoted lines