From: Greg Kroah-Hartman Date: Sun, 11 Sep 2022 11:32:04 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.19.9~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a062bfca7a9d3b07f61f21645cb8262debe08fe;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: usb-serial-ch341-fix-disabled-rx-timer-on-older-devices.patch usb-serial-ch341-fix-lost-character-on-lcr-updates.patch --- diff --git a/queue-4.14/series b/queue-4.14/series index ebabf777604..1d1d2e35ed9 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -55,3 +55,5 @@ ipv6-sr-fix-out-of-bounds-read-when-setting-hmac-dat.patch tcp-fix-early-etimedout-after-spurious-non-sack-rto.patch sch_sfb-also-store-skb-len-before-calling-child-enqu.patch usb-dwc3-fix-phy-disable-sequence.patch +usb-serial-ch341-fix-lost-character-on-lcr-updates.patch +usb-serial-ch341-fix-disabled-rx-timer-on-older-devices.patch diff --git a/queue-4.14/usb-serial-ch341-fix-disabled-rx-timer-on-older-devices.patch b/queue-4.14/usb-serial-ch341-fix-disabled-rx-timer-on-older-devices.patch new file mode 100644 index 00000000000..f57156a5486 --- /dev/null +++ b/queue-4.14/usb-serial-ch341-fix-disabled-rx-timer-on-older-devices.patch @@ -0,0 +1,48 @@ +From foo@baz Sun Sep 11 07:42:40 AM CEST 2022 +From: Johan Hovold +Date: Tue, 6 Sep 2022 15:49:15 +0200 +Subject: USB: serial: ch341: fix disabled rx timer on older devices +To: Greg Kroah-Hartman +Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , Jonathan Woithe +Message-ID: <20220906134915.19225-5-johan@kernel.org> + +From: Johan Hovold + +commit 41ca302a697b64a3dab4676e01d0d11bb184737d upstream. + +At least one older CH341 appears to have the RX timer enable bit +inverted so that setting it disables the RX timer and prevents the FIFO +from emptying until it is full. + +Only set the RX timer enable bit for devices with version newer than +0x27 (even though this probably affects all pre-0x30 devices). + +Reported-by: Jonathan Woithe +Tested-by: Jonathan Woithe +Link: https://lore.kernel.org/r/Ys1iPTfiZRWj2gXs@marvin.atrad.com.au +Fixes: 4e46c410e050 ("USB: serial: ch341: reinitialize chip on reconfiguration") +Cc: stable@vger.kernel.org # 4.10 +Signed-off-by: Johan Hovold +[ johan: backport to 5.4 ] +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/ch341.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/drivers/usb/serial/ch341.c ++++ b/drivers/usb/serial/ch341.c +@@ -179,8 +179,12 @@ static int ch341_set_baudrate_lcr(struct + /* + * CH341A buffers data until a full endpoint-size packet (32 bytes) + * has been received unless bit 7 is set. ++ * ++ * At least one device with version 0x27 appears to have this bit ++ * inverted. + */ +- a |= BIT(7); ++ if (priv->version > 0x27) ++ a |= BIT(7); + + r = ch341_control_out(dev, CH341_REQ_WRITE_REG, 0x1312, a); + if (r) diff --git a/queue-4.14/usb-serial-ch341-fix-lost-character-on-lcr-updates.patch b/queue-4.14/usb-serial-ch341-fix-lost-character-on-lcr-updates.patch new file mode 100644 index 00000000000..15c34d9cdab --- /dev/null +++ b/queue-4.14/usb-serial-ch341-fix-lost-character-on-lcr-updates.patch @@ -0,0 +1,65 @@ +From foo@baz Sun Sep 11 07:42:40 AM CEST 2022 +From: Johan Hovold +Date: Tue, 6 Sep 2022 15:49:14 +0200 +Subject: USB: serial: ch341: fix lost character on LCR updates +To: Greg Kroah-Hartman +Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , Jonathan Woithe +Message-ID: <20220906134915.19225-4-johan@kernel.org> + +From: Johan Hovold + +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 +Tested-by: Jonathan Woithe +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: adjust context to 4.19 ] +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/ch341.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/drivers/usb/serial/ch341.c ++++ b/drivers/usb/serial/ch341.c +@@ -99,6 +99,8 @@ struct ch341_private { + u8 mcr; + u8 msr; + u8 lcr; ++ ++ u8 version; + }; + + static void ch341_set_termios(struct tty_struct *tty, +@@ -184,6 +186,9 @@ static int ch341_set_baudrate_lcr(struct + 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; +@@ -235,7 +240,9 @@ static int ch341_configure(struct usb_de + 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)