Skip to content

Commit 9d08f50

Browse files
holtmannholtmann
committed
Bluetooth: btusb: Add support for Broadcom LM_DIAG interface
The Broadcom Bluetooth USB devices have a third interface that is dedicated for LM_DIAG messages. The If#= 2 describes this interface and it consists of one bulk in and one bulk endpoint. T: Bus=01 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 38 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=19ff ProdID=0239 Rev= 1.12 S: Manufacturer=Broadcom Corp S: Product=BCM20702A0 C:* #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr= 0mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=btusb E: Ad=84(I) Atr=02(Bulk) MxPS= 32 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 32 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none) For all Broadcom based devices with this interface, the driver now claims it and schedules URBs for it. This allows to capture the LM_DIAG messages and allows forwarding them via hci_recv_diag into the diagnostic channel of the Bluetooth subsystem. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
1 parent 9148991 commit 9d08f50

File tree

1 file changed

+224
-4
lines changed

1 file changed

+224
-4
lines changed

‎drivers/bluetooth/btusb.c

Lines changed: 224 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,12 +341,14 @@ static const struct usb_device_id blacklist_table[] = {
341341
#define BTUSB_FIRMWARE_FAILED 8
342342
#define BTUSB_BOOTING 9
343343
#define BTUSB_RESET_RESUME 10
344+
#define BTUSB_DIAG_RUNNING 11
344345

345346
struct btusb_data {
346347
struct hci_dev *hdev;
347348
struct usb_device *udev;
348349
struct usb_interface *intf;
349350
struct usb_interface *isoc;
351+
struct usb_interface *diag;
350352

351353
unsigned long flags;
352354

@@ -361,6 +363,7 @@ struct btusb_data {
361363
struct usb_anchor intr_anchor;
362364
struct usb_anchor bulk_anchor;
363365
struct usb_anchor isoc_anchor;
366+
struct usb_anchor diag_anchor;
364367
spinlock_t rxlock;
365368

366369
struct sk_buff *evt_skb;
@@ -372,6 +375,8 @@ struct btusb_data {
372375
struct usb_endpoint_descriptor *bulk_rx_ep;
373376
struct usb_endpoint_descriptor *isoc_tx_ep;
374377
struct usb_endpoint_descriptor *isoc_rx_ep;
378+
struct usb_endpoint_descriptor *diag_tx_ep;
379+
struct usb_endpoint_descriptor *diag_rx_ep;
375380

376381
__u8 cmdreq_type;
377382
__u8 cmdreq;
@@ -869,6 +874,92 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)
869874
return err;
870875
}
871876

877+
static void btusb_diag_complete(struct urb *urb)
878+
{
879+
struct hci_dev *hdev = urb->context;
880+
struct btusb_data *data = hci_get_drvdata(hdev);
881+
int err;
882+
883+
BT_DBG("%s urb %p status %d count %d", hdev->name, urb, urb->status,
884+
urb->actual_length);
885+
886+
if (urb->status == 0) {
887+
struct sk_buff *skb;
888+
889+
skb = bt_skb_alloc(urb->actual_length, GFP_ATOMIC);
890+
if (skb) {
891+
memcpy(skb_put(skb, urb->actual_length),
892+
urb->transfer_buffer, urb->actual_length);
893+
hci_recv_diag(hdev, skb);
894+
}
895+
} else if (urb->status == -ENOENT) {
896+
/* Avoid suspend failed when usb_kill_urb */
897+
return;
898+
}
899+
900+
if (!test_bit(BTUSB_DIAG_RUNNING, &data->flags))
901+
return;
902+
903+
usb_anchor_urb(urb, &data->diag_anchor);
904+
usb_mark_last_busy(data->udev);
905+
906+
err = usb_submit_urb(urb, GFP_ATOMIC);
907+
if (err < 0) {
908+
/* -EPERM: urb is being killed;
909+
* -ENODEV: device got disconnected */
910+
if (err != -EPERM && err != -ENODEV)
911+
BT_ERR("%s urb %p failed to resubmit (%d)",
912+
hdev->name, urb, -err);
913+
usb_unanchor_urb(urb);
914+
}
915+
}
916+
917+
static int btusb_submit_diag_urb(struct hci_dev *hdev, gfp_t mem_flags)
918+
{
919+
struct btusb_data *data = hci_get_drvdata(hdev);
920+
struct urb *urb;
921+
unsigned char *buf;
922+
unsigned int pipe;
923+
int err, size = HCI_MAX_FRAME_SIZE;
924+
925+
BT_DBG("%s", hdev->name);
926+
927+
if (!data->diag_rx_ep)
928+
return -ENODEV;
929+
930+
urb = usb_alloc_urb(0, mem_flags);
931+
if (!urb)
932+
return -ENOMEM;
933+
934+
buf = kmalloc(size, mem_flags);
935+
if (!buf) {
936+
usb_free_urb(urb);
937+
return -ENOMEM;
938+
}
939+
940+
pipe = usb_rcvbulkpipe(data->udev, data->diag_rx_ep->bEndpointAddress);
941+
942+
usb_fill_bulk_urb(urb, data->udev, pipe, buf, size,
943+
btusb_diag_complete, hdev);
944+
945+
urb->transfer_flags |= URB_FREE_BUFFER;
946+
947+
usb_mark_last_busy(data->udev);
948+
usb_anchor_urb(urb, &data->diag_anchor);
949+
950+
err = usb_submit_urb(urb, mem_flags);
951+
if (err < 0) {
952+
if (err != -EPERM && err != -ENODEV)
953+
BT_ERR("%s urb %p submission failed (%d)",
954+
hdev->name, urb, -err);
955+
usb_unanchor_urb(urb);
956+
}
957+
958+
usb_free_urb(urb);
959+
960+
return err;
961+
}
962+
872963
static void btusb_tx_complete(struct urb *urb)
873964
{
874965
struct sk_buff *skb = urb->context;
@@ -956,6 +1047,11 @@ static int btusb_open(struct hci_dev *hdev)
9561047
set_bit(BTUSB_BULK_RUNNING, &data->flags);
9571048
btusb_submit_bulk_urb(hdev, GFP_KERNEL);
9581049

1050+
if (data->diag) {
1051+
if (!btusb_submit_diag_urb(hdev, GFP_KERNEL))
1052+
set_bit(BTUSB_DIAG_RUNNING, &data->flags);
1053+
}
1054+
9591055
done:
9601056
usb_autopm_put_interface(data->intf);
9611057
return 0;
@@ -971,6 +1067,7 @@ static void btusb_stop_traffic(struct btusb_data *data)
9711067
usb_kill_anchored_urbs(&data->intr_anchor);
9721068
usb_kill_anchored_urbs(&data->bulk_anchor);
9731069
usb_kill_anchored_urbs(&data->isoc_anchor);
1070+
usb_kill_anchored_urbs(&data->diag_anchor);
9741071
}
9751072

9761073
static int btusb_close(struct hci_dev *hdev)
@@ -986,6 +1083,7 @@ static int btusb_close(struct hci_dev *hdev)
9861083
clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
9871084
clear_bit(BTUSB_BULK_RUNNING, &data->flags);
9881085
clear_bit(BTUSB_INTR_RUNNING, &data->flags);
1086+
clear_bit(BTUSB_DIAG_RUNNING, &data->flags);
9891087

9901088
btusb_stop_traffic(data);
9911089
btusb_free_frags(data);
@@ -2547,6 +2645,95 @@ static int btusb_setup_qca(struct hci_dev *hdev)
25472645
return 0;
25482646
}
25492647

2648+
#ifdef CONFIG_BT_HCIBTUSB_BCM
2649+
static inline int __set_diag_interface(struct hci_dev *hdev)
2650+
{
2651+
struct btusb_data *data = hci_get_drvdata(hdev);
2652+
struct usb_interface *intf = data->diag;
2653+
int i;
2654+
2655+
if (!data->diag)
2656+
return -ENODEV;
2657+
2658+
data->diag_tx_ep = NULL;
2659+
data->diag_rx_ep = NULL;
2660+
2661+
for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++) {
2662+
struct usb_endpoint_descriptor *ep_desc;
2663+
2664+
ep_desc = &intf->cur_altsetting->endpoint[i].desc;
2665+
2666+
if (!data->diag_tx_ep && usb_endpoint_is_bulk_out(ep_desc)) {
2667+
data->diag_tx_ep = ep_desc;
2668+
continue;
2669+
}
2670+
2671+
if (!data->diag_rx_ep && usb_endpoint_is_bulk_in(ep_desc)) {
2672+
data->diag_rx_ep = ep_desc;
2673+
continue;
2674+
}
2675+
}
2676+
2677+
if (!data->diag_tx_ep || !data->diag_rx_ep) {
2678+
BT_ERR("%s invalid diagnostic descriptors", hdev->name);
2679+
return -ENODEV;
2680+
}
2681+
2682+
return 0;
2683+
}
2684+
2685+
static struct urb *alloc_diag_urb(struct hci_dev *hdev, bool enable)
2686+
{
2687+
struct btusb_data *data = hci_get_drvdata(hdev);
2688+
struct sk_buff *skb;
2689+
struct urb *urb;
2690+
unsigned int pipe;
2691+
2692+
if (!data->diag_tx_ep)
2693+
return ERR_PTR(-ENODEV);
2694+
2695+
urb = usb_alloc_urb(0, GFP_KERNEL);
2696+
if (!urb)
2697+
return ERR_PTR(-ENOMEM);
2698+
2699+
skb = bt_skb_alloc(2, GFP_KERNEL);
2700+
if (!skb) {
2701+
usb_free_urb(urb);
2702+
return ERR_PTR(-ENOMEM);
2703+
}
2704+
2705+
*skb_put(skb, 1) = 0xf0;
2706+
*skb_put(skb, 1) = enable;
2707+
2708+
pipe = usb_sndbulkpipe(data->udev, data->diag_tx_ep->bEndpointAddress);
2709+
2710+
usb_fill_bulk_urb(urb, data->udev, pipe,
2711+
skb->data, skb->len, btusb_tx_complete, skb);
2712+
2713+
skb->dev = (void *)hdev;
2714+
2715+
return urb;
2716+
}
2717+
2718+
static int btusb_bcm_set_diag(struct hci_dev *hdev, bool enable)
2719+
{
2720+
struct btusb_data *data = hci_get_drvdata(hdev);
2721+
struct urb *urb;
2722+
2723+
if (!data->diag)
2724+
return -ENODEV;
2725+
2726+
if (!test_bit(HCI_RUNNING, &hdev->flags))
2727+
return -ENETDOWN;
2728+
2729+
urb = alloc_diag_urb(hdev, enable);
2730+
if (IS_ERR(urb))
2731+
return PTR_ERR(urb);
2732+
2733+
return submit_or_queue_tx_urb(hdev, urb);
2734+
}
2735+
#endif
2736+
25502737
static int btusb_probe(struct usb_interface *intf,
25512738
const struct usb_device_id *id)
25522739
{
@@ -2627,6 +2814,7 @@ static int btusb_probe(struct usb_interface *intf,
26272814
init_usb_anchor(&data->intr_anchor);
26282815
init_usb_anchor(&data->bulk_anchor);
26292816
init_usb_anchor(&data->isoc_anchor);
2817+
init_usb_anchor(&data->diag_anchor);
26302818
spin_lock_init(&data->rxlock);
26312819

26322820
if (id->driver_info & BTUSB_INTEL_NEW) {
@@ -2666,11 +2854,20 @@ static int btusb_probe(struct usb_interface *intf,
26662854
#ifdef CONFIG_BT_HCIBTUSB_BCM
26672855
if (id->driver_info & BTUSB_BCM_PATCHRAM) {
26682856
hdev->setup = btbcm_setup_patchram;
2857+
hdev->set_diag = btusb_bcm_set_diag;
26692858
hdev->set_bdaddr = btbcm_set_bdaddr;
2859+
2860+
/* Broadcom LM_DIAG Interface numbers are hardcoded */
2861+
data->diag = usb_ifnum_to_if(data->udev, 2);
26702862
}
26712863

2672-
if (id->driver_info & BTUSB_BCM_APPLE)
2864+
if (id->driver_info & BTUSB_BCM_APPLE) {
26732865
hdev->setup = btbcm_setup_apple;
2866+
hdev->set_diag = btusb_bcm_set_diag;
2867+
2868+
/* Broadcom LM_DIAG Interface numbers are hardcoded */
2869+
data->diag = usb_ifnum_to_if(data->udev, 2);
2870+
}
26742871
#endif
26752872

26762873
if (id->driver_info & BTUSB_INTEL) {
@@ -2791,6 +2988,16 @@ static int btusb_probe(struct usb_interface *intf,
27912988
}
27922989
}
27932990

2991+
#ifdef CONFIG_BT_HCIBTUSB_BCM
2992+
if (data->diag) {
2993+
if (!usb_driver_claim_interface(&btusb_driver,
2994+
data->diag, data))
2995+
__set_diag_interface(hdev);
2996+
else
2997+
data->diag = NULL;
2998+
}
2999+
#endif
3000+
27943001
err = hci_register_dev(hdev);
27953002
if (err < 0) {
27963003
hci_free_dev(hdev);
@@ -2818,12 +3025,25 @@ static void btusb_disconnect(struct usb_interface *intf)
28183025
if (data->isoc)
28193026
usb_set_intfdata(data->isoc, NULL);
28203027

3028+
if (data->diag)
3029+
usb_set_intfdata(data->diag, NULL);
3030+
28213031
hci_unregister_dev(hdev);
28223032

2823-
if (intf == data->isoc)
3033+
if (intf == data->intf) {
3034+
if (data->isoc)
3035+
usb_driver_release_interface(&btusb_driver, data->isoc);
3036+
if (data->diag)
3037+
usb_driver_release_interface(&btusb_driver, data->diag);
3038+
} else if (intf == data->isoc) {
3039+
if (data->diag)
3040+
usb_driver_release_interface(&btusb_driver, data->diag);
28243041
usb_driver_release_interface(&btusb_driver, data->intf);
2825-
else if (data->isoc)
2826-
usb_driver_release_interface(&btusb_driver, data->isoc);
3042+
} else if (intf == data->diag) {
3043+
usb_driver_release_interface(&btusb_driver, data->intf);
3044+
if (data->isoc)
3045+
usb_driver_release_interface(&btusb_driver, data->isoc);
3046+
}
28273047

28283048
hci_free_dev(hdev);
28293049
}

0 commit comments

Comments
 (0)