From: Sergey Organov <sorganov@gmail.com> To: linux-serial@vger.kernel.org Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Sascha Hauer" <s.hauer@pengutronix.de>, "Sergey Organov" <sorganov@gmail.com>, "NXP Linux Team" <linux-imx@nxp.com>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 3/7] serial: imx: set_termios(): clarify RTS/CTS bits calculation Date: Thu, 4 Jul 2019 16:00:25 +0300 [thread overview] Message-ID: <1562245229-709-4-git-send-email-sorganov@gmail.com> (raw) In-Reply-To: <1562245229-709-1-git-send-email-sorganov@gmail.com> Avoid repeating the same code for rs485 twice. Make it obvious we clear CRTSCTS bit in termios->c_cflag whenever sport->have_rtscts is false. Make it obvious we clear UCR2_IRTS whenever CRTSCTS is set. Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de> Tested-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sergey Organov <sorganov@gmail.com> --- drivers/tty/serial/imx.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 87802fd..17e2322 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1567,35 +1567,25 @@ imx_uart_set_termios(struct uart_port *port, struct ktermios *termios, if ((termios->c_cflag & CSIZE) == CS8) ucr2 |= UCR2_WS; - if (termios->c_cflag & CRTSCTS) { - if (sport->have_rtscts) { - ucr2 &= ~UCR2_IRTS; + if (!sport->have_rtscts) + termios->c_cflag &= ~CRTSCTS; - if (port->rs485.flags & SER_RS485_ENABLED) { - /* - * RTS is mandatory for rs485 operation, so keep - * it under manual control and keep transmitter - * disabled. - */ - if (port->rs485.flags & - SER_RS485_RTS_AFTER_SEND) - imx_uart_rts_active(sport, &ucr2); - else - imx_uart_rts_inactive(sport, &ucr2); - } else { - imx_uart_rts_auto(sport, &ucr2); - } - } else { - termios->c_cflag &= ~CRTSCTS; - } - } else if (port->rs485.flags & SER_RS485_ENABLED) { - /* disable transmitter */ + if (port->rs485.flags & SER_RS485_ENABLED) { + /* + * RTS is mandatory for rs485 operation, so keep + * it under manual control and keep transmitter + * disabled. + */ if (port->rs485.flags & SER_RS485_RTS_AFTER_SEND) imx_uart_rts_active(sport, &ucr2); else imx_uart_rts_inactive(sport, &ucr2); - } + } else if (termios->c_cflag & CRTSCTS) + imx_uart_rts_auto(sport, &ucr2); + + if (termios->c_cflag & CRTSCTS) + ucr2 &= ~UCR2_IRTS; if (termios->c_cflag & CSTOPB) ucr2 |= UCR2_STPB; -- 2.10.0.1.g57b01a3
WARNING: multiple messages have this Message-ID (diff)
From: Sergey Organov <sorganov@gmail.com> To: linux-serial@vger.kernel.org Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Sascha Hauer" <s.hauer@pengutronix.de>, "Sergey Organov" <sorganov@gmail.com>, "NXP Linux Team" <linux-imx@nxp.com>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 3/7] serial: imx: set_termios(): clarify RTS/CTS bits calculation Date: Thu, 4 Jul 2019 16:00:25 +0300 [thread overview] Message-ID: <1562245229-709-4-git-send-email-sorganov@gmail.com> (raw) In-Reply-To: <1562245229-709-1-git-send-email-sorganov@gmail.com> Avoid repeating the same code for rs485 twice. Make it obvious we clear CRTSCTS bit in termios->c_cflag whenever sport->have_rtscts is false. Make it obvious we clear UCR2_IRTS whenever CRTSCTS is set. Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de> Tested-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sergey Organov <sorganov@gmail.com> --- drivers/tty/serial/imx.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 87802fd..17e2322 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1567,35 +1567,25 @@ imx_uart_set_termios(struct uart_port *port, struct ktermios *termios, if ((termios->c_cflag & CSIZE) == CS8) ucr2 |= UCR2_WS; - if (termios->c_cflag & CRTSCTS) { - if (sport->have_rtscts) { - ucr2 &= ~UCR2_IRTS; + if (!sport->have_rtscts) + termios->c_cflag &= ~CRTSCTS; - if (port->rs485.flags & SER_RS485_ENABLED) { - /* - * RTS is mandatory for rs485 operation, so keep - * it under manual control and keep transmitter - * disabled. - */ - if (port->rs485.flags & - SER_RS485_RTS_AFTER_SEND) - imx_uart_rts_active(sport, &ucr2); - else - imx_uart_rts_inactive(sport, &ucr2); - } else { - imx_uart_rts_auto(sport, &ucr2); - } - } else { - termios->c_cflag &= ~CRTSCTS; - } - } else if (port->rs485.flags & SER_RS485_ENABLED) { - /* disable transmitter */ + if (port->rs485.flags & SER_RS485_ENABLED) { + /* + * RTS is mandatory for rs485 operation, so keep + * it under manual control and keep transmitter + * disabled. + */ if (port->rs485.flags & SER_RS485_RTS_AFTER_SEND) imx_uart_rts_active(sport, &ucr2); else imx_uart_rts_inactive(sport, &ucr2); - } + } else if (termios->c_cflag & CRTSCTS) + imx_uart_rts_auto(sport, &ucr2); + + if (termios->c_cflag & CRTSCTS) + ucr2 &= ~UCR2_IRTS; if (termios->c_cflag & CSTOPB) ucr2 |= UCR2_STPB; -- 2.10.0.1.g57b01a3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-07-04 13:00 UTC|newest] Thread overview: 154+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-14 7:28 [PATCH] serial: imx: fix RTS/CTS setting Sascha Hauer 2019-06-14 7:28 ` Sascha Hauer 2019-06-14 7:48 ` Uwe Kleine-König 2019-06-14 7:48 ` Uwe Kleine-König 2019-06-14 12:11 ` [PATCH RFC 0/7] serial: imx: fix RTS and RTS/CTS handling Sergey Organov 2019-06-14 12:11 ` Sergey Organov 2019-06-14 12:11 ` [PATCH RFC 1/7] serial: imx: fix locking in set_termios() Sergey Organov 2019-06-14 12:11 ` Sergey Organov 2019-06-14 12:11 ` [PATCH RFC 2/7] serial: imx: set_termios(): factor-out 'ucr2' initial value Sergey Organov 2019-06-14 12:11 ` Sergey Organov 2019-06-14 12:11 ` [PATCH RFC 3/7] serial: imx: set_termios(): clarify RTS/CTS bits calculation Sergey Organov 2019-06-14 12:11 ` Sergey Organov 2019-06-14 12:11 ` [PATCH RFC 4/7] serial: imx: set_termios(): do not enable autoRTS if RTS is unset Sergey Organov 2019-06-14 12:11 ` Sergey Organov 2019-06-20 9:37 ` Sascha Hauer 2019-06-20 9:37 ` Sascha Hauer 2019-06-20 13:24 ` Sergey Organov 2019-06-20 13:24 ` Sergey Organov 2019-06-14 12:11 ` [PATCH RFC 5/7] serial: imx: set_termios(): preserve RTS state Sergey Organov 2019-06-14 12:11 ` Sergey Organov 2019-06-14 13:05 ` Lothar Waßmann 2019-06-14 13:28 ` Sergey Organov 2019-06-14 12:11 ` [PATCH RFC 6/7] serial: imx: set_mctrl(): correctly restore autoRTS state Sergey Organov 2019-06-14 12:11 ` Sergey Organov 2019-06-14 12:11 ` [PATCH RFC 7/7] serial: imx: get rid of imx_uart_rts_auto() Sergey Organov 2019-06-14 12:11 ` Sergey Organov 2019-06-20 14:47 ` [PATCH RFC v1 0/7] serial: imx: fix RTS and RTS/CTS handling Sergey Organov 2019-06-20 14:47 ` [PATCH RFC v1 1/7] serial: imx: fix locking in set_termios() Sergey Organov 2019-06-20 14:47 ` Sergey Organov 2019-06-20 14:47 ` [PATCH RFC v1 2/7] serial: imx: set_termios(): factor-out 'ucr2' initial value Sergey Organov 2019-06-20 14:47 ` Sergey Organov 2019-06-20 14:47 ` [PATCH RFC v1 3/7] serial: imx: set_termios(): clarify RTS/CTS bits calculation Sergey Organov 2019-06-20 14:47 ` Sergey Organov 2019-06-20 14:47 ` [PATCH RFC v1 4/7] serial: imx: set_termios(): preserve RTS state Sergey Organov 2019-06-20 14:47 ` Sergey Organov 2019-06-20 14:47 ` [PATCH RFC v1 5/7] serial: imx: set_termios(): do not enable autoRTS if RTS is unset Sergey Organov 2019-06-20 14:47 ` Sergey Organov 2019-06-20 14:47 ` [PATCH RFC v1 6/7] serial: imx: set_mctrl(): correctly restore autoRTS state Sergey Organov 2019-06-20 14:47 ` Sergey Organov 2019-06-20 14:47 ` [PATCH RFC v1 7/7] serial: imx: get rid of imx_uart_rts_auto() Sergey Organov 2019-06-20 14:47 ` Sergey Organov 2019-06-26 10:00 ` [PATCH RFC v1 0/7] serial: imx: fix RTS and RTS/CTS handling Sascha Hauer 2019-06-26 10:00 ` Sascha Hauer 2019-06-26 11:19 ` Sergey Organov 2019-06-26 11:19 ` Sergey Organov 2019-06-26 14:11 ` [PATCH v2 " Sergey Organov 2019-06-26 14:11 ` [PATCH v2 1/7] serial: imx: fix locking in set_termios() Sergey Organov 2019-06-26 14:11 ` Sergey Organov 2019-06-27 5:05 ` Uwe Kleine-König 2019-06-27 5:05 ` Uwe Kleine-König 2019-06-26 14:11 ` [PATCH v2 2/7] serial: imx: set_termios(): factor-out 'ucr2' initial value Sergey Organov 2019-06-26 14:11 ` Sergey Organov 2019-06-27 5:05 ` Uwe Kleine-König 2019-06-27 5:05 ` Uwe Kleine-König 2019-06-26 14:11 ` [PATCH v2 3/7] serial: imx: set_termios(): clarify RTS/CTS bits calculation Sergey Organov 2019-06-26 14:11 ` Sergey Organov 2019-06-27 5:26 ` Uwe Kleine-König 2019-06-27 5:26 ` Uwe Kleine-König 2019-06-27 5:58 ` Sergey Organov 2019-06-26 14:11 ` [PATCH v2 4/7] serial: imx: set_termios(): preserve RTS state Sergey Organov 2019-06-26 14:11 ` Sergey Organov 2019-06-27 5:40 ` Uwe Kleine-König 2019-06-27 5:40 ` Uwe Kleine-König 2019-06-27 6:15 ` Sergey Organov 2019-06-26 14:11 ` [PATCH v2 5/7] serial: imx: set_termios(): do not enable autoRTS if RTS is unset Sergey Organov 2019-06-26 14:11 ` Sergey Organov 2019-06-27 5:47 ` Uwe Kleine-König 2019-06-27 5:47 ` Uwe Kleine-König 2019-06-27 6:16 ` Sergey Organov 2019-06-26 14:11 ` [PATCH v2 6/7] serial: imx: set_mctrl(): correctly restore autoRTS state Sergey Organov 2019-06-26 14:11 ` Sergey Organov 2019-06-27 6:05 ` Uwe Kleine-König 2019-06-27 6:05 ` Uwe Kleine-König 2019-06-27 7:01 ` Sergey Organov 2019-06-26 14:11 ` [PATCH v2 7/7] serial: imx: get rid of imx_uart_rts_auto() Sergey Organov 2019-06-26 14:11 ` Sergey Organov 2019-06-27 6:08 ` Uwe Kleine-König 2019-06-27 6:08 ` Uwe Kleine-König 2019-06-27 7:58 ` Sergey Organov 2019-07-04 13:00 ` [PATCH v3 0/7] serial: imx: fix RTS and RTS/CTS handling Sergey Organov 2019-07-04 13:00 ` [PATCH v3 1/7] serial: imx: fix locking in set_termios() Sergey Organov 2019-07-04 13:00 ` [PATCH v3 2/7] serial: imx: set_termios(): factor-out 'ucr2' initial value Sergey Organov 2019-07-04 13:00 ` Sergey Organov [this message] 2019-07-04 13:00 ` [PATCH v3 3/7] serial: imx: set_termios(): clarify RTS/CTS bits calculation Sergey Organov 2019-07-04 13:00 ` [PATCH v3 4/7] serial: imx: set_termios(): preserve RTS state Sergey Organov 2019-07-04 13:00 ` Sergey Organov 2019-07-04 13:00 ` [PATCH v3 5/7] serial: imx: set_termios(): do not enable autoRTS if RTS is unset Sergey Organov 2019-07-04 13:00 ` Sergey Organov 2019-07-04 13:00 ` [PATCH v3 6/7] serial: imx: set_mctrl(): correctly restore autoRTS state Sergey Organov 2019-07-04 13:00 ` Sergey Organov 2019-07-04 13:00 ` [PATCH v3 7/7] serial: imx: get rid of imx_uart_rts_auto() Sergey Organov 2019-07-04 13:00 ` Sergey Organov 2019-07-19 8:47 ` [PATCH v4 0/3] serial: imx: fix RTS and RTS/CTS handling Sergey Organov 2019-07-19 8:47 ` [PATCH v4 1/3] serial: imx: set_termios(): do not enable autoRTS if RTS is unset Sergey Organov 2019-07-19 8:47 ` Sergey Organov 2019-07-19 9:11 ` Uwe Kleine-König 2019-07-19 9:11 ` Uwe Kleine-König 2019-07-19 12:18 ` Sergey Organov 2019-07-19 14:31 ` Uwe Kleine-König 2019-07-19 14:31 ` Uwe Kleine-König 2019-07-19 15:13 ` Sergey Organov 2019-07-19 20:19 ` Uwe Kleine-König 2019-07-19 20:19 ` Uwe Kleine-König 2019-07-22 7:42 ` Sergey Organov 2019-07-22 7:51 ` Uwe Kleine-König 2019-07-22 7:51 ` Uwe Kleine-König 2019-07-22 9:20 ` Sergey Organov 2019-07-22 9:46 ` Uwe Kleine-König 2019-07-22 9:46 ` Uwe Kleine-König 2019-07-22 13:54 ` Sergey Organov 2019-07-22 16:47 ` Uwe Kleine-König 2019-07-22 16:47 ` Uwe Kleine-König 2019-07-22 9:57 ` Russell King - ARM Linux admin 2019-07-22 9:57 ` Russell King - ARM Linux admin 2019-07-22 10:04 ` Uwe Kleine-König 2019-07-22 10:04 ` Uwe Kleine-König 2019-07-22 10:17 ` Russell King - ARM Linux admin 2019-07-22 10:17 ` Russell King - ARM Linux admin 2019-07-19 8:47 ` [PATCH v4 2/3] serial: imx: set_mctrl(): correctly restore autoRTS state Sergey Organov 2019-07-19 8:47 ` Sergey Organov 2019-07-19 8:47 ` [PATCH v4 3/3] serial: imx: get rid of imx_uart_rts_auto() Sergey Organov 2019-07-19 8:47 ` Sergey Organov 2019-07-22 9:22 ` [PATCH v5 0/3] serial: imx: fix RTS and RTS/CTS handling Sergey Organov 2019-07-22 9:22 ` [PATCH v5 1/3] serial: imx: set_termios(): do not enable autoRTS if RTS is unset Sergey Organov 2019-07-22 9:54 ` Uwe Kleine-König 2019-07-22 9:54 ` Uwe Kleine-König 2019-07-22 13:57 ` Sergey Organov 2019-07-22 16:20 ` Uwe Kleine-König 2019-07-22 16:20 ` Uwe Kleine-König 2019-07-22 19:09 ` Sergey Organov 2019-07-22 9:22 ` [PATCH v5 2/3] serial: imx: set_mctrl(): correctly restore autoRTS state Sergey Organov 2019-07-22 9:22 ` [PATCH v5 3/3] serial: imx: get rid of imx_uart_rts_auto() Sergey Organov 2019-07-22 19:22 ` [PATCH v6 0/3] serial: imx: fix RTS and RTS/CTS handling Sergey Organov 2019-07-22 19:22 ` [PATCH v6 1/3] serial: imx: set_termios(): do not enable autoRTS if RTS is unset Sergey Organov 2019-07-22 19:22 ` [PATCH v6 2/3] serial: imx: set_mctrl(): correctly restore autoRTS state Sergey Organov 2019-07-22 20:24 ` Uwe Kleine-König 2019-07-22 20:24 ` Uwe Kleine-König 2019-07-23 9:20 ` Sergey Organov 2019-07-23 9:49 ` Uwe Kleine-König 2019-07-23 9:49 ` Uwe Kleine-König 2019-07-23 11:16 ` Sergey Organov 2019-07-23 11:30 ` Sergey Organov 2019-07-22 19:22 ` [PATCH v6 3/3] serial: imx: get rid of imx_uart_rts_auto() Sergey Organov 2019-07-26 18:52 ` [PATCH v7 0/3] serial: imx: fix RTS and RTS/CTS handling Sergey Organov 2019-07-26 18:52 ` [PATCH v7 1/3] serial: imx: set_termios(): do not enable autoRTS if RTS is unset Sergey Organov 2019-07-26 18:52 ` [PATCH v7 2/3] serial: imx: set_mctrl(): correctly restore autoRTS state Sergey Organov 2019-07-26 18:52 ` Sergey Organov 2019-07-26 18:52 ` [PATCH v7 3/3] serial: imx: get rid of imx_uart_rts_auto() Sergey Organov 2019-07-26 18:52 ` Sergey Organov 2019-07-26 19:29 ` Uwe Kleine-König 2019-07-26 19:29 ` Uwe Kleine-König 2019-07-29 9:03 ` Sergey Organov 2019-07-29 9:29 ` Uwe Kleine-König 2019-07-29 9:29 ` Uwe Kleine-König
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=1562245229-709-4-git-send-email-sorganov@gmail.com \ --to=sorganov@gmail.com \ --cc=gregkh@linuxfoundation.org \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-serial@vger.kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=u.kleine-koenig@pengutronix.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.