Commit 0836afa3 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Wen Zhiwei
Browse files

Bluetooth: btusb: Fix regression with fake CSR controllers 0a12:0001 

stable inclusion
from stable-v6.6.58
commit 885f8c873fedf3393c76827c4821071bf5fd16b1
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB3BSC

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

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

commit 2c1dda2acc4192d826e84008d963b528e24d12bc upstream.

Fake CSR controllers don't seem to handle short-transfer properly which
cause command to time out:

kernel: usb 1-1: new full-speed USB device number 19 using xhci_hcd
kernel: usb 1-1: New USB device found, idVendor=0a12, idProduct=0001, bcdDevice=88.91
kernel: usb 1-1: New USB device strings: Mfr=0, Product=2, SerialNumber=0
kernel: usb 1-1: Product: BT DONGLE10
...
Bluetooth: hci1: Opcode 0x1004 failed: -110
kernel: Bluetooth: hci1: command 0x1004 tx timeout

According to USB Spec 2.0 Section 5.7.3 Interrupt Transfer Packet Size
Constraints a interrupt transfer is considered complete when the size is 0
(ZPL) or < wMaxPacketSize:

 'When an interrupt transfer involves more data than can fit in one
 data payload of the currently established maximum size, all data
 payloads are required to be maximum-sized except for the last data
 payload, which will contain the remaining data. An interrupt transfer
 is complete when the endpoint does one of the following:

 • Has transferred exactly the amount of data expected
 • Transfers a packet with a payload size less than wMaxPacketSize or
 transfers a zero-length packet'

Link: https://bugzilla.kernel.org/show_bug.cgi?id=219365


Fixes: 7b05933340f4 ("Bluetooth: btusb: Fix not handling ZPL/short-transfer")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 8bda5d43

drivers/bluetooth/btusb.c

+9 −4
Original line number Diff line number Diff line
@@ -1354,6 +1354,11 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags) 
	if (!urb)

		return -ENOMEM;



	if (le16_to_cpu(data->udev->descriptor.idVendor)  == 0x0a12 &&

	    le16_to_cpu(data->udev->descriptor.idProduct) == 0x0001)

		/* Fake CSR devices don't seem to support sort-transter */

		size = le16_to_cpu(data->intr_ep->wMaxPacketSize);

	else

		/* Use maximum HCI Event size so the USB stack handles

		 * ZPL/short-transfer automatically.

		 */