mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Grigori Goronzy <greg@chown.ath.cx>
To: Johan Hovold <johan@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
	Grigori Goronzy <greg@chown.ath.cx>
Subject: [PATCH v3 11/13] USB: ch341: improve B0 handling
Date: Mon, 11 Apr 2016 01:43:51 +0200	[thread overview]
Message-ID: <1460331833-19836-12-git-send-email-greg@chown.ath.cx> (raw)
In-Reply-To: <1460331833-19836-1-git-send-email-greg@chown.ath.cx>

Check for B0 in a more idiomatic way and make sure to not enable
RTS/CTS hardware flow control in B0 as it may override the control
lines.  Also make sure to only enable RTS/DTR if there's a transition
from B0.

v2: use c_cflag macros.

Signed-off-by: Grigori Goronzy <greg@chown.ath.cx>
---
 drivers/usb/serial/ch341.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index bf256eb..78590b7 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -387,10 +387,12 @@ static void ch341_set_termios(struct tty_struct *tty,
 	if (C_CSTOPB(tty))
 		ctrl |= CH341_LCR_STOP_BITS_2;
 
-	if (priv->baud_rate) {
-		spin_lock_irqsave(&priv->lock, flags);
-		priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS);
-		spin_unlock_irqrestore(&priv->lock, flags);
+	if (C_BAUD(tty) != B0) {
+		if (old_termios && (old_termios->c_cflag & CBAUD) == B0) {
+			spin_lock_irqsave(&priv->lock, flags);
+			priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS);
+			spin_unlock_irqrestore(&priv->lock, flags);
+		}
 		r = ch341_init_set_baudrate(port->serial->dev, priv, ctrl);
 		if (r < 0 && old_termios) {
 			priv->baud_rate = tty_termios_baud_rate(old_termios);
@@ -404,7 +406,7 @@ static void ch341_set_termios(struct tty_struct *tty,
 
 	ch341_set_handshake(port->serial->dev, priv->line_control);
 
-	if (cflag & CRTSCTS) {
+	if (C_CRTSCTS(tty) && C_BAUD(tty) != B0) {
 		r = ch341_control_out(port->serial->dev, CH341_REQ_WRITE_REG,
 				CH341_REG_RTSCTS | ((uint16_t)CH341_REG_RTSCTS << 8),
 				0x0101);
-- 
1.9.1

  parent reply	other threads:[~2016-04-10 23:44 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-10 23:43 Major improvements to the ch341 driver v3 Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 01/13] USB: ch341: fix error handling on resume Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 02/13] USB: ch341: add LCR register definitions Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 03/13] USB: ch341: add definitions for modem control Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 04/13] USB: ch341: fix USB buffer allocations Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 05/13] USB: ch341: reinitialize chip on reconfiguration Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 06/13] USB: ch341: add support for parity, frame length, stop bits Grigori Goronzy
2016-04-11 17:25   ` Karl Palsson
2016-04-11 18:25     ` Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 07/13] USB: ch341: add debug output for chip version Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 08/13] USB: ch341: add support for RTS/CTS flow control Grigori Goronzy
2016-04-11  1:27   ` kbuild test robot
2016-04-10 23:43 ` [PATCH v3 09/13] USB: ch341: fix coding style Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 10/13] USB: ch341: clean up messages Grigori Goronzy
2016-04-10 23:43 ` Grigori Goronzy [this message]
2016-04-10 23:43 ` [PATCH v3 12/13] USB: ch341: get rid of default configuration Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 13/13] USB: ch341: implement tx_empty callback Grigori Goronzy

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=1460331833-19836-12-git-send-email-greg@chown.ath.cx \
    --to=greg@chown.ath.cx \
    --cc=gregkh@linuxfoundation.org \
    --cc=johan@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®