Skip to contentSkip to conversation

Bluetooth: btusb: Record debug log for Mediatek Chip.

PATCH Superseded [email protected] 2 participants 2 messages Jun 29, 2021 – Jun 30, 2021

Subsystems (2)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 Bluetooth: btusb: Record debug log for Mediatek Chip.

From: "mark-yw.chen" <[email protected]>

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.

---
 drivers/bluetooth/btusb.c | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)
drivers/bluetooth/btusb.c +36 -1
index b015dcecfb13..cabf6eba2d95 100644
@@ -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;
 		}
 	}
@@ -3075,6 +3076,10 @@ static int btusb_shutdown_intel_new(struct hci_dev *hdev)
 	return 0;
 }
 
+#define MTK_FW_DUMP	0xfc6f
+#define MTK_FW_LOG_1	0x05ff
+#define MTK_FW_LOG_2	0x05fe
+
 #define FIRMWARE_MT7663		"mediatek/mt7663pr2h.bin"
 #define FIRMWARE_MT7668		"mediatek/mt7668pr2h.bin"
 
@@ -3851,6 +3856,33 @@ 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;
+	u16 handle = le16_to_cpu(hci_acl_hdr(skb)->handle);
+
+	switch (handle) {
+	case MTK_FW_DUMP:
+		/* It's MediaTek firmware dump from device. When the firmware
+		 * hang, the device can't be suspend successfully.
+		 */
+		usb_disable_autosuspend(data->udev);
+		err = hci_recv_diag(data->hdev, skb);
+		break;
+	case MTK_FW_LOG_1:
+	case MTK_FW_LOG_2:
+		/* It's MediaTek fw debug log */
+		err = hci_recv_diag(data->hdev, skb);
+		break;
+	default:
+		err = hci_recv_frame(data->hdev, skb);
+		break;
+	}
+
+	return err;
+}
+
 MODULE_FIRMWARE(FIRMWARE_MT7663);
 MODULE_FIRMWARE(FIRMWARE_MT7668);
 
@@ -4543,6 +4575,8 @@ static int btusb_probe(struct usb_interface *intf,
 		data->recv_bulk = btusb_recv_bulk;
 	}
 
+	data->recv_acl = hci_recv_frame;
+
 	hdev = hci_alloc_dev();
 	if (!hdev)
 		return -ENOMEM;
@@ -4669,6 +4703,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);
 	}
 
Signature · 5 lines
2.18.0
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
maintainer
#1 lore raw

Hi Mark,

Quoted 8 lines

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.

can you be more specific in what the logs do. I think the changes are easy to understand. I rather have an example btmon from this or more details on what is in these traces. Or even how they can be enabled etc.

Quoted 57 lines

---
drivers/bluetooth/btusb.c | 37 ++++++++++++++++++++++++++++++++++++-

1 file changed, 36 insertions(+), 1 deletion(-)
drivers/bluetooth/btusb.c +21 -1
index b015dcecfb13..cabf6eba2d95 100644
@@ -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;
 		}
 	}
@@ -3075,6 +3076,10 @@ static int btusb_shutdown_intel_new(struct hci_dev *hdev)
 	return 0;
 }
 
+#define MTK_FW_DUMP	0xfc6f
+#define MTK_FW_LOG_1	0x05ff
+#define MTK_FW_LOG_2	0x05fe
+
 #define FIRMWARE_MT7663		"mediatek/mt7663pr2h.bin"
 #define FIRMWARE_MT7668		"mediatek/mt7668pr2h.bin"
 
@@ -3851,6 +3856,33 @@ 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;
+	u16 handle = le16_to_cpu(hci_acl_hdr(skb)->handle);
+
+	switch (handle) {
+	case MTK_FW_DUMP:
+		/* It's MediaTek firmware dump from device. When the firmware
+		 * hang, the device can't be suspend successfully.
+		 */
+		usb_disable_autosuspend(data->udev);
+		err = hci_recv_diag(data->hdev, skb);
+		break;
+	case MTK_FW_LOG_1:

drivers/bluetooth/btusb.c static int btusb_mtk_shutdown(struct hci_dev *hdev) · line 3883

Quoted 10 lines
drivers/bluetooth/btusb.c +10 -0
+	case MTK_FW_LOG_2:
+		/* It's MediaTek fw debug log */
+		err = hci_recv_diag(data->hdev, skb);
+		break;
+	default:
+		err = hci_recv_frame(data->hdev, skb);
+		break;
+	}
+
+	return err;
	switch (handle) {
	case 0xfc6f:		/* Firmware dump from device */
		/* When the firmware hangs, the device can no longer
		 * suspend and thus disable auto-suspend.
		 */
		usb_disable_autosuspend(data->udev);
		/* fall through */

	case 0x05ff:		/* Firmware debug logging 1 */
	case 0x05fe:		/* Firmware debug logging 2 */
		return hci_recv_diag(data->hdev, skb);
	}

	return hci_recv_frame(data->hdev, skb);
}
Quoted 15 lines
drivers/bluetooth/btusb.c +4 -0
+}
+
 MODULE_FIRMWARE(FIRMWARE_MT7663);
 MODULE_FIRMWARE(FIRMWARE_MT7668);
 
@@ -4543,6 +4575,8 @@ static int btusb_probe(struct usb_interface *intf,
 		data->recv_bulk = btusb_recv_bulk;
 	}
 
+	data->recv_acl = hci_recv_frame;
+
 	hdev = hci_alloc_dev();
 	if (!hdev)
 		return -ENOMEM;

drivers/bluetooth/btusb.c static int btusb_probe(struct usb_interface *intf, · line 4707

Quoted 5 lines
drivers/bluetooth/btusb.c +1 -0
@@ -4669,6 +4703,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);

Move this change after the quirk setting since it is local to btusb and not the hdev.

drivers/bluetooth/btusb.c static int btusb_probe(struct usb_interface *intf, · line 4708

Quoted 1 line
drivers/bluetooth/btusb.c +0 -0
 	}

Regards

Marcel