From d8cad20cf29147ff4defe849ca2b9318d0595771 Mon Sep 17 00:00:00 2001 From: "shihhao.feng" <shihhao.feng@lge.com> Date: Fri, 9 Aug 2013 10:49:16 -0700 Subject: [PATCH] panic: resume console if panic after console suspend. Device rebooted by kernel panic but no panic message. This helps to get the panic messages in this case. Change-Id: If6a9b0d2d593b6006f4e49ff86a2047774a9cddc Signed-off-by: shihhao.feng <shihhao.feng@lge.com> Signed-off-by: Devin Kim <dojip.kim@lge.com> --- include/linux/console.h | 1 + kernel/panic.c | 5 +++++ kernel/printk.c | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/include/linux/console.h b/include/linux/console.h index 73bab0f58af5..c0e08d6ad6ca 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -167,6 +167,7 @@ static inline void console_sysfs_notify(void) { } #endif extern bool console_suspend_enabled; +extern int is_console_suspended(void); /* Suspend and resume console messages over PM events */ extern void suspend_console(void); diff --git a/kernel/panic.c b/kernel/panic.c index 449a10219cbe..9b13790b5743 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -8,6 +8,7 @@ * This function is used through-out the kernel (including mm and fs) * to indicate a major problem. */ +#include <linux/console.h> #include <linux/debug_locks.h> #include <linux/interrupt.h> #include <linux/kmsg_dump.h> @@ -132,6 +133,10 @@ void panic(const char *fmt, ...) */ smp_send_stop(); + /* print last_kmsg even after console suspend */ + if (is_console_suspended()) + resume_console(); + kmsg_dump(KMSG_DUMP_PANIC); atomic_notifier_call_chain(&panic_notifier_list, 0, buf); diff --git a/kernel/printk.c b/kernel/printk.c index f4a94dd7b1db..76103c2a7cb5 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -2155,6 +2155,12 @@ module_param_named(console_suspend, console_suspend_enabled, MODULE_PARM_DESC(console_suspend, "suspend console during suspend" " and hibernate operations"); +/* check current suspend/resume status of the console */ +int is_console_suspended(void) +{ + return console_suspended; +} + /** * suspend_console - suspend the console subsystem * -- GitLab