From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CA65FC54E76 for ; Tue, 17 Jan 2023 17:37:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To: Date:References:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=URuR5q++VXqrI/5NwJQ5hFb6MAR04jZ/nBTHVC1sgI0=; b=ZRj5BqS1pD9nBG /ql0lp/Ucgg6qQ+qw15wjZ8oLOROmgrrF/hagoQnkAiDh3s20nRmTC+YS5+4I8GkhsvaLH0Uj5rs0 Vuev5Epy7AA+pwQgxrPmdZr+nbIXZx0ZzQbuHI2q2NGyXu84byP7SoJEjCbyzGPB6hXMWFkclbV97 n3K5+yzjoDe+Xw8bdvu9kJPwGR0yuvJOR8WbQsfPF6TC4bdU1yiqmnQy3E9NwvJTP0fpDTjuwbz7c kikuwMwUjXcd4k2GoZyFTEL6mgmbbZgHdUPpCr/OWW117U/TWEEapvkp8fcfkRfeLOhhL5TXWFx7r fF8YWNJZ/BL7i9UcJnoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHpsM-00FHej-1f; Tue, 17 Jan 2023 17:35:58 +0000 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHpsI-00FHe9-AW for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2023 17:35:55 +0000 Received: by mail-ed1-x536.google.com with SMTP id s3so7949051edd.4 for ; Tue, 17 Jan 2023 09:35:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=GBcV6TpSZek+zC6eLNUBmrWBC/v5aj5VGymFY1M5tEE=; b=RA3xdITmXjDDedWzrBSj/TWs/AXIFYtLD23tw9KzzTLbe9tAPx23rFGLqE9t24OUVu K3PWz6B40BPNNT1pMQHXbsTzy41GlIogcczWrMvbJy9NXPgU9WaHqLKJ87dOs2IM/6Zt A0TWsqfdXJL7TzvlzSTlVGANEmOXctI9sbLnaXA50aDEvhphseamUN4gnpC2OozVhC2H KssL82WmikXCCevOO/TkOddaS20zrNRWolv8d7bAzJkkjaPKthlAVEeGeGYFeCWMhQKp TlFfw/vi22Y85j73RT2llVSFIPJT9cO7goAj+sTzAdZ3t3g2dXTEiL3iwOv1xM5lCgJi Xyzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=GBcV6TpSZek+zC6eLNUBmrWBC/v5aj5VGymFY1M5tEE=; b=HeUu4rx6CpTq5ToiTtgTES2/PnEdf4cQyBsccuPzDTkB92CNcAB4pfFHXNrmuV77RA yhBxTSDugz+Qr0PU/7DO1gKuHPec5REQzd74s2CRQFIIjwUOBtNx07RSQ1Cs+fI5ryI6 uO/KJi+ow7eYGCWNDSltUegbtmYc1NO3a45VFgrcLAr3d/QmlzfGLjVvhnPgARsihKWc lkNXSmOllLCnwiW73yOhtdN6xXzttXE6V76mBm03Pnxa81Jari0FCX83szqerAqFhIYK GJRt3aZ5j84HuJjD1/8gGXdzv00uZr4PuFfvohHm8jG5CANucW5j5+YFSr/eKTDyhIna UNpQ== X-Gm-Message-State: AFqh2kpUwelBb+YQlmFSms8OhEGvfnXH3qpgFCCLsa1AMmkzkUBmDn+g 6zx6qo9WJYeriIrnb8DZB3s= X-Google-Smtp-Source: AMrXdXsXZQZidqD8+utTNQkDN7Ji/DhtgsUO/MLJ6PODoHOXjmdB3mHBN8U+lXBE0VFmkB4Hrja4BQ== X-Received: by 2002:aa7:db8b:0:b0:49b:b274:b816 with SMTP id u11-20020aa7db8b000000b0049bb274b816mr4093847edt.37.1673976951462; Tue, 17 Jan 2023 09:35:51 -0800 (PST) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id g11-20020a056402428b00b004722d7e8c7csm13010862edc.14.2023.01.17.09.35.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 09:35:50 -0800 (PST) From: Sergey Organov To: Johan Hovold Cc: linux-serial@vger.kernel.org, Fabio Estevam , Greg Kroah-Hartman , Jiri Slaby , Richard Genoud , Sascha Hauer , Shawn Guo , Tim Harvey , Tomasz =?utf-8?Q?Mo=C5=84?= , linux-arm-kernel@lists.infradead.org, NXP Linux Team , Pengutronix Kernel Team Subject: Re: [PATCH 3/8] serial: imx: do not sysrq broken chars References: <87bko4e65y.fsf@osv.gnss.ru> <20230113184334.287130-1-sorganov@gmail.com> <20230113184334.287130-4-sorganov@gmail.com> Date: Tue, 17 Jan 2023 20:35:48 +0300 In-Reply-To: (Johan Hovold's message of "Mon, 16 Jan 2023 16:24:07 +0100") Message-ID: <87sfg92he3.fsf@osv.gnss.ru> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230117_093554_379099_34D10473 X-CRM114-Status: GOOD ( 17.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Johan Hovold 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 >> --- >> 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