Bluetooth: btintel: Move hci quirks to setup routine

This patch moves the hci quirks for Intel devices into the setup
routines and cleaned up the driver flags.

Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index 8593b27..4213578 100644 (file)
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -2223,6 +2223,11 @@ static int btintel_setup_combined(struct hci_dev *hdev)
                goto exit_error;
        }
 
+       /* Apply the common HCI quirks for Intel device */
+       set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
+       set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
+       set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks);
+
        /* For Legacy device, check the HW platform value and size */
        if (skb->len == sizeof(ver) && skb->data[1] == 0x37) {
                bt_dev_dbg(hdev, "Read the legacy Intel version information");
@@ -2245,6 +2250,15 @@ static int btintel_setup_combined(struct hci_dev *hdev)
                        /* Legacy ROM product */
                        btintel_set_flag(hdev, INTEL_ROM_LEGACY);
 
+                       /* Apply the device specific HCI quirks
+                        *
+                        * WBS for SdP - SdP and Stp have a same hw_varaint but
+                        * different fw_variant
+                        */
+                       if (ver.hw_variant == 0x08 && ver.fw_variant == 0x22)
+                               set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED,
+                                       &hdev->quirks);
+
                        /* These devices have an issue with LED which doesn't
                         * go off immediately during shutdown. Set the flag
                         * here to send the LED OFF command during shutdown.
@@ -2259,6 +2273,18 @@ static int btintel_setup_combined(struct hci_dev *hdev)
                case 0x12:      /* ThP */
                case 0x13:      /* HrP */
                case 0x14:      /* CcP */
+                       /* Apply the device specific HCI quirks
+                        *
+                        * All Legacy bootloader devices support WBS
+                        */
+                       set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED,
+                               &hdev->quirks);
+
+                       /* Valid LE States quirk for JfP/ThP familiy */
+                       if (ver.hw_variant == 0x11 || ver.hw_variant == 0x12)
+                               set_bit(HCI_QUIRK_VALID_LE_STATES,
+                                       &hdev->quirks);
+
                        err = btintel_bootloader_setup(hdev, &ver);
                        break;
                default:
@@ -2298,6 +2324,16 @@ static int btintel_setup_combined(struct hci_dev *hdev)
                /* Display version information of TLV type */
                btintel_version_info_tlv(hdev, &ver_tlv);
 
+               /* Apply the device specific HCI quirks for TLV based devices
+                *
+                * All TLV based devices support WBS
+                */
+               set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);
+
+               /* Valid LE States quirk for GfP */
+               if (INTEL_HW_VARIANT(ver_tlv.cnvi_bt) == 0x18)
+                       set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);
+
                err = btintel_bootloader_setup_tlv(hdev, &ver_tlv);
                break;
        default:

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 26863d8..a97af4e 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -358,29 +358,18 @@ static const struct usb_device_id blacklist_table[] = {
        { USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL },
 
        /* Intel Bluetooth devices */
-       { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED |
-                                                    BTUSB_WIDEBAND_SPEECH |
-                                                    BTUSB_VALID_LE_STATES },
-       { USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_COMBINED |
-                                                    BTUSB_WIDEBAND_SPEECH },
-       { USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_COMBINED |
-                                                    BTUSB_WIDEBAND_SPEECH },
-       { USB_DEVICE(0x8087, 0x0032), .driver_info = BTUSB_INTEL_COMBINED |
-                                                    BTUSB_WIDEBAND_SPEECH},
-       { USB_DEVICE(0x8087, 0x0033), .driver_info = BTUSB_INTEL_COMBINED |
-                                                    BTUSB_WIDEBAND_SPEECH |
-                                                    BTUSB_VALID_LE_STATES },
+       { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
+       { USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_COMBINED },
+       { USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_COMBINED },
+       { USB_DEVICE(0x8087, 0x0032), .driver_info = BTUSB_INTEL_COMBINED },
+       { 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_BROKEN_INITIAL_NCMD },
        { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL_COMBINED },
-       { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_COMBINED |
-                                                    BTUSB_WIDEBAND_SPEECH },
-       { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL_COMBINED |
-                                                    BTUSB_WIDEBAND_SPEECH },
-       { USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_COMBINED |
-                                                    BTUSB_WIDEBAND_SPEECH |
-                                                    BTUSB_VALID_LE_STATES },
+       { 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 },
 
        /* Other Intel Bluetooth devices */
        { USB_VENDOR_AND_INTERFACE_INFO(0x8087, 0xe0, 0x01, 0x01),
@@ -3821,10 +3810,6 @@ static int btusb_probe(struct usb_interface *intf,
                hdev->send = btusb_send_frame_intel;
                hdev->cmd_timeout = btusb_intel_cmd_timeout;
 
-               set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
-               set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
-               set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks);
-
                if (id->driver_info & BTUSB_INTEL_BROKEN_INITIAL_NCMD)
                        btintel_set_flag(hdev, INTEL_BROKEN_INITIAL_NCMD);
        }