| Message ID | 20210616191540.4487-1-mark-yw.chen@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/1] Bluetooth: btusb: Record debug log for Mediatek Chip. | expand |
Hi Mark, > Mediatek Bluetooth Controller send the fw log via EP2, this patch > create callback(data->recv_acl) for processing acl packet. > > 1. create callback(data->recv_acl) for processing acl packet. > 2. Add btusb_recv_acl_mtk to dispatch acl packet. > 3. Send mediatek debug log and coredump via hci_recv_diag channel. > 4. The upper layerd can use hci_channel_minitor to receive > these packets. > > Signed-off-by: mark-yw.chen <mark-yw.chen@mediatek.com> > --- > drivers/bluetooth/btusb.c | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index b015dcecfb13..0a86713f496b 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -569,6 +569,7 @@ struct btusb_data { > int suspend_count; > > int (*recv_event)(struct hci_dev *hdev, struct sk_buff *skb); > + int (*recv_acl)(struct hci_dev *hdev, struct sk_buff *skb); > int (*recv_bulk)(struct btusb_data *data, void *buffer, int count); > > int (*setup_on_usb)(struct hci_dev *hdev); > @@ -776,7 +777,7 @@ static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count) > > if (!hci_skb_expect(skb)) { > /* Complete frame */ > - hci_recv_frame(data->hdev, skb); > + data->recv_acl(data->hdev, skb); > skb = NULL; > } > } > @@ -3851,6 +3852,24 @@ static int btusb_mtk_shutdown(struct hci_dev *hdev) > return 0; > } > > +static int btusb_recv_acl_mtk(struct hci_dev *hdev, struct sk_buff *skb) > +{ > + struct btusb_data *data = hci_get_drvdata(hdev); > + int err; > + since this is guaranteed to be a complete ACL packet now, use the ACL header struct and compare the handle. Which also means you can nicely use a switch statement here. > + if (skb->data[0] == 0x6f && skb->data[1] == 0xfc) { This needs a comment on why you disable auto-suspend here. > + usb_disable_autosuspend(data->udev); > + err = hci_recv_diag(data->hdev, skb); > + } else if ((skb->data[0] == 0xff || skb->data[0] == 0xfe) && > + skb->data[1] == 0x05) { > + err = hci_recv_diag(data->hdev, skb); I would also comment on what type of diagnostic message each of these are. > + } else { > + err = hci_recv_frame(data->hdev, skb); > + } > + > + return err; > +} > + > MODULE_FIRMWARE(FIRMWARE_MT7663); > MODULE_FIRMWARE(FIRMWARE_MT7668); > > @@ -4542,6 +4561,7 @@ static int btusb_probe(struct usb_interface *intf, > data->recv_event = hci_recv_frame; > data->recv_bulk = btusb_recv_bulk; > } Extra empty line before this statement. > + data->recv_acl = hci_recv_frame; > > hdev = hci_alloc_dev(); > if (!hdev) > @@ -4669,6 +4689,7 @@ static int btusb_probe(struct usb_interface *intf, > hdev->setup = btusb_mtk_setup; > hdev->shutdown = btusb_mtk_shutdown; > hdev->manufacturer = 70; > + data->recv_acl = btusb_recv_acl_mtk; > set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks); > } Regards Marcel
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index b015dcecfb13..0a86713f496b 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -569,6 +569,7 @@ struct btusb_data { int suspend_count; int (*recv_event)(struct hci_dev *hdev, struct sk_buff *skb); + int (*recv_acl)(struct hci_dev *hdev, struct sk_buff *skb); int (*recv_bulk)(struct btusb_data *data, void *buffer, int count); int (*setup_on_usb)(struct hci_dev *hdev); @@ -776,7 +777,7 @@ static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count) if (!hci_skb_expect(skb)) { /* Complete frame */ - hci_recv_frame(data->hdev, skb); + data->recv_acl(data->hdev, skb); skb = NULL; } } @@ -3851,6 +3852,24 @@ static int btusb_mtk_shutdown(struct hci_dev *hdev) return 0; } +static int btusb_recv_acl_mtk(struct hci_dev *hdev, struct sk_buff *skb) +{ + struct btusb_data *data = hci_get_drvdata(hdev); + int err; + + if (skb->data[0] == 0x6f && skb->data[1] == 0xfc) { + usb_disable_autosuspend(data->udev); + err = hci_recv_diag(data->hdev, skb); + } else if ((skb->data[0] == 0xff || skb->data[0] == 0xfe) && + skb->data[1] == 0x05) { + err = hci_recv_diag(data->hdev, skb); + } else { + err = hci_recv_frame(data->hdev, skb); + } + + return err; +} + MODULE_FIRMWARE(FIRMWARE_MT7663); MODULE_FIRMWARE(FIRMWARE_MT7668); @@ -4542,6 +4561,7 @@ static int btusb_probe(struct usb_interface *intf, data->recv_event = hci_recv_frame; data->recv_bulk = btusb_recv_bulk; } + data->recv_acl = hci_recv_frame; hdev = hci_alloc_dev(); if (!hdev) @@ -4669,6 +4689,7 @@ static int btusb_probe(struct usb_interface *intf, hdev->setup = btusb_mtk_setup; hdev->shutdown = btusb_mtk_shutdown; hdev->manufacturer = 70; + data->recv_acl = btusb_recv_acl_mtk; set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks); }