From: Sergey Organov <sorganov@gmail.com>
To: Johan Hovold <johan@kernel.org>
Cc: linux-serial@vger.kernel.org,
"Fabio Estevam" <festevam@gmail.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Jiri Slaby" <jirislaby@kernel.org>,
"Richard Genoud" <richard.genoud@gmail.com>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Shawn Guo" <shawnguo@kernel.org>,
"Tim Harvey" <tharvey@gateworks.com>,
"Tomasz Moń" <tomasz.mon@camlingroup.com>,
linux-arm-kernel@lists.infradead.org,
"NXP Linux Team" <linux-imx@nxp.com>,
"Pengutronix Kernel Team" <kernel@pengutronix.de>
Subject: Re: [PATCH 3/8] serial: imx: do not sysrq broken chars
Date: Tue, 17 Jan 2023 20:35:48 +0300 [thread overview]
Message-ID: <87sfg92he3.fsf@osv.gnss.ru> (raw)
In-Reply-To: <Y8VsFx3p+viCp1It@hovoldconsulting.com> (Johan Hovold's message of "Mon, 16 Jan 2023 16:24:07 +0100")
Johan Hovold <johan@kernel.org> writes:
> On Fri, Jan 13, 2023 at 09:43:29PM +0300, Sergey Organov wrote:
>> Do not call uart_handle_sysrq_char() if we got any receive error along with
>> the character, as we don't want random junk to be considered a sysrq.
>>
>> Signed-off-by: Sergey Organov <sorganov@gmail.com>
>> ---
>> drivers/tty/serial/imx.c | 6 ++----
>> 1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
>> index e7fce31e460d..1c950112a598 100644
>> --- a/drivers/tty/serial/imx.c
>> +++ b/drivers/tty/serial/imx.c
>> @@ -911,9 +911,6 @@ static irqreturn_t __imx_uart_rxint(int irq, void *dev_id)
>> continue;
>> }
>>
>> - if (uart_handle_sysrq_char(&sport->port, (unsigned char)rx))
>> - continue;
>> -
>> if (unlikely(rx & URXD_ERR)) {
>> if (rx & URXD_BRK)
>> sport->port.icount.brk++;
>> @@ -942,7 +939,8 @@ static irqreturn_t __imx_uart_rxint(int irq, void *dev_id)
>> flg = TTY_OVERRUN;
>>
>> sport->port.sysrq = 0;
>> - }
>> + } else if (uart_handle_sysrq_char(&sport->port, (unsigned char)rx))
>> + continue;
>
> Nit: missing braces {}
>
> Note that you could also place just place this after the block due to
> the reset of the sysrq time stamp.
Thanks, I think I'll opt for adding braces. Relying on the reset of the
timestamp feels a bit convoluted.
--
Sergey
_______________________________________________
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:[~2023-01-17 17:37 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87bko4e65y.fsf@osv.gnss.ru>
2023-01-13 18:43 ` [PATCH 0/8] serial: imx: work-around for hardware RX flood, and then isr improvements Sergey Organov
2023-01-13 18:43 ` [PATCH 1/8] serial: imx: factor-out common code to imx_uart_soft_reset() Sergey Organov
2023-01-16 10:30 ` Ilpo Järvinen
2023-01-17 13:42 ` Sergey Organov
2023-01-13 18:43 ` [PATCH 2/8] serial: imx: work-around for hardware RX flood Sergey Organov
2023-01-13 18:43 ` [PATCH 3/8] serial: imx: do not sysrq broken chars Sergey Organov
2023-01-16 10:41 ` Ilpo Järvinen
2023-01-16 15:24 ` Johan Hovold
2023-01-17 17:35 ` Sergey Organov [this message]
2023-01-18 8:06 ` Johan Hovold
2023-01-13 18:43 ` [PATCH 4/8] serial: imx: do not break from FIFO reading loop prematurely Sergey Organov
2023-01-13 18:43 ` [PATCH 5/8] serial: imx: remove redundant USR2 read from FIFO reading loop Sergey Organov
2023-01-16 10:50 ` Ilpo Järvinen
2023-01-13 18:43 ` [PATCH 6/8] serial: imx: stop using USR2 in " Sergey Organov
2023-01-16 10:54 ` Ilpo Järvinen
2023-01-17 13:30 ` Sergey Organov
2023-01-13 18:43 ` [PATCH 7/8] serial: imx: use readl() to optimize " Sergey Organov
2023-01-16 11:03 ` Ilpo Järvinen
2023-01-17 17:43 ` Sergey Organov
2023-01-18 8:24 ` Ilpo Järvinen
2023-01-18 15:43 ` Sergey Organov
2023-01-18 19:29 ` Ilpo Järvinen
2023-01-17 10:20 ` Sherry Sun
2023-01-17 17:48 ` Sergey Organov
2023-01-17 11:32 ` Uwe Kleine-König
2023-01-17 13:22 ` Sergey Organov
2023-01-17 21:27 ` Uwe Kleine-König
2023-01-18 15:40 ` Sergey Organov
2023-01-19 7:01 ` Uwe Kleine-König
2023-01-21 18:04 ` Sergey Organov
2023-01-13 18:43 ` [PATCH 8/8] serial: imx: refine local variables in rxint() Sergey Organov
2023-01-21 15:36 ` [PATCH v1 0/7] serial: imx: work-around for hardware RX flood, and then isr improvements Sergey Organov
2023-01-21 15:36 ` [PATCH v1 1/7] serial: imx: factor-out common code to imx_uart_soft_reset() Sergey Organov
2023-01-21 15:36 ` [PATCH v1 2/7] serial: imx: work-around for hardware RX flood Sergey Organov
2023-01-21 15:36 ` [PATCH v1 3/7] serial: imx: do not sysrq broken chars Sergey Organov
2023-01-21 16:12 ` Stefan Wahren
2023-01-21 21:04 ` Sergey Organov
2023-01-23 12:38 ` Ilpo Järvinen
2023-01-23 16:34 ` Sergey Organov
2023-01-21 15:36 ` [PATCH v1 4/7] serial: imx: do not break from FIFO reading loop prematurely Sergey Organov
2023-01-21 15:36 ` [PATCH v1 5/7] serial: imx: remove redundant USR2 read from FIFO reading loop Sergey Organov
2023-01-21 15:36 ` [PATCH v1 6/7] serial: imx: stop using USR2 in " Sergey Organov
2023-01-21 15:36 ` [PATCH v1 7/7] serial: imx: refine local variables in rxint() Sergey Organov
2023-02-01 14:16 ` [PATCH RESEND] serial: imx: get rid of registers shadowing Sergey Organov
2023-02-01 14:26 ` [PATCH v1 RESEND 0/7] serial: imx: work-around for hardware RX flood, and then isr improvements Sergey Organov
2023-02-01 14:26 ` [PATCH v1 1/7] serial: imx: factor-out common code to imx_uart_soft_reset() Sergey Organov
2023-02-01 14:26 ` [PATCH v1 2/7] serial: imx: work-around for hardware RX flood Sergey Organov
2023-02-01 14:26 ` [PATCH v1 3/7] serial: imx: do not sysrq broken chars Sergey Organov
2023-02-01 14:26 ` [PATCH v1 4/7] serial: imx: do not break from FIFO reading loop prematurely Sergey Organov
2023-02-01 14:26 ` [PATCH v1 5/7] serial: imx: remove redundant USR2 read from FIFO reading loop Sergey Organov
2023-02-01 14:26 ` [PATCH v1 6/7] serial: imx: stop using USR2 in " Sergey Organov
2023-02-01 14:27 ` [PATCH v1 7/7] serial: imx: refine local variables in rxint() Sergey Organov
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=87sfg92he3.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=johan@kernel.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-serial@vger.kernel.org \
--cc=richard.genoud@gmail.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=tharvey@gateworks.com \
--cc=tomasz.mon@camlingroup.com \
/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).