Bluetooth: Read Verbose Config Version Info for Broadcom devices

The Broadcom devices expose their chip id via Read Verbose Config
Version Info command. While this information is not used at the
moment, it might be useful for debugging purposes and so read it
before patching the firmware. This makes it show up in dmesg and
HCI traces taken for the system.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 708b6574d8057386a942347351eec626155f2ab3..1521dad3d460b8a35ee962be60f72d24f51a3ac3 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2458,6 +2458,25 @@ static int btusb_setup_bcm_patchram(struct hci_dev *hdev)
        subver = le16_to_cpu(ver->lmp_subver);
        kfree_skb(skb);
 
+       /* Read Verbose Config Version Info */
+       skb = __hci_cmd_sync(hdev, 0xfc79, 0, NULL, HCI_INIT_TIMEOUT);
+       if (IS_ERR(skb)) {
+               ret = PTR_ERR(skb);
+               BT_ERR("%s: BCM: Read Verbose Version failed (%ld)",
+                      hdev->name, ret);
+               return ret;
+       }
+
+       if (skb->len != 7) {
+               BT_ERR("%s: BCM: Read Verbose Version event length mismatch",
+                      hdev->name);
+               kfree_skb(skb);
+               return -EIO;
+       }
+
+       BT_INFO("%s: BCM: chip id %u", hdev->name, skb->data[1]);
+       kfree_skb(skb);
+
        for (i = 0; bcm_subver_table[i].name; i++) {
                if (subver == bcm_subver_table[i].subver) {
                        hw_name = bcm_subver_table[i].name;