Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754461AbcDKR0l (ORCPT ); Mon, 11 Apr 2016 13:26:41 -0400 Received: from palmtree.beeroclock.net ([178.79.160.154]:35546 "EHLO palmtree.beeroclock.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754321AbcDKR0j (ORCPT ); Mon, 11 Apr 2016 13:26:39 -0400 MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==IXvLS6seCX4BubwRjVaG4zrpi7QEoU=="; micalg="pgp-sha1"; protocol="application/pgp-signature" Subject: Re: [PATCH v3 06/13] USB: ch341: add support for parity, frame length, stop bits From: Karl Palsson To: "Grigori Goronzy" Cc: "Greg Kroah-Hartman" , "Johan Hovold" , Linux Kernel Mailing List , Linux USB Mailing List In-Reply-To: <1460331833-19836-7-git-send-email-greg@chown.ath.cx> References: <1460331833-19836-7-git-send-email-greg@chown.ath.cx> Message-Id: Date: Mon, 11 Apr 2016 17:25:04 -0000 OpenPGP: id=9F020B9C40DA5E6F2CAF63B319A8B50FD4D5CAF6; preference=signencrypt Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4531 Lines: 138 --==IXvLS6seCX4BubwRjVaG4zrpi7QEoU== Content-Type: multipart/mixed; boundary="==UTZjQpmAwm3FYPFvfnhKMgQxP2tLKt==" --==UTZjQpmAwm3FYPFvfnhKMgQxP2tLKt== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sorry if you get this twice, I was having some client problems, but wanted to make sure you got this one... Grigori Goronzy wrote: > With the new reinitialization method, configuring parity, > different frame lengths and different stop bit settings work as > expected on both CH340G and CH341A. This has been extensively > tested with a logic analyzer. > > v2: only set mark/space when parity is enabled, > simplifications, patch termios HW flags. > > Tested-by: Ryan Barber > Signed-off-by: Grigori Goronzy > --- > drivers/usb/serial/ch341.c | 40 ++++++++++++++++++++++++++++++---------- > 1 file changed, 30 insertions(+), 10 deletions(-) > > diff --git a/drivers/usb/serial/ch341.c > b/drivers/usb/serial/ch341.c index 6181616..99b4621 100644 > --- a/drivers/usb/serial/ch341.c > +++ b/drivers/usb/serial/ch341.c > @@ -341,7 +341,6 @@ static void ch341_set_termios(struct tty_struct *tty, > struct usb_serial_port *port, struct ktermios *old_termios) > { > struct ch341_private *priv = usb_get_serial_port_data(port); > - unsigned baud_rate; > unsigned long flags; > unsigned char ctrl; > int r; > @@ -350,13 +349,39 @@ static void ch341_set_termios(struct tty_struct *tty, > if (old_termios && !tty_termios_hw_change(&tty->termios, old_termios)) > return; > > - baud_rate = tty_get_baud_rate(tty); > + priv->baud_rate = tty_get_baud_rate(tty); > > - priv->baud_rate = baud_rate; > + ctrl = CH341_LCR_ENABLE_RX | CH341_LCR_ENABLE_TX; > > - ctrl = CH341_LCR_ENABLE_RX | CH341_LCR_ENABLE_TX | CH341_LCR_CS8; > + switch (C_CSIZE(tty)) { > + case CS5: > + ctrl |= CH341_LCR_CS5; > + break; > + case CS6: > + ctrl |= CH341_LCR_CS6; > + break; > + case CS7: > + ctrl |= CH341_LCR_CS7; > + break; > + default: > + tty->termios.c_cflag |= CS8; > + case CS8: > + ctrl |= CH341_LCR_CS8; > + break; > + } > + > + if (C_PARENB(tty)) { > + ctrl |= CH341_LCR_ENABLE_PAR; > + if (C_PARODD(tty)) > + ctrl |= CH341_LCR_PAR_EVEN; Are you sure this does the right thing now? this is, as best as I can tell, the inverse of what you had earlier, and doesn't read right, if this is working, then I suggest renaming _LCR_PAR_EVEN to LCR_PAR_ODD? Cheers, Karl P > + if (C_CMSPAR(tty)) > + ctrl |= CH341_LCR_MARK_SPACE; > + } > + > + if (C_CSTOPB(tty)) > + ctrl |= CH341_LCR_STOP_BITS_2; > > - if (baud_rate) { > + 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); > @@ -373,11 +398,6 @@ static void ch341_set_termios(struct tty_struct *tty, > > ch341_set_handshake(port->serial->dev, priv->line_control); > > - /* Unimplemented: > - * (cflag & CSIZE) : data bits [5, 8] > - * (cflag & PARENB) : parity {NONE, EVEN, ODD} > - * (cflag & CSTOPB) : stop bits [1, 2] > - */ > } > > static void ch341_break_ctl(struct tty_struct *tty, int break_state) > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe > linux-usb" in the body of a message to > majordomo@vger.kernel.org More majordomo info at > http://vger.kernel.org/majordomo-info.html --==UTZjQpmAwm3FYPFvfnhKMgQxP2tLKt==-- --==IXvLS6seCX4BubwRjVaG4zrpi7QEoU== Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP Digital Signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXC93/AAoJEBmotQ/U1cr2RwgP/AmYfl4OXYUocL2ulmuZKGm3 ibs35FPaaCPLTJpRBiv0IbLYimHzdOWKBAG38g0Wlv61UEsj74L2wZnslgYEsuhP CoLayyMAbpNrkceVxKKLKk16j6Aj43FD2+w205KCRV3bs5PpUfQGKMNEnJDhYSwg OpsXS4J2/gb9fbSz65MP3P5YRTR7+y1vVtVNh7H+e195nXw2/vpmP9CQR+yq35gT BpdZDiajI6EBxLCEKJhbR/ESrk64kVFo13YLoNNvS3hzKPTNdGuURXbpZCmvOx5z t3WX7u+yJ/z/dyCKzZQa3FNbNKpYLaRZ0eKw5DK5eeokFeaDRfeAcRSa5flVS8hJ 9u9Q/0E8hy4DnNdmYhf3NpZCexYwX/aadGc66dsf5bNAazgP5MuNYvaBPMQw/VBB aq2FOjDAcWUvn4UbOSOGaFyXU2hWUjTQa8v5Bz9V2Vvz4Lya8jAi0OfRi/DOimcD PyWTKpLANWJgZv6VA0ppAQjoh0wjTHaveLGl3OQfppichUI9RCXx6M49Dx7EYJcm YQjd+sUt2ixmLVDxGsQHX+QC+3idvEsY4a1n7Fuj9iFB5f1s6EHJ23VWdzR5hiGg 0DYvH7esEgAd/kdFlVZaD5pPxe0ROZgGp2LeOwUYYFsXWidbbZJ8vqSBM5owpQ8A MhtrVs+0X9lg2aQuUzoT =A7Xo -----END PGP SIGNATURE----- --==IXvLS6seCX4BubwRjVaG4zrpi7QEoU==--