From: Huang Shijie <b32955@freescale.com>
To: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: linux-serial@vger.kernel.org, stable@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Alan Cox <alan@linux.intel.com>
Subject: Re: [PATCH v2] mxs: uart: allow setting RTS from software
Date: Thu, 13 Dec 2012 18:19:32 +0800 [thread overview]
Message-ID: <50C9ABB4.8010900@freescale.com> (raw)
In-Reply-To: <1355388135-3676-1-git-send-email-s.trumtrar@pengutronix.de>
于 2012年12月13日 16:42, Steffen Trumtrar 写道:
> With the patch "serial: mxs-auart: fix the wrong RTS hardware flow control" the
> mainline mxs-uart driver now sets RTSEN only when hardware flow control is
> enabled via software. It is not possible any longer to set RTS manually via
> software. However, the manual modification is a valid operation.
> Regain the possibility to set RTS via software and only set RTSEN when hardware
> flow control is explicitly enabled via settermios cflag CRTSCTS.
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
> drivers/tty/serial/mxs-auart.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
> index 6db23b0..21d9b12 100644
> --- a/drivers/tty/serial/mxs-auart.c
> +++ b/drivers/tty/serial/mxs-auart.c
> @@ -412,10 +412,12 @@ static void mxs_auart_set_mctrl(struct uart_port *u, unsigned mctrl)
>
> u32 ctrl = readl(u->membase + AUART_CTRL2);
>
> - ctrl &= ~AUART_CTRL2_RTSEN;
> + ctrl &= ~(AUART_CTRL2_RTSEN | AUART_CTRL2_RTS);
> if (mctrl & TIOCM_RTS) {
> if (tty_port_cts_enabled(&u->state->port))
> ctrl |= AUART_CTRL2_RTSEN;
> + else
> + ctrl |= AUART_CTRL2_RTS;
> }
>
> s->ctrl = mctrl;
> @@ -676,8 +678,10 @@ static void mxs_auart_settermios(struct uart_port *u,
> ctrl2 |= AUART_CTRL2_TXDMAE | AUART_CTRL2_RXDMAE
> | AUART_CTRL2_DMAONERR;
> }
> + u->flags |= ASYNC_CTS_FLOW;
> ctrl2 |= AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN;
> } else {
> + u->flags &= ~ASYNC_CTS_FLOW;
I think these two lines is not needed.
uart_change_speed() has set/unset ASYNC_CTS_FLOW for us.
thanks
Huang Shijie
> ctrl2 &= ~(AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN);
> }
>
WARNING: multiple messages have this Message-ID (diff)
From: b32955@freescale.com (Huang Shijie)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] mxs: uart: allow setting RTS from software
Date: Thu, 13 Dec 2012 18:19:32 +0800 [thread overview]
Message-ID: <50C9ABB4.8010900@freescale.com> (raw)
In-Reply-To: <1355388135-3676-1-git-send-email-s.trumtrar@pengutronix.de>
? 2012?12?13? 16:42, Steffen Trumtrar ??:
> With the patch "serial: mxs-auart: fix the wrong RTS hardware flow control" the
> mainline mxs-uart driver now sets RTSEN only when hardware flow control is
> enabled via software. It is not possible any longer to set RTS manually via
> software. However, the manual modification is a valid operation.
> Regain the possibility to set RTS via software and only set RTSEN when hardware
> flow control is explicitly enabled via settermios cflag CRTSCTS.
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
> drivers/tty/serial/mxs-auart.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
> index 6db23b0..21d9b12 100644
> --- a/drivers/tty/serial/mxs-auart.c
> +++ b/drivers/tty/serial/mxs-auart.c
> @@ -412,10 +412,12 @@ static void mxs_auart_set_mctrl(struct uart_port *u, unsigned mctrl)
>
> u32 ctrl = readl(u->membase + AUART_CTRL2);
>
> - ctrl &= ~AUART_CTRL2_RTSEN;
> + ctrl &= ~(AUART_CTRL2_RTSEN | AUART_CTRL2_RTS);
> if (mctrl & TIOCM_RTS) {
> if (tty_port_cts_enabled(&u->state->port))
> ctrl |= AUART_CTRL2_RTSEN;
> + else
> + ctrl |= AUART_CTRL2_RTS;
> }
>
> s->ctrl = mctrl;
> @@ -676,8 +678,10 @@ static void mxs_auart_settermios(struct uart_port *u,
> ctrl2 |= AUART_CTRL2_TXDMAE | AUART_CTRL2_RXDMAE
> | AUART_CTRL2_DMAONERR;
> }
> + u->flags |= ASYNC_CTS_FLOW;
> ctrl2 |= AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN;
> } else {
> + u->flags &= ~ASYNC_CTS_FLOW;
I think these two lines is not needed.
uart_change_speed() has set/unset ASYNC_CTS_FLOW for us.
thanks
Huang Shijie
> ctrl2 &= ~(AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN);
> }
>
next prev parent reply other threads:[~2012-12-13 10:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 8:42 [PATCH v2] mxs: uart: allow setting RTS from software Steffen Trumtrar
2012-12-13 8:42 ` Steffen Trumtrar
2012-12-13 10:19 ` Huang Shijie [this message]
2012-12-13 10:19 ` Huang Shijie
2012-12-13 13:19 ` Steffen Trumtrar
2012-12-13 13:19 ` Steffen Trumtrar
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=50C9ABB4.8010900@freescale.com \
--to=b32955@freescale.com \
--cc=alan@linux.intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-serial@vger.kernel.org \
--cc=s.trumtrar@pengutronix.de \
--cc=stable@vger.kernel.org \
/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 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.