* [PATCH 1/2] serial: tegra: fix CREAD handling for PIO [not found] <20200710135947.2737-1-johan@kernel.org> @ 2020-07-10 13:59 ` Johan Hovold 2020-07-14 15:52 ` Thierry Reding 0 siblings, 1 reply; 2+ messages in thread From: Johan Hovold @ 2020-07-10 13:59 UTC (permalink / raw) To: Laxman Dewangan, Greg Kroah-Hartman Cc: Jiri Slaby, Thierry Reding, Jonathan Hunter, linux-serial, linux-tegra, linux-kernel, Johan Hovold, stable, Shardar Shariff Md, Krishna Yarlagadda Commit 33ae787b74fc ("serial: tegra: add support to ignore read") added support for dropping input in case CREAD isn't set, but for PIO the ignore_status_mask wasn't checked until after the character had been put in the receive buffer. Note that the NULL tty-port test is bogus and will be removed by a follow-on patch. Fixes: 33ae787b74fc ("serial: tegra: add support to ignore read") Cc: stable <stable@vger.kernel.org> # 5.4 Cc: Shardar Shariff Md <smohammed@nvidia.com> Cc: Krishna Yarlagadda <kyarlagadda@nvidia.com> Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/tty/serial/serial-tegra.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c index 8de8bac9c6c7..b3bbee6b6702 100644 --- a/drivers/tty/serial/serial-tegra.c +++ b/drivers/tty/serial/serial-tegra.c @@ -653,11 +653,14 @@ static void tegra_uart_handle_rx_pio(struct tegra_uart_port *tup, ch = (unsigned char) tegra_uart_read(tup, UART_RX); tup->uport.icount.rx++; - if (!uart_handle_sysrq_char(&tup->uport, ch) && tty) - tty_insert_flip_char(tty, ch, flag); + if (uart_handle_sysrq_char(&tup->uport, ch)) + continue; if (tup->uport.ignore_status_mask & UART_LSR_DR) continue; + + if (tty) + tty_insert_flip_char(tty, ch, flag); } while (1); } -- 2.26.2 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] serial: tegra: fix CREAD handling for PIO 2020-07-10 13:59 ` [PATCH 1/2] serial: tegra: fix CREAD handling for PIO Johan Hovold @ 2020-07-14 15:52 ` Thierry Reding 0 siblings, 0 replies; 2+ messages in thread From: Thierry Reding @ 2020-07-14 15:52 UTC (permalink / raw) To: Johan Hovold Cc: Laxman Dewangan, Greg Kroah-Hartman, Jiri Slaby, Jonathan Hunter, linux-serial, linux-tegra, linux-kernel, stable, Shardar Shariff Md, Krishna Yarlagadda [-- Attachment #1: Type: text/plain, Size: 856 bytes --] On Fri, Jul 10, 2020 at 03:59:46PM +0200, Johan Hovold wrote: > Commit 33ae787b74fc ("serial: tegra: add support to ignore read") added > support for dropping input in case CREAD isn't set, but for PIO the > ignore_status_mask wasn't checked until after the character had been > put in the receive buffer. > > Note that the NULL tty-port test is bogus and will be removed by a > follow-on patch. > > Fixes: 33ae787b74fc ("serial: tegra: add support to ignore read") > Cc: stable <stable@vger.kernel.org> # 5.4 > Cc: Shardar Shariff Md <smohammed@nvidia.com> > Cc: Krishna Yarlagadda <kyarlagadda@nvidia.com> > Signed-off-by: Johan Hovold <johan@kernel.org> > --- > drivers/tty/serial/serial-tegra.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Looks good to me: Acked-by: Thierry Reding <treding@nvidia.com> [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-14 15:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20200710135947.2737-1-johan@kernel.org>
2020-07-10 13:59 ` [PATCH 1/2] serial: tegra: fix CREAD handling for PIO Johan Hovold
2020-07-14 15:52 ` Thierry Reding
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).