From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Fitzhardinge Subject: [PATCH 17/25] xen: Add early printk support via hvc console Date: Mon, 23 Apr 2007 14:56:55 -0700 Message-ID: <20070423215712.510683511@goop.org> References: <20070423215638.563901986@goop.org> Return-path: Content-Disposition: inline; filename=xen-hvc-earlyprintk.patch List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: Andi Kleen Cc: virtualization@lists.osdl.org, Andrew Morton , Ingo Molnar , lkml List-Id: virtualization@lists.linuxfoundation.org Add early printk support via hvc console, enable using "earlyprintk=xen" on the kernel command line. From: Gerd Hoffmann Signed-off-by: Jeremy Fitzhardinge Acked-by: Ingo Molnar --- arch/x86_64/kernel/early_printk.c | 5 +++++ drivers/xen/hvc-console.c | 25 +++++++++++++++++++++++++ include/xen/hvc-console.h | 6 ++++++ 3 files changed, 36 insertions(+) =================================================================== --- a/arch/x86_64/kernel/early_printk.c +++ b/arch/x86_64/kernel/early_printk.c @@ -6,6 +6,7 @@ #include #include #include +#include /* Simple VGA output */ @@ -243,6 +244,10 @@ static int __init setup_early_printk(cha simnow_init(buf + 6); early_console = &simnow_console; keep_early = 1; +#ifdef CONFIG_XEN + } else if (!strncmp(buf, "xen", 3)) { + early_console = &xenboot_console; +#endif } register_console(early_console); return 0; =================================================================== --- a/drivers/xen/hvc-console.c +++ b/drivers/xen/hvc-console.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "../char/hvc_console.h" @@ -132,3 +133,27 @@ module_init(xen_init); module_init(xen_init); module_exit(xen_fini); console_initcall(xen_cons_init); + +static void xenboot_write_console(struct console *console, const char *string, + unsigned len) +{ + unsigned int linelen, off = 0; + const char *pos; + + while (off < len && NULL != (pos = strchr(string+off, '\n'))) { + linelen = pos-string+off; + if (off + linelen > len) + break; + write_console(0, string+off, linelen); + write_console(0, "\r\n", 2); + off += linelen + 1; + } + if (off < len) + write_console(0, string+off, len-off); +} + +struct console xenboot_console = { + .name = "xenboot", + .write = xenboot_write_console, + .flags = CON_PRINTBUFFER | CON_BOOT, +}; =================================================================== --- /dev/null +++ b/include/xen/hvc-console.h @@ -0,0 +1,6 @@ +#ifndef XEN_HVC_CONSOLE_H +#define XEN_HVC_CONSOLE_H + +extern struct console xenboot_console; + +#endif /* XEN_HVC_CONSOLE_H */ -- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754471AbXDWXNh (ORCPT ); Mon, 23 Apr 2007 19:13:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752250AbXDWXNg (ORCPT ); Mon, 23 Apr 2007 19:13:36 -0400 Received: from 61.sub-75-208-107.myvzw.com ([75.208.107.61]:38872 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932837AbXDWXHo (ORCPT ); Mon, 23 Apr 2007 19:07:44 -0400 Message-Id: <20070423215712.510683511@goop.org> References: <20070423215638.563901986@goop.org> User-Agent: quilt/0.46-1 Date: Mon, 23 Apr 2007 14:56:55 -0700 From: Jeremy Fitzhardinge To: Andi Kleen Cc: Andrew Morton , virtualization@lists.osdl.org, lkml , Ingo Molnar Subject: [PATCH 17/25] xen: Add early printk support via hvc console Content-Disposition: inline; filename=xen-hvc-earlyprintk.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Add early printk support via hvc console, enable using "earlyprintk=xen" on the kernel command line. From: Gerd Hoffmann Signed-off-by: Jeremy Fitzhardinge Acked-by: Ingo Molnar --- arch/x86_64/kernel/early_printk.c | 5 +++++ drivers/xen/hvc-console.c | 25 +++++++++++++++++++++++++ include/xen/hvc-console.h | 6 ++++++ 3 files changed, 36 insertions(+) =================================================================== --- a/arch/x86_64/kernel/early_printk.c +++ b/arch/x86_64/kernel/early_printk.c @@ -6,6 +6,7 @@ #include #include #include +#include /* Simple VGA output */ @@ -243,6 +244,10 @@ static int __init setup_early_printk(cha simnow_init(buf + 6); early_console = &simnow_console; keep_early = 1; +#ifdef CONFIG_XEN + } else if (!strncmp(buf, "xen", 3)) { + early_console = &xenboot_console; +#endif } register_console(early_console); return 0; =================================================================== --- a/drivers/xen/hvc-console.c +++ b/drivers/xen/hvc-console.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "../char/hvc_console.h" @@ -132,3 +133,27 @@ module_init(xen_init); module_init(xen_init); module_exit(xen_fini); console_initcall(xen_cons_init); + +static void xenboot_write_console(struct console *console, const char *string, + unsigned len) +{ + unsigned int linelen, off = 0; + const char *pos; + + while (off < len && NULL != (pos = strchr(string+off, '\n'))) { + linelen = pos-string+off; + if (off + linelen > len) + break; + write_console(0, string+off, linelen); + write_console(0, "\r\n", 2); + off += linelen + 1; + } + if (off < len) + write_console(0, string+off, len-off); +} + +struct console xenboot_console = { + .name = "xenboot", + .write = xenboot_write_console, + .flags = CON_PRINTBUFFER | CON_BOOT, +}; =================================================================== --- /dev/null +++ b/include/xen/hvc-console.h @@ -0,0 +1,6 @@ +#ifndef XEN_HVC_CONSOLE_H +#define XEN_HVC_CONSOLE_H + +extern struct console xenboot_console; + +#endif /* XEN_HVC_CONSOLE_H */ --