From patchwork Wed Mar 7 21:58:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 7141 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A7ABE23E64 for ; Wed, 7 Mar 2012 21:58:40 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6F60BA181D7 for ; Wed, 7 Mar 2012 21:58:40 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so12341121iag.11 for ; Wed, 07 Mar 2012 13:58:40 -0800 (PST) Received: by 10.50.158.133 with SMTP id wu5mr13390133igb.50.1331157520171; Wed, 07 Mar 2012 13:58:40 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.53.18 with SMTP id k18csp22992ibg; Wed, 7 Mar 2012 13:58:38 -0800 (PST) Received: by 10.68.74.197 with SMTP id w5mr5704000pbv.129.1331157517955; Wed, 07 Mar 2012 13:58:37 -0800 (PST) Received: from e34.co.us.ibm.com (e34.co.us.ibm.com. [32.97.110.152]) by mx.google.com with ESMTPS id o5si2275391pbd.28.2012.03.07.13.58.37 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Mar 2012 13:58:37 -0800 (PST) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.152 as permitted sender) client-ip=32.97.110.152; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.152 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Mar 2012 14:58:36 -0700 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Mar 2012 14:58:33 -0700 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 452B7C90067; Wed, 7 Mar 2012 16:58:32 -0500 (EST) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q27LwVGJ3002608; Wed, 7 Mar 2012 16:58:31 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q27LwV7k018561; Wed, 7 Mar 2012 18:58:31 -0300 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q27LwVMx018520; Wed, 7 Mar 2012 18:58:31 -0300 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 496B5C041B; Wed, 7 Mar 2012 13:58:30 -0800 (PST) From: John Stultz To: lkml Cc: Colin Cross , Greg KH , Android Kernel Team , John Stultz Subject: [PATCH 04/13] android: ram_console: drop early buffer support Date: Wed, 7 Mar 2012 13:58:14 -0800 Message-Id: <1331157503-3413-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1331157503-3413-1-git-send-email-john.stultz@linaro.org> References: <1331157503-3413-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12030721-1780-0000-0000-000003CBC4DC X-IBM-ISS-SpamDetectors: X-IBM-ISS-DetailInfo: BY=3.00000256; HX=3.00000185; KW=3.00000007; PH=3.00000001; SC=3.00000001; SDB=6.00120044; UDB=6.00029043; UTC=2012-03-07 21:58:35 X-Gm-Message-State: ALoCoQnQP4hay9ORhgDuyEJjrrCBwcvp5j/Yrv3/oYnoleH8MioKaBcI9H3FUf4Y/RLBX8pLyOja From: Colin Cross Early ramconsole is not very useful, an early crash will prevent getting the logged data out on the next boot, and CONFIG_DEBUG_LL=y will get the same information. Drop it to simplify a future refactoring. CC: Greg KH CC: Android Kernel Team Change-Id: Ifc306db9a8cceec4ca980cf24783c3fe764eb1fb Signed-off-by: Colin Cross Signed-off-by: John Stultz --- drivers/staging/android/Kconfig | 16 ---------------- drivers/staging/android/ram_console.c | 29 ----------------------------- 2 files changed, 0 insertions(+), 45 deletions(-) diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index f3b7c75..20034e6 100644 --- a/drivers/staging/android/Kconfig +++ b/drivers/staging/android/Kconfig @@ -39,7 +39,6 @@ menuconfig ANDROID_RAM_CONSOLE_ERROR_CORRECTION bool "Android RAM Console Enable error correction" default n depends on ANDROID_RAM_CONSOLE - depends on !ANDROID_RAM_CONSOLE_EARLY_INIT select REED_SOLOMON select REED_SOLOMON_ENC8 select REED_SOLOMON_DEC8 @@ -70,21 +69,6 @@ config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL endif # ANDROID_RAM_CONSOLE_ERROR_CORRECTION -config ANDROID_RAM_CONSOLE_EARLY_INIT - bool "Start Android RAM console early" - default n - depends on ANDROID_RAM_CONSOLE - -config ANDROID_RAM_CONSOLE_EARLY_ADDR - hex "Android RAM console virtual address" - default 0 - depends on ANDROID_RAM_CONSOLE_EARLY_INIT - -config ANDROID_RAM_CONSOLE_EARLY_SIZE - hex "Android RAM console buffer size" - default 0 - depends on ANDROID_RAM_CONSOLE_EARLY_INIT - config ANDROID_TIMED_OUTPUT bool "Timed output class driver" default y diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c index 2310a79..ed7827b 100644 --- a/drivers/staging/android/ram_console.c +++ b/drivers/staging/android/ram_console.c @@ -36,10 +36,6 @@ struct ram_console_buffer { #define RAM_CONSOLE_SIG (0x43474244) /* DBGC */ -#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT -static char __initdata - ram_console_old_log_init_buffer[CONFIG_ANDROID_RAM_CONSOLE_EARLY_SIZE]; -#endif static char *ram_console_old_log; static size_t ram_console_old_log_size; static const char *bootinfo; @@ -313,16 +309,6 @@ static ssize_t ram_console_ecc_string(char *str, size_t len) #endif } -#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT -static int __init ram_console_early_init(void) -{ - return ram_console_init((struct ram_console_buffer *) - CONFIG_ANDROID_RAM_CONSOLE_EARLY_ADDR, - CONFIG_ANDROID_RAM_CONSOLE_EARLY_SIZE, - NULL, - ram_console_old_log_init_buffer); -} -#else static int ram_console_driver_probe(struct platform_device *pdev) { struct resource *res = pdev->resource; @@ -369,7 +355,6 @@ static int __init ram_console_module_init(void) err = platform_driver_register(&ram_console_driver); return err; } -#endif static ssize_t ram_console_read_old(struct file *file, char __user *buf, size_t len, loff_t *offset) @@ -431,16 +416,6 @@ static int __init ram_console_late_init(void) if (ram_console_old_log == NULL) return 0; -#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT - ram_console_old_log = kmemdup(ram_console_old_log_init_buffer, - ram_console_old_log_size, GFP_KERNEL); - if (ram_console_old_log == NULL) { - printk(KERN_ERR - "ram_console: failed to allocate buffer for old log\n"); - ram_console_old_log_size = 0; - return 0; - } -#endif entry = create_proc_entry("last_kmsg", S_IFREG | S_IRUGO, NULL); if (!entry) { printk(KERN_ERR "ram_console: failed to create proc entry\n"); @@ -454,10 +429,6 @@ static int __init ram_console_late_init(void) return 0; } -#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT -console_initcall(ram_console_early_init); -#else postcore_initcall(ram_console_module_init); -#endif late_initcall(ram_console_late_init);