diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2009-12-09 05:02:18 -0500 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2009-12-09 05:02:18 -0500 |
commit | 93fd03a8c6728b58879f8af20ffd55d9c32a778b (patch) | |
tree | 7a12c9c6b4fa0b7b734ab7a8104636203c98b9a8 /arch | |
parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) |
ARM: Add an earlyprintk debug console
This patch allows an earlyprintk console if CONFIG_DEBUG_LL is enabled,
using the printch asm function.
The patch is based on the original work by Sascha Hauer.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig.debug | 8 | ||||
-rw-r--r-- | arch/arm/kernel/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/kernel/early_printk.c | 57 |
3 files changed, 66 insertions, 0 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 1a6f70e5292..feb7b11ed5b 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
@@ -71,6 +71,14 @@ config DEBUG_LL | |||
71 | in the kernel. This is helpful if you are debugging code that | 71 | in the kernel. This is helpful if you are debugging code that |
72 | executes before the console is initialized. | 72 | executes before the console is initialized. |
73 | 73 | ||
74 | config EARLY_PRINTK | ||
75 | bool "Early printk" | ||
76 | depends on DEBUG_LL | ||
77 | help | ||
78 | Say Y here if you want to have an early console using the | ||
79 | kernel low-level debugging functions. Add earlyprintk to your | ||
80 | kernel parameters to enable this console. | ||
81 | |||
74 | config DEBUG_ICEDCC | 82 | config DEBUG_ICEDCC |
75 | bool "Kernel low-level debugging via EmbeddedICE DCC channel" | 83 | bool "Kernel low-level debugging via EmbeddedICE DCC channel" |
76 | depends on DEBUG_LL | 84 | depends on DEBUG_LL |
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 79087dd6d86..d0e40b7d5f4 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
@@ -52,5 +52,6 @@ endif | |||
52 | 52 | ||
53 | head-y := head$(MMUEXT).o | 53 | head-y := head$(MMUEXT).o |
54 | obj-$(CONFIG_DEBUG_LL) += debug.o | 54 | obj-$(CONFIG_DEBUG_LL) += debug.o |
55 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | ||
55 | 56 | ||
56 | extra-y := $(head-y) init_task.o vmlinux.lds | 57 | extra-y := $(head-y) init_task.o vmlinux.lds |
diff --git a/arch/arm/kernel/early_printk.c b/arch/arm/kernel/early_printk.c new file mode 100644 index 00000000000..85aa2b29269 --- /dev/null +++ b/arch/arm/kernel/early_printk.c | |||
@@ -0,0 +1,57 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/kernel/early_printk.c | ||
3 | * | ||
4 | * Copyright (C) 2009 Sascha Hauer <s.hauer@pengutronix.de> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #include <linux/kernel.h> | ||
12 | #include <linux/console.h> | ||
13 | #include <linux/init.h> | ||
14 | |||
15 | extern void printch(int); | ||
16 | |||
17 | static void early_write(const char *s, unsigned n) | ||
18 | { | ||
19 | while (n-- > 0) { | ||
20 | if (*s == '\n') | ||
21 | printch('\r'); | ||
22 | printch(*s); | ||
23 | s++; | ||
24 | } | ||
25 | } | ||
26 | |||
27 | static void early_console_write(struct console *con, const char *s, unsigned n) | ||
28 | { | ||
29 | early_write(s, n); | ||
30 | } | ||
31 | |||
32 | static struct console early_console = { | ||
33 | .name = "earlycon", | ||
34 | .write = early_console_write, | ||
35 | .flags = CON_PRINTBUFFER | CON_BOOT, | ||
36 | .index = -1, | ||
37 | }; | ||
38 | |||
39 | asmlinkage void early_printk(const char *fmt, ...) | ||
40 | { | ||
41 | char buf[512]; | ||
42 | int n; | ||
43 | va_list ap; | ||
44 | |||
45 | va_start(ap, fmt); | ||
46 | n = vscnprintf(buf, sizeof(buf), fmt, ap); | ||
47 | early_write(buf, n); | ||
48 | va_end(ap); | ||
49 | } | ||
50 | |||
51 | static int __init setup_early_printk(char *buf) | ||
52 | { | ||
53 | register_console(&early_console); | ||
54 | return 0; | ||
55 | } | ||
56 | |||
57 | early_param("earlyprintk", setup_early_printk); | ||