From mboxrd@z Thu Jan 1 00:00:00 1970 From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Subject: Re: [PATCH v6 2/3] serial: imx: set_mctrl(): correctly restore autoRTS state Date: Mon, 22 Jul 2019 22:24:06 +0200 Message-ID: <20190722202406.hr74mg64sxoovah7@pengutronix.de> References: <20190614072801.3187-1-s.hauer@pengutronix.de> <1563823331-5629-1-git-send-email-sorganov@gmail.com> <1563823331-5629-3-git-send-email-sorganov@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline In-Reply-To: <1563823331-5629-3-git-send-email-sorganov@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Sergey Organov Cc: linux-serial@vger.kernel.org, Greg Kroah-Hartman , Sascha Hauer , NXP Linux Team , Pengutronix Kernel Team , linux-arm-kernel@lists.infradead.org List-Id: linux-serial@vger.kernel.org On Mon, Jul 22, 2019 at 10:22:10PM +0300, Sergey Organov wrote: > imx_uart_set_mctrl() happened to set UCR2_CTSC bit whenever TIOCM_RTS > was set, no matter if RTS/CTS handshake is enabled or not. Now fixed by > turning handshake on only when CRTSCTS bit for the port is set. > = > Acked-by: Uwe Kleine-K=F6nig > Reviewed-by: Sascha Hauer > Tested-by: Sascha Hauer > Signed-off-by: Sergey Organov > --- > drivers/tty/serial/imx.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > = > diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c > index 32f36d8..059ba35 100644 > --- a/drivers/tty/serial/imx.c > +++ b/drivers/tty/serial/imx.c > @@ -974,10 +974,22 @@ static void imx_uart_set_mctrl(struct uart_port *po= rt, unsigned int mctrl) > if (!(port->rs485.flags & SER_RS485_ENABLED)) { > u32 ucr2; > = > + /* > + * Turn off autoRTS if RTS is lowered and restore autoRTS > + * setting if RTS is raised. "lower" and "raising" are misleading here. I recommend sticking to "active" and "inactive". > + */ > ucr2 =3D imx_uart_readl(sport, UCR2); > ucr2 &=3D ~(UCR2_CTS | UCR2_CTSC); > - if (mctrl & TIOCM_RTS) > - ucr2 |=3D UCR2_CTS | UCR2_CTSC; > + if (mctrl & TIOCM_RTS) { > + ucr2 |=3D UCR2_CTS; > + /* > + * UCR2_IRTS is unset if and only if the port is > + * configured for CRTSCTS, so we use inverted UCR2_IRTS > + * to get the state to restore to. > + */ > + if (!(ucr2 & UCR2_IRTS)) > + ucr2 |=3D UCR2_CTSC; > + } If you teach imx_uart_rts_auto about IRTS this function could be reused here I think. Best regards Uwe -- = Pengutronix e.K. | Uwe Kleine-K=F6nig | Industrial Linux Solutions | http://www.pengutronix.de/ | 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 X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCBA7C7618F for ; Mon, 22 Jul 2019 20:24:20 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9FC6B218BE for ; Mon, 22 Jul 2019 20:24:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hMzT9msG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FC6B218BE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=M+HRj8apcp0F8mjrKbTvpXyZmej1acL9p70vVyISS50=; b=hMzT9msGuy6m9C IrDJu439H4xOuSm+1HgnullWpUxw/apAMGyRh+3+IcW6temlwCVVmlcDtmwMjpQHqG72dRUZaRMeL oInWlb4XduVopdHdzA6W6basJBJIGL0Rbnuaha6gtYqAAiYY0RDn8RqdlVUKWUiAf0m4YyJChpghl 9JLCABTxUb+EoYZV1qnfyA3yMKW/CGHUW09mqr2+VC4/hA0klNlkZoKmEvGfy2zKE9BA6xAUk5nZZ ITVsbwizQr3qgM7+lk8YSRKMhZTtieGgLInDS91znGFnn8Buqi35F6EinlfEX2QPqcQIgQtggvRwY PcEh1AcTAXSyp8ykZd/g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hper0-0002EV-UF; Mon, 22 Jul 2019 20:24:14 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hpeqw-0002Dn-UB for linux-arm-kernel@lists.infradead.org; Mon, 22 Jul 2019 20:24:12 +0000 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1hpeqt-0006Ge-S5; Mon, 22 Jul 2019 22:24:07 +0200 Received: from ukl by pty.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1hpeqs-0007Px-Ss; Mon, 22 Jul 2019 22:24:06 +0200 Date: Mon, 22 Jul 2019 22:24:06 +0200 From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= To: Sergey Organov Subject: Re: [PATCH v6 2/3] serial: imx: set_mctrl(): correctly restore autoRTS state Message-ID: <20190722202406.hr74mg64sxoovah7@pengutronix.de> References: <20190614072801.3187-1-s.hauer@pengutronix.de> <1563823331-5629-1-git-send-email-sorganov@gmail.com> <1563823331-5629-3-git-send-email-sorganov@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1563823331-5629-3-git-send-email-sorganov@gmail.com> User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c5 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190722_132410_997951_D36C3951 X-CRM114-Status: GOOD ( 16.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-serial@vger.kernel.org, Greg Kroah-Hartman , Sascha Hauer , NXP Linux Team , Pengutronix Kernel Team , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jul 22, 2019 at 10:22:10PM +0300, Sergey Organov wrote: > imx_uart_set_mctrl() happened to set UCR2_CTSC bit whenever TIOCM_RTS > was set, no matter if RTS/CTS handshake is enabled or not. Now fixed by > turning handshake on only when CRTSCTS bit for the port is set. > = > Acked-by: Uwe Kleine-K=F6nig > Reviewed-by: Sascha Hauer > Tested-by: Sascha Hauer > Signed-off-by: Sergey Organov > --- > drivers/tty/serial/imx.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > = > diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c > index 32f36d8..059ba35 100644 > --- a/drivers/tty/serial/imx.c > +++ b/drivers/tty/serial/imx.c > @@ -974,10 +974,22 @@ static void imx_uart_set_mctrl(struct uart_port *po= rt, unsigned int mctrl) > if (!(port->rs485.flags & SER_RS485_ENABLED)) { > u32 ucr2; > = > + /* > + * Turn off autoRTS if RTS is lowered and restore autoRTS > + * setting if RTS is raised. "lower" and "raising" are misleading here. I recommend sticking to "active" and "inactive". > + */ > ucr2 =3D imx_uart_readl(sport, UCR2); > ucr2 &=3D ~(UCR2_CTS | UCR2_CTSC); > - if (mctrl & TIOCM_RTS) > - ucr2 |=3D UCR2_CTS | UCR2_CTSC; > + if (mctrl & TIOCM_RTS) { > + ucr2 |=3D UCR2_CTS; > + /* > + * UCR2_IRTS is unset if and only if the port is > + * configured for CRTSCTS, so we use inverted UCR2_IRTS > + * to get the state to restore to. > + */ > + if (!(ucr2 & UCR2_IRTS)) > + ucr2 |=3D UCR2_CTSC; > + } If you teach imx_uart_rts_auto about IRTS this function could be reused here I think. Best regards Uwe -- = Pengutronix e.K. | Uwe Kleine-K=F6nig | Industrial Linux Solutions | http://www.pengutronix.de/ | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel