mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Marcel Holtmann <marcel@holtmann.org>
To: Mark-YW.Chen@mediatek.com
Cc: Johan Hedberg <johan.hedberg@gmail.com>,
	chris.lu@mediatek.com, will-cy.lee@mediatek.com,
	Sean Wang <sean.wang@mediatek.com>,
	Bluetooth Kernel Mailing List  <linux-bluetooth@vger.kernel.org>,
	linux-mediatek@lists.infradead.org,
	open list <linux-kernel@vger.kernel.org>,
	michaelfsun@google.com, shawnku@google.com, jemele@google.com,
	apusaka@google.com
Subject: Re: [PATCH v3 1/1] Bluetooth: btusb: Record debug log for Mediatek Chip.
Date: Wed, 30 Jun 2021 22:12:48 +0200	[thread overview]
Message-ID: <54B58ECB-2931-4020-BE22-0DCEFD1F1ABA@holtmann.org> (raw)
In-Reply-To: <20210629190934.11710-1-mark-yw.chen@mediatek.com>

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.

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.

> 
> Signed-off-by: mark-yw.chen <mark-yw.chen@mediatek.com>
> ---
> drivers/bluetooth/btusb.c | 37 ++++++++++++++++++++++++++++++++++++-
> 1 file changed, 36 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index b015dcecfb13..cabf6eba2d95 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;
> 		}
> 	}
> @@ -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;


	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);
}

> +}
> +
> 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);

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

> 	}

Regards

Marcel


           reply	other threads:[~2021-06-30 20:12 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <20210629190934.11710-1-mark-yw.chen@mediatek.com>]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=54B58ECB-2931-4020-BE22-0DCEFD1F1ABA@holtmann.org \
    --to=marcel@holtmann.org \
    --cc=Mark-YW.Chen@mediatek.com \
    --cc=apusaka@google.com \
    --cc=chris.lu@mediatek.com \
    --cc=jemele@google.com \
    --cc=johan.hedberg@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=michaelfsun@google.com \
    --cc=sean.wang@mediatek.com \
    --cc=shawnku@google.com \
    --cc=will-cy.lee@mediatek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®