lkml.org 
[lkml]   [2022]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH stable-4.19 3/4] USB: serial: ch341: fix lost character on LCR updates
    Date
    commit 8e83622ae7ca481c76c8fd9579877f6abae64ca2 upstream.

    Disable LCR updates for pre-0x30 devices which use a different (unknown)
    protocol for line control and where the current register write causes
    the next received character to be lost.

    Note that updating LCR using the INIT command has no effect on these
    devices either.

    Reported-by: Jonathan Woithe <jwoithe@just42.net>
    Tested-by: Jonathan Woithe <jwoithe@just42.net>
    Link: https://lore.kernel.org/r/Ys1iPTfiZRWj2gXs@marvin.atrad.com.au
    Fixes: 4e46c410e050 ("USB: serial: ch341: reinitialize chip on reconfiguration")
    Fixes: 55fa15b5987d ("USB: serial: ch341: fix baud rate and line-control handling")
    Cc: stable@vger.kernel.org # 4.10
    Signed-off-by: Johan Hovold <johan@kernel.org>
    [ johan: adjust context to 4.19 ]
    Signed-off-by: Johan Hovold <johan@kernel.org>
    ---
    drivers/usb/serial/ch341.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
    index f789b60ed8c1..58b5fd95b29f 100644
    --- a/drivers/usb/serial/ch341.c
    +++ b/drivers/usb/serial/ch341.c
    @@ -96,6 +96,8 @@ struct ch341_private {
    u8 mcr;
    u8 msr;
    u8 lcr;
    +
    + u8 version;
    };

    static void ch341_set_termios(struct tty_struct *tty,
    @@ -181,6 +183,9 @@ static int ch341_set_baudrate_lcr(struct usb_device *dev,
    if (r)
    return r;

    + if (priv->version < 0x30)
    + return 0;
    +
    r = ch341_control_out(dev, CH341_REQ_WRITE_REG, 0x2518, lcr);
    if (r)
    return r;
    @@ -232,7 +237,9 @@ static int ch341_configure(struct usb_device *dev, struct ch341_private *priv)
    r = ch341_control_in(dev, CH341_REQ_READ_VERSION, 0, 0, buffer, size);
    if (r < 0)
    goto out;
    - dev_dbg(&dev->dev, "Chip version: 0x%02x\n", buffer[0]);
    +
    + priv->version = buffer[0];
    + dev_dbg(&dev->dev, "Chip version: 0x%02x\n", priv->version);

    r = ch341_control_out(dev, CH341_REQ_SERIAL_INIT, 0, 0);
    if (r < 0)
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-09-06 16:24    [W:2.563 / U:1.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site