Bluetooth: btintel: Fix WBS setting for Intel legacy ROM products
PATCH v2 1/1 Bluetooth: btintel: Fix WBS setting for Intel legacy ROM products
From: Tedd Ho-Jeong An <[email protected]>
This patch adds the flag to identify the Intel legacy ROM products that don't support WBS like WP and StP.
Fixes 3df4dfbec0f29 ("Bluetooth: btintel: Move hci quirks to setup routine")
Signed-off-by Tedd Ho-Jeong An <[email protected]>
--- drivers/bluetooth/btintel.c | 11 ++++++++--- drivers/bluetooth/btintel.h | 1 + drivers/bluetooth/btusb.c | 6 ++++++ 3 files changed, 15 insertions(+), 3 deletions(-)
drivers/bluetooth/btintel.c +8 -3
@@ -2428,10 +2428,15 @@ static int btintel_setup_combined(struct hci_dev *hdev)/* Apply the device specific HCI quirks * -* WBS for SdP - SdP and Stp have a same hw_varaint but -* different fw_variant +* WBS for SdP - For the Legacy ROM products, only SdP +* supports the WBS. But the version information is not +* enough to use here because the StP2 and SdP have same +* hw_variant and fw_variant. So, this flag is set by +* the transport driver(btusb) based on the HW info +* (idProduct) */ -if (ver.hw_variant ==0x08 && ver.fw_variant ==0x22 ) +if (!btintel_test_flag (hdev, +INTEL_ROM_LEGACY_NO_WBS_SUPPORT ))set_bit (HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED , &hdev->quirks);
drivers/bluetooth/btintel.h +1 -0
@@ -152,6 +152,7 @@ enum {INTEL_BROKEN_INITIAL_NCMD ,INTEL_BROKEN_SHUTDOWN_LED ,INTEL_ROM_LEGACY , +INTEL_ROM_LEGACY_NO_WBS_SUPPORT , __INTEL_NUM_FLAGS, };
drivers/bluetooth/btusb.c +6 -0
@@ -62,6 +62,7 @@ static struct usb_driver btusb_driver;#define BTUSB_QCA_WCN6855 0x1000000#define BTUSB_INTEL_BROKEN_SHUTDOWN_LED 0x2000000#define BTUSB_INTEL_BROKEN_INITIAL_NCMD 0x4000000 +#define BTUSB_INTEL_NO_WBS_SUPPORT 0x8000000static const struct usb_device_id btusb_table[] = {/* Generic Bluetooth USB device */
@@ -385,9 +386,11 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x8087, 0x0033), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR }, { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL_COMBINED | +BTUSB_INTEL_NO_WBS_SUPPORT |BTUSB_INTEL_BROKEN_INITIAL_NCMD | BTUSB_INTEL_BROKEN_SHUTDOWN_LED }, { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL_COMBINED | +BTUSB_INTEL_NO_WBS_SUPPORT | BTUSB_INTEL_BROKEN_SHUTDOWN_LED }, { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL_COMBINED |
@@ -3737,6 +3740,9 @@ static int btusb_probe(struct usb_interface *intf, hdev->send = btusb_send_frame_intel; hdev->cmd_timeout = btusb_intel_cmd_timeout; +if (id->driver_info &BTUSB_INTEL_NO_WBS_SUPPORT ) +btintel_set_flag (hdev,INTEL_ROM_LEGACY_NO_WBS_SUPPORT ); +if (id->driver_info &BTUSB_INTEL_BROKEN_INITIAL_NCMD )btintel_set_flag (hdev,INTEL_BROKEN_INITIAL_NCMD );
Signature · 1 line
2.25.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=607041
---Test result---
Test Summary:
CheckPatch PASS 2.14 seconds GitLint PASS 1.03 seconds SubjectPrefix PASS 0.87 seconds BuildKernel PASS 36.20 seconds BuildKernel32 PASS 32.11 seconds Incremental Build with patchesPASS 44.45 seconds TestRunner: Setup PASS 569.11 seconds TestRunner: l2cap-tester PASS 15.61 seconds TestRunner: bnep-tester PASS 7.12 seconds TestRunner: mgmt-tester PASS 119.34 seconds TestRunner: rfcomm-tester PASS 8.79 seconds TestRunner: sco-tester PASS 9.20 seconds TestRunner: smp-tester PASS 8.81 seconds TestRunner: userchan-tester PASS 7.34 seconds
---
Regards,
Linux Bluetooth
Marcel Holtmann
maintainerHi Tedd,
Quoted 10 lines
This patch adds the flag to identify the Intel legacy ROM products that don't support WBS like WP and StP.
Fixes 3df4dfbec0f29 ("Bluetooth: btintel: Move hci quirks to setup routine")Signed-off-by Tedd Ho-Jeong An <[email protected]>---
drivers/bluetooth/btintel.c | 11 ++++++++--- drivers/bluetooth/btintel.h | 1 + drivers/bluetooth/btusb.c | 6 ++++++ 3 files changed, 15 insertions(+), 3 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel