1 files changed, 161 insertions, 2 deletions

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 12e108914f19..95ae9ba5661e 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -41,18 +41,122 @@
 #define BT_DBG(D...)
 #endif
 
-#define VERSION "0.1"
+#define VERSION "0.2"
+
+static int ignore_dga;
+static int ignore_csr;
+static int ignore_sniffer;
+static int disable_scofix;
+static int force_scofix;
+static int reset;
+
+static struct usb_driver btusb_driver;
+
+#define BTUSB_IGNORE            0x01
+#define BTUSB_RESET             0x02
+#define BTUSB_DIGIANSWER        0x04
+#define BTUSB_CSR               0x08
+#define BTUSB_SNIFFER           0x10
+#define BTUSB_BCM92035          0x20
+#define BTUSB_BROKEN_ISOC       0x40
+#define BTUSB_WRONG_SCO_MTU     0x80
 
 static struct usb_device_id btusb_table[] = {
         /* Generic Bluetooth USB device */
         { USB_DEVICE_INFO(0xe0, 0x01, 0x01) },
 
+        /* AVM BlueFRITZ! USB v2.0 */
+        { USB_DEVICE(0x057c, 0x3800) },
+
+        /* Bluetooth Ultraport Module from IBM */
+        { USB_DEVICE(0x04bf, 0x030a) },
+
+        /* ALPS Modules with non-standard id */
+        { USB_DEVICE(0x044e, 0x3001) },
+        { USB_DEVICE(0x044e, 0x3002) },
+
+        /* Ericsson with non-standard id */
+        { USB_DEVICE(0x0bdb, 0x1002) },
+
+        /* Canyon CN-BTU1 with HID interfaces */
+        { USB_DEVICE(0x0c10, 0x0000), .driver_info = BTUSB_RESET },
+
         { }     /* Terminating entry */
 };
 
 MODULE_DEVICE_TABLE(usb, btusb_table);
 
 static struct usb_device_id blacklist_table[] = {
+        /* CSR BlueCore devices */
+        { USB_DEVICE(0x0a12, 0x0001), .driver_info = BTUSB_CSR },
+
+        /* Broadcom BCM2033 without firmware */
+        { USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },
+
+        /* Broadcom BCM2035 */
+        { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+        { USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+
+        /* Broadcom BCM2045 */
+        { USB_DEVICE(0x0a5c, 0x2039), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+        { USB_DEVICE(0x0a5c, 0x2101), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+
+        /* Broadcom BCM2046 */
+        { USB_DEVICE(0x0a5c, 0x2151), .driver_info = BTUSB_RESET },
+
+        /* IBM/Lenovo ThinkPad with Broadcom chip */
+        { USB_DEVICE(0x0a5c, 0x201e), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+        { USB_DEVICE(0x0a5c, 0x2110), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+
+        /* Targus ACB10US */
+        { USB_DEVICE(0x0a5c, 0x2100), .driver_info = BTUSB_RESET },
+
+        /* ANYCOM Bluetooth USB-200 and USB-250 */
+        { USB_DEVICE(0x0a5c, 0x2111), .driver_info = BTUSB_RESET },
+
+        /* HP laptop with Broadcom chip */
+        { USB_DEVICE(0x03f0, 0x171d), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+
+        /* Dell laptop with Broadcom chip */
+        { USB_DEVICE(0x413c, 0x8126), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+
+        /* Dell Wireless 370 */
+        { USB_DEVICE(0x413c, 0x8156), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+
+        /* Dell Wireless 410 */
+        { USB_DEVICE(0x413c, 0x8152), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+
+        /* Microsoft Wireless Transceiver for Bluetooth 2.0 */
+        { USB_DEVICE(0x045e, 0x009c), .driver_info = BTUSB_RESET },
+
+        /* Kensington Bluetooth USB adapter */
+        { USB_DEVICE(0x047d, 0x105d), .driver_info = BTUSB_RESET },
+        { USB_DEVICE(0x047d, 0x105e), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+
+        /* ISSC Bluetooth Adapter v3.1 */
+        { USB_DEVICE(0x1131, 0x1001), .driver_info = BTUSB_RESET },
+
+        /* RTX Telecom based adapters with buggy SCO support */
+        { USB_DEVICE(0x0400, 0x0807), .driver_info = BTUSB_BROKEN_ISOC },
+        { USB_DEVICE(0x0400, 0x080a), .driver_info = BTUSB_BROKEN_ISOC },
+
+        /* CONWISE Technology based adapters with buggy SCO support */
+        { USB_DEVICE(0x0e5e, 0x6622), .driver_info = BTUSB_BROKEN_ISOC },
+
+        /* Belkin F8T012 and F8T013 devices */
+        { USB_DEVICE(0x050d, 0x0012), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+        { USB_DEVICE(0x050d, 0x0013), .driver_info = BTUSB_RESET | BTUSB_WRONG_SCO_MTU },
+
+        /* Digianswer devices */
+        { USB_DEVICE(0x08fd, 0x0001), .driver_info = BTUSB_DIGIANSWER },
+        { USB_DEVICE(0x08fd, 0x0002), .driver_info = BTUSB_IGNORE },
+
+        /* CSR BlueCore Bluetooth Sniffer */
+        { USB_DEVICE(0x0a12, 0x0002), .driver_info = BTUSB_SNIFFER },
+
+        /* Frontline ComProbe Bluetooth Sniffer */
+        { USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },
+
         { }     /* Terminating entry */
 };
 
@@ -433,6 +537,7 @@ static int btusb_probe(struct usb_interface *intf,
 
         BT_DBG("intf %p id %p", intf, id);
 
+        /* interface numbers are hardcoded in the spec */
         if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
                 return -ENODEV;
 
@@ -443,6 +548,18 @@ static int btusb_probe(struct usb_interface *intf,
                         id = match;
         }
 
+        if (id->driver_info == BTUSB_IGNORE)
+                return -ENODEV;
+
+        if (ignore_dga && id->driver_info & BTUSB_DIGIANSWER)
+                return -ENODEV;
+
+        if (ignore_csr && id->driver_info & BTUSB_CSR)
+                return -ENODEV;
+
+        if (ignore_sniffer && id->driver_info & BTUSB_SNIFFER)
+                return -ENODEV;
+
         data = kzalloc(sizeof(*data), GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
@@ -503,7 +620,31 @@ static int btusb_probe(struct usb_interface *intf,
 
         hdev->owner = THIS_MODULE;
 
-        set_bit(HCI_QUIRK_RESET_ON_INIT, &hdev->quirks);
+        if (reset || id->driver_info & BTUSB_RESET)
+                set_bit(HCI_QUIRK_RESET_ON_INIT, &hdev->quirks);
+
+        if (force_scofix || id->driver_info & BTUSB_WRONG_SCO_MTU) {
+                if (!disable_scofix)
+                        set_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &hdev->quirks);
+        }
+
+        if (id->driver_info & BTUSB_SNIFFER) {
+                struct usb_device *udev = interface_to_usbdev(intf);
+
+                if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x997)
+                        set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);
+        }
+
+        if (id->driver_info & BTUSB_BCM92035) {
+                unsigned char cmd[] = { 0x3b, 0xfc, 0x01, 0x00 };
+                struct sk_buff *skb;
+
+                skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL);
+                if (skb) {
+                        memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd));
+                        skb_queue_tail(&hdev->driver_init, skb);
+                }
+        }
 
         err = hci_register_dev(hdev);
         if (err < 0) {
@@ -558,6 +699,24 @@ static void __exit btusb_exit(void)
 module_init(btusb_init);
 module_exit(btusb_exit);
 
+module_param(ignore_dga, bool, 0644);
+MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001");
+
+module_param(ignore_csr, bool, 0644);
+MODULE_PARM_DESC(ignore_csr, "Ignore devices with id 0a12:0001");
+
+module_param(ignore_sniffer, bool, 0644);
+MODULE_PARM_DESC(ignore_sniffer, "Ignore devices with id 0a12:0002");
+
+module_param(disable_scofix, bool, 0644);
+MODULE_PARM_DESC(disable_scofix, "Disable fixup of wrong SCO buffer size");
+
+module_param(force_scofix, bool, 0644);
+MODULE_PARM_DESC(force_scofix, "Force fixup of wrong SCO buffers size");
+
+module_param(reset, bool, 0644);
+MODULE_PARM_DESC(reset, "Send HCI reset command on initialization");
+
 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Generic Bluetooth USB driver ver " VERSION);
 MODULE_VERSION(VERSION);