diff mbox series

fix 5.15 init regression for Intel Bluetooth

Message ID b0f6f66b-28aa-9d43-0aab-e6887ee0fda8@logobject.ch
State New
Headers show
Series fix 5.15 init regression for Intel Bluetooth | expand

Commit Message

Ortwin Glück Dec. 27, 2021, 10:26 a.m. UTC 
Hi

On all 5.15 kernels the Intel Bluetooth no longer works. All was fine in 5.14.
Apparently the quirk is needed for this device.

vanilla 5.15.5:
    Bluetooth: hci0: Reading Intel version command failed (-110)
    Bluetooth: hci0: command tx timeout

with patch:
    Bluetooth: hci0: Legacy ROM 2.5 revision 1.0 build 3 week 17 2014
    Bluetooth: hci0: Intel device is already patched. patch num: 32

Please apply to stable too.

Thanks

Ortwin
diff mbox series

Patch

From fb721988425ffd40e09603a3e8b141c0b46b74e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ortwin=20Gl=C3=BCck?= <odi@odi.ch>
Date: Sat, 4 Dec 2021 14:25:56 +0100
Subject: [PATCH] Bluetooth: btusb: Add init quitk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes the boot regression against 5.14:
 Bluetooth: hci0: Reading Intel version command failed (-110)
 Bluetooth: hci0: command tx timeout

Signed-off-by: Ortwin Glück <odi@odi.ch>
Cc: stable@vger.kernel.org
---
 drivers/bluetooth/btusb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 79d0db542da3..232cfcb41734 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -366,7 +366,8 @@  static const struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR },
 	{ USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL_COMBINED |
 						     BTUSB_INTEL_BROKEN_INITIAL_NCMD },
-	{ USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL_COMBINED },
+	{ USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL_COMBINED |
+						     BTUSB_INTEL_BROKEN_INITIAL_NCMD },
 	{ USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_COMBINED },
 	{ USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL_COMBINED },
 	{ USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_COMBINED },
-- 
2.32.0