serial: core, move termios handling to uart_startup
We should not fiddle with speed and cflags in .dtr_rts hook. Actually we might not have tty at that moment already. So move the console cflag copy and speed setup into uart_startup. Actually the speed setup is already there, but we need to call it unconditionally (uart_startup is called from uart_open with hw_init = 0). This means we move uart_change_speed before dtr/rts setup in .dtr_rts. But this should not matter as the setup should be called after uart_change_speed anyway. Before: After: dtr/rts setup (dtr_rts) uart_change_speed (startup) uart_change_speed (update_termios) dtr/rts setup (dtr_rts) dtr/rts setup (update_termios) dtr/rts setup (update_termios) The second setup will dismiss with the next patch. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7c31bdb6b2
commit
c7d7abff40
@@ -172,12 +172,16 @@ static int uart_startup(struct tty_struct *tty, struct uart_state *state, int in
|
|||||||
|
|
||||||
retval = uport->ops->startup(uport);
|
retval = uport->ops->startup(uport);
|
||||||
if (retval == 0) {
|
if (retval == 0) {
|
||||||
if (init_hw) {
|
if (uart_console(uport) && uport->cons->cflag) {
|
||||||
/*
|
tty->termios->c_cflag = uport->cons->cflag;
|
||||||
* Initialise the hardware port settings.
|
uport->cons->cflag = 0;
|
||||||
*/
|
}
|
||||||
uart_change_speed(tty, state, NULL);
|
/*
|
||||||
|
* Initialise the hardware port settings.
|
||||||
|
*/
|
||||||
|
uart_change_speed(tty, state, NULL);
|
||||||
|
|
||||||
|
if (init_hw) {
|
||||||
/*
|
/*
|
||||||
* Setup the RTS and DTR signals once the
|
* Setup the RTS and DTR signals once the
|
||||||
* port is open and ready to respond.
|
* port is open and ready to respond.
|
||||||
@@ -1481,22 +1485,12 @@ static void uart_update_termios(struct tty_struct *tty,
|
|||||||
{
|
{
|
||||||
struct uart_port *port = state->uart_port;
|
struct uart_port *port = state->uart_port;
|
||||||
|
|
||||||
if (uart_console(port) && port->cons->cflag) {
|
|
||||||
tty->termios->c_cflag = port->cons->cflag;
|
|
||||||
port->cons->cflag = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If the device failed to grab its irq resources,
|
* If the device failed to grab its irq resources,
|
||||||
* or some other error occurred, don't try to talk
|
* or some other error occurred, don't try to talk
|
||||||
* to the port hardware.
|
* to the port hardware.
|
||||||
*/
|
*/
|
||||||
if (!(tty->flags & (1 << TTY_IO_ERROR))) {
|
if (!(tty->flags & (1 << TTY_IO_ERROR))) {
|
||||||
/*
|
|
||||||
* Make termios settings take effect.
|
|
||||||
*/
|
|
||||||
uart_change_speed(tty, state, NULL);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* And finally enable the RTS and DTR signals.
|
* And finally enable the RTS and DTR signals.
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user