linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
	Valerio Vanni <valerio.vanni@inwind.it>,
	Peter Hurley <peter@hurleysoftware.com>,
	Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: [PATCH 2/2] serial: core: Preserve termios c_cflag for console resume
Date: Wed,  4 Jun 2014 10:16:11 -0400	[thread overview]
Message-ID: <1401891371-4946-2-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1401891371-4946-1-git-send-email-peter@hurleysoftware.com>

When a tty is opened for the serial console, the termios c_cflag
settings are inherited from the console line settings.
However, if the tty is subsequently closed, the termios settings
are lost. This results in a garbled console if the console is later
suspended and resumed.

Preserve the termios c_cflag for the serial console when the tty
is shutdown; this reflects the most recent line settings.

Fixes: Bugzilla #69751, 'serial console does not wake from S3'
Reported-by: Valerio Vanni <valerio.vanni@inwind.it>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
 drivers/tty/serial/serial_core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 498b149..a67861c 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -239,6 +239,9 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
 		/*
 		 * Turn off DTR and RTS early.
 		 */
+		if (uart_console(uport) && tty)
+			uport->cons->cflag = tty->termios.c_cflag;
+
 		if (!uart_console(uport) &&
 		    (!tty || (tty->termios.c_cflag & HUPCL)))
 			uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
-- 
1.9.1

  reply	other threads:[~2014-06-04 14:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-30  9:53 serial console does not wake from S3 suspend Valerio Vanni
2014-06-04 14:16 ` [PATCH 1/2] serial: core: Don't drop DTR if system console Peter Hurley
2014-06-04 14:16   ` Peter Hurley [this message]
2014-06-04 14:22     ` [PATCH 2/2] serial: core: Preserve termios c_cflag for console resume Greg Kroah-Hartman
2014-06-04 14:46       ` Peter Hurley
2014-06-04 14:48         ` Peter Hurley
2014-06-04 23:31         ` Valerio Vanni
2014-06-05  8:58           ` Valerio Vanni
2014-06-04 14:22   ` [PATCH 1/2] serial: core: Don't drop DTR if system console Greg Kroah-Hartman
2014-06-04 14:36     ` Peter Hurley
2014-06-09 13:08   ` One Thousand Gnomes
2014-06-10  1:20     ` Peter Hurley
2014-06-10 11:01       ` One Thousand Gnomes
2014-06-10 12:30         ` Peter Hurley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401891371-4946-2-git-send-email-peter@hurleysoftware.com \
    --to=peter@hurleysoftware.com \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=valerio.vanni@inwind.it \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).