Commit 8f4ce8c3 authored by Andres Salomon's avatar Andres Salomon Committed by Linus Torvalds
Browse files

serial: turn serial console suspend a boot rather than compile time option

Currently, there's a CONFIG_DISABLE_CONSOLE_SUSPEND that allows one to stop
the serial console from being suspended when the rest of the machine goes
to sleep.  This is incredibly useful for debugging power management-related
things; however, having it as a compile-time option has proved to be
incredibly inconvenient for us (OLPC).  There are plenty of times that we
want serial console to not suspend, but for the most part we'd like serial
console to be suspended.

This drops CONFIG_DISABLE_CONSOLE_SUSPEND, and replaces it with a kernel
boot parameter (no_console_suspend).  By default, the serial console will
be suspended along with the rest of the system; by passing
'no_console_suspend' to the kernel during boot, serial console will remain
alive during suspend.

For now, this is pretty serial console specific; further fixes could be
applied to make this work for things like netconsole.
Signed-off-by: default avatarAndres Salomon <>
Acked-by: default avatar"Rafael J. Wysocki" <>
Acked-by: default avatarPavel Machek <>
Cc: Nigel Cunningham <>
Cc: Russell King <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 438e2ce6
......@@ -479,6 +479,16 @@ and is between 256 and 4096 characters. It is defined in the file
UART at the specified I/O port or MMIO address.
The options are the same as for ttyS, above.
[HW] Never suspend the console
Disable suspending of consoles during suspend and
hibernate operations. Once disabled, debugging
messages can reach various consoles while the rest
of the system is being put to sleep (ie, while
debugging driver suspend/resume hooks). This may
not work reliably with all consoles, but is known
to work with serial and VGA consoles.
cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver
......@@ -78,8 +78,8 @@ c) Advanced debugging
In case the STD does not work on your system even in the minimal configuration
and compiling more drivers as modules is not practical or some modules cannot
be unloaded, you can use one of the more advanced debugging techniques to find
the problem. First, if there is a serial port in your box, you can set the
CONFIG_DISABLE_CONSOLE_SUSPEND kernel configuration option and try to log kernel
the problem. First, if there is a serial port in your box, you can boot the
kernel with the 'no_console_suspend' parameter and try to log kernel
messages using the serial console. This may provide you with some information
about the reasons of the suspend (resume) failure. Alternatively, it may be
possible to use a FireWire port for debugging with firescope
......@@ -209,7 +209,6 @@ CONFIG_PM=y
# CONFIG_PM_LEGACY is not set
# CONFIG_PM_VERBOSE is not set
......@@ -1959,12 +1959,11 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
if (uart_console(port)) {
if (!console_suspend_enabled && uart_console(port)) {
/* we're going to avoid suspending serial console */
return 0;
tty_dev = device_find_child(port->dev, &match, serial_match_port);
if (device_may_wakeup(tty_dev)) {
......@@ -2016,12 +2015,11 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
if (uart_console(port)) {
if (!console_suspend_enabled && uart_console(port)) {
/* no need to resume serial console, it wasn't suspended */
return 0;
if (!port->suspended) {
......@@ -122,14 +122,11 @@ extern void console_stop(struct console *);
extern void console_start(struct console *);
extern int is_console_locked(void);
extern int console_suspend_enabled;
/* Suspend and resume console messages over PM events */
extern void suspend_console(void);
extern void resume_console(void);
static inline void suspend_console(void) {}
static inline void resume_console(void) {}
int mda_console_init(void);
void prom_con_init(void);
......@@ -44,17 +44,6 @@ config PM_VERBOSE
This option enables verbose messages from the Power Management code.
bool "Keep console(s) enabled during suspend/resume (DANGEROUS)"
depends on PM_DEBUG && PM_SLEEP
default n
This option turns off the console suspend mechanism that prevents
debug messages from reaching the console during the suspend/resume
operations. This may be helpful when debugging device drivers'
suspend/resume routines, but may itself lead to problems, for example
if netconsole is used.
config PM_TRACE
bool "Suspend/resume event tracing"
depends on PM_DEBUG && X86 && PM_SLEEP && EXPERIMENTAL
......@@ -862,7 +862,16 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
return -1;
int console_suspend_enabled = 1;
static int __init console_suspend_disable(char *str)
console_suspend_enabled = 0;
return 1;
__setup("no_console_suspend", console_suspend_disable);
* suspend_console - suspend the console subsystem
......@@ -870,6 +879,8 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
void suspend_console(void)
if (!console_suspend_enabled)
printk("Suspending console(s)\n");
console_suspended = 1;
......@@ -877,10 +888,11 @@ void suspend_console(void)
void resume_console(void)
if (!console_suspend_enabled)
console_suspended = 0;
* acquire_console_sem - lock the console system for exclusive use.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment