Commit 7bd11aba authored by Johan Hovold's avatar Johan Hovold Committed by Jialin Zhang
Browse files

USB: serial: ch341: fix disabled rx timer on older devices 

stable inclusion
from stable-v5.10.142
commit 2058aab4e3060ae239e3f2edd1d7aa66762c49c5
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6CSFH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2058aab4e3060ae239e3f2edd1d7aa66762c49c5



--------------------------------

commit 41ca302a 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: default avatarJonathan Woithe <jwoithe@just42.net>
Tested-by: default avatarJonathan Woithe <jwoithe@just42.net>
Link: https://lore.kernel.org/r/Ys1iPTfiZRWj2gXs@marvin.atrad.com.au


Fixes: 4e46c410 ("USB: serial: ch341: reinitialize chip on reconfiguration")
Cc: stable@vger.kernel.org      # 4.10
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 922459f1

drivers/usb/serial/ch341.c

+5 −1
Original line number Diff line number Diff line
@@ -259,7 +259,11 @@ static int ch341_set_baudrate_lcr(struct usb_device *dev, 
	/*

	 * 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.

	 */

	if (priv->version > 0x27)

		val |= BIT(7);



	r = ch341_control_out(dev, CH341_REQ_WRITE_REG,