Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8294e236 authored by Colin Cross's avatar Colin Cross Committed by Greg Kroah-Hartman
Browse files

staging: android: ram_console: drop early buffer support 



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: Android Kernel Team <kernel-team@android.com>
Signed-off-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6ccb80e

drivers/staging/android/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -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

drivers/staging/android/ram_console.c

+0 −29
Original line number Diff line number Diff line
@@ -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);