diff options
author | Gerd Hoffmann <kraxel@suse.de> | 2007-05-08 03:26:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:04 -0400 |
commit | 69331af79cf29e26d1231152a172a1a10c2df511 (patch) | |
tree | 0c6f805fc78c1969b8c46f02070cb9dc39f3f944 /arch/powerpc | |
parent | 6ae9200f2cab7b328e505fc9a7021db64e0590cf (diff) |
Fixes and cleanups for earlyprintk aka boot console
The console subsystem already has an idea of a boot console, using the
CON_BOOT flag. The implementation has some flaws though. The major
problem is that presence of a boot console makes register_console() ignore
any other console devices (unless explicitly specified on the kernel
command line).
This patch fixes the console selection code to *not* consider a boot
console a full-featured one, so the first non-boot console registering will
become the default console instead. This way the unregister call for the
boot console in the register_console() function actually triggers and the
handover from the boot console to the real console device works smoothly.
Added a printk for the handover, so you know which console device the
output goes to when the boot console stops printing messages.
The disable_early_printk() call is obsolete with that patch, explicitly
disabling the early console isn't needed any more as it works automagically
with that patch.
I've walked through the tree, dropped all disable_early_printk() instances
found below arch/ and tagged the consoles with CON_BOOT if needed. The
code is tested on x86, sh (thanks to Paul) and mips (thanks to Ralf).
Changes to last version: Rediffed against -rc3, adapted to mips cleanups by
Ralf, fixed "udbg-immortal" cmd line arg on powerpc.
Signed-off-by: Gerd Hoffmann <kraxel@exsuse.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Andi Kleen <ak@suse.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/udbg.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c index 7e0971868fc2..147a2d83de10 100644 --- a/arch/powerpc/kernel/udbg.c +++ b/arch/powerpc/kernel/udbg.c | |||
@@ -142,29 +142,22 @@ static void udbg_console_write(struct console *con, const char *s, | |||
142 | static struct console udbg_console = { | 142 | static struct console udbg_console = { |
143 | .name = "udbg", | 143 | .name = "udbg", |
144 | .write = udbg_console_write, | 144 | .write = udbg_console_write, |
145 | .flags = CON_PRINTBUFFER | CON_ENABLED, | 145 | .flags = CON_PRINTBUFFER | CON_ENABLED | CON_BOOT, |
146 | .index = -1, | 146 | .index = -1, |
147 | }; | 147 | }; |
148 | 148 | ||
149 | static int early_console_initialized; | 149 | static int early_console_initialized; |
150 | 150 | ||
151 | void __init disable_early_printk(void) | ||
152 | { | ||
153 | if (!early_console_initialized) | ||
154 | return; | ||
155 | if (strstr(boot_command_line, "udbg-immortal")) { | ||
156 | printk(KERN_INFO "early console immortal !\n"); | ||
157 | return; | ||
158 | } | ||
159 | unregister_console(&udbg_console); | ||
160 | early_console_initialized = 0; | ||
161 | } | ||
162 | |||
163 | /* called by setup_system */ | 151 | /* called by setup_system */ |
164 | void register_early_udbg_console(void) | 152 | void register_early_udbg_console(void) |
165 | { | 153 | { |
166 | if (early_console_initialized) | 154 | if (early_console_initialized) |
167 | return; | 155 | return; |
156 | |||
157 | if (strstr(boot_command_line, "udbg-immortal")) { | ||
158 | printk(KERN_INFO "early console immortal !\n"); | ||
159 | udbg_console.flags &= ~CON_BOOT; | ||
160 | } | ||
168 | early_console_initialized = 1; | 161 | early_console_initialized = 1; |
169 | register_console(&udbg_console); | 162 | register_console(&udbg_console); |
170 | } | 163 | } |