Skip to contentSkip to conversation

console resume broken since ba15ab0e8de0d4439a91342ad52d55ca9e313f3d

DISCUSSION Sascha Hauer 2 participants 2 messages Sep 30, 2009 – Oct 4, 2009

lore
Share & tools
lore
#0 lore raw

This patch fixes setting the console speed if console suspend is disabled by breaking it if it is enabled, see below:

Quoted 67 lines

commit ba15ab0e8de0d4439a91342ad52d55ca9e313f3d

Author: Deepak Saxena <[email protected]>
Date:   Sat Sep 19 13:13:33 2009 -0700

Set proper console speed on resume if console suspend is disabled

Commit b5b82df6, from May 2007, breaks no_console_suspend on the OLPC XO laptop. Basically what happens is that upon returning from resume, serial8250_resume_port() will reconfigure the port for high speed mode and all console output will be garbled, making debug of the resume path painful. This patch modifies uart_resume_port() to reset the port to the state it was in before we suspended.

Original patch by Marcelo Tosatti

Second patch by Deepak then reworked by Alan to fit with the tty changes before it got submitted. Also fixed the console path to set c_i/ospeed as some drivers require the termios fields are valid

drivers/serial/serial_core.c +18 -6
index 3fd0134..2514d00 100644
@@ -2068,11 +2068,29 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
 	struct tty_port *port = &state->port;
 	struct device *tty_dev;
 	struct uart_match match = {uport, drv};
+	struct ktermios termios;
 
 	mutex_lock(&port->mutex);
 
 	if (!console_suspend_enabled && uart_console(uport)) {
 		/* no need to resume serial console, it wasn't suspended */
+		/*
+		 * First try to use the console cflag setting.
+		 */
+		memset(&termios, 0, sizeof(struct ktermios));
+		termios.c_cflag = uport->cons->cflag;
+		/*
+		 * If that's unset, use the tty termios setting.
+		 */
+		if (termios.c_cflag == 0)
+			termios = *state->port.tty->termios;
+		else {
+			termios.c_ispeed = termios.c_ospeed =
+				tty_termios_input_baud_rate(&termios);
+			termios.c_ispeed = termios.c_ospeed =
+				tty_termios_baud_rate(&termios);
+		}
+		uport->ops->set_termios(uport, &termios, NULL);
 		mutex_unlock(&port->mutex);
 		return 0;
 	}
@@ -2089,20 +2107,6 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
 	 * Re-enable the console device after suspending.
 	 */
 	if (uart_console(uport)) {
-		struct ktermios termios;
-
-		/*
-		 * First try to use the console cflag setting.
-		 */
-		memset(&termios, 0, sizeof(struct ktermios));

drivers/serial/serial_core.c int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) · line 2111

Quoted 10 lines
drivers/serial/serial_core.c +0 -8
-		termios.c_cflag = uport->cons->cflag;
-
-		/*
-		 * If that's unset, use the tty termios setting.
-		 */
-		if (port->tty && termios.c_cflag == 0)
-			termios = *port->tty->termios;
-
 		uart_change_pm(state, 0);
 		uport->ops->set_termios(uport, &termios, NULL);

We call ->set_termios with an unitialized struct ktermios here.

Any ideas what to do?

Sascha

Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#1 lore raw
Quoted 7 lines · Sascha Hauer

This patch fixes setting the console speed if console suspend is disabled by breaking it if it is enabled, see below:

Quoted 3 lines

commit ba15ab0e8de0d4439a91342ad52d55ca9e313f3d

Author: Deepak Saxena <[email protected]>
Date:   Sat Sep 19 13:13:33 2009 -0700

...

Quoted 31 lines
Quoted 17 lines

Set proper console speed on resume if console suspend is disabled

Commit b5b82df6, from May 2007, breaks no_console_suspend on the OLPC XO laptop. Basically what happens is that upon returning from resume, serial8250_resume_port() will reconfigure the port for high speed mode and all console output will be garbled, making debug of the resume path painful. This patch modifies uart_resume_port() to reset the port to the state it was in before we suspended.

Original patch by Marcelo Tosatti

(quoted diff) +0 -6
-		struct ktermios termios;
-
-		/*
-		 * First try to use the console cflag setting.
-		 */
-		memset(&termios, 0, sizeof(struct ktermios));

Review

Quoted 10 lines
(quoted diff) +0 -8
-		termios.c_cflag = uport->cons->cflag;
-
-		/*
-		 * If that's unset, use the tty termios setting.
-		 */
-		if (port->tty && termios.c_cflag == 0)
-			termios = *port->tty->termios;
-
 		uart_change_pm(state, 0);
 		uport->ops->set_termios(uport, &termios, NULL);

We call ->set_termios with an unitialized struct ktermios here.

Quoted 1 line

Any ideas what to do?

Revert the patch for now and make Deepak fix it properly?

Or maybe it is enough to just 'do nothing' in the 'if that's unset' branch?

Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html