|
@@ -964,6 +964,45 @@ static int btusb_setup_bcm92035(struct hci_dev *hdev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int btusb_setup_csr(struct hci_dev *hdev)
|
|
|
+{
|
|
|
+ struct hci_rp_read_local_version *rp;
|
|
|
+ struct sk_buff *skb;
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ BT_DBG("%s", hdev->name);
|
|
|
+
|
|
|
+ skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,
|
|
|
+ HCI_INIT_TIMEOUT);
|
|
|
+ if (IS_ERR(skb)) {
|
|
|
+ BT_ERR("Reading local version failed (%ld)", -PTR_ERR(skb));
|
|
|
+ return -PTR_ERR(skb);
|
|
|
+ }
|
|
|
+
|
|
|
+ rp = (struct hci_rp_read_local_version *) skb->data;
|
|
|
+
|
|
|
+ if (!rp->status) {
|
|
|
+ if (le16_to_cpu(rp->manufacturer) != 10) {
|
|
|
+ /* Clear the reset quirk since this is not an actual
|
|
|
+ * early Bluetooth 1.1 device from CSR.
|
|
|
+ */
|
|
|
+ clear_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
|
|
|
+
|
|
|
+ /* These fake CSR controllers have all a broken
|
|
|
+ * stored link key handling and so just disable it.
|
|
|
+ */
|
|
|
+ set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY,
|
|
|
+ &hdev->quirks);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ ret = -bt_to_errno(rp->status);
|
|
|
+
|
|
|
+ kfree_skb(skb);
|
|
|
+
|
|
|
+ return ret;
|
|
|
+}
|
|
|
+
|
|
|
struct intel_version {
|
|
|
u8 status;
|
|
|
u8 hw_platform;
|
|
@@ -1464,10 +1503,15 @@ static int btusb_probe(struct usb_interface *intf,
|
|
|
|
|
|
if (id->driver_info & BTUSB_CSR) {
|
|
|
struct usb_device *udev = data->udev;
|
|
|
+ u16 bcdDevice = le16_to_cpu(udev->descriptor.bcdDevice);
|
|
|
|
|
|
/* Old firmware would otherwise execute USB reset */
|
|
|
- if (le16_to_cpu(udev->descriptor.bcdDevice) < 0x117)
|
|
|
+ if (bcdDevice < 0x117)
|
|
|
set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
|
|
|
+
|
|
|
+ /* Fake CSR devices with broken commands */
|
|
|
+ if (bcdDevice <= 0x100)
|
|
|
+ hdev->setup = btusb_setup_csr;
|
|
|
}
|
|
|
|
|
|
if (id->driver_info & BTUSB_SNIFFER) {
|