| Message ID | 20230413064344.18714-1-quic_tjiang@quicinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] Bluetooth: btusb: Add WCN6855 devcoredump support | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/CheckPatch | success | CheckPatch PASS |
| tedd_an/GitLint | success | Gitlint PASS |
| tedd_an/SubjectPrefix | success | Gitlint PASS |
| tedd_an/BuildKernel | success | BuildKernel PASS |
| tedd_an/CheckAllWarning | success | CheckAllWarning PASS |
| tedd_an/CheckSparse | success | CheckSparse PASS |
| tedd_an/CheckSmatch | success | CheckSparse PASS |
| tedd_an/BuildKernel32 | success | BuildKernel32 PASS |
| tedd_an/TestRunnerSetup | success | TestRunnerSetup PASS |
| tedd_an/TestRunner_l2cap-tester | success | TestRunner PASS |
| tedd_an/TestRunner_iso-tester | success | TestRunner PASS |
| tedd_an/TestRunner_bnep-tester | success | TestRunner PASS |
| tedd_an/TestRunner_mgmt-tester | success | TestRunner PASS |
| tedd_an/TestRunner_rfcomm-tester | success | TestRunner PASS |
| tedd_an/TestRunner_sco-tester | success | TestRunner PASS |
| tedd_an/TestRunner_ioctl-tester | success | TestRunner PASS |
| tedd_an/TestRunner_mesh-tester | success | TestRunner PASS |
| tedd_an/TestRunner_smp-tester | success | TestRunner PASS |
| tedd_an/TestRunner_userchan-tester | success | TestRunner PASS |
| tedd_an/IncrementalBuild | success | Incremental Build PASS |
This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series: PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=739370 ---Test result--- Test Summary: CheckPatch PASS 0.85 seconds GitLint PASS 0.34 seconds SubjectPrefix PASS 0.12 seconds BuildKernel PASS 32.05 seconds CheckAllWarning PASS 34.86 seconds CheckSparse PASS 39.41 seconds CheckSmatch PASS 109.83 seconds BuildKernel32 PASS 30.62 seconds TestRunnerSetup PASS 437.68 seconds TestRunner_l2cap-tester PASS 16.52 seconds TestRunner_iso-tester PASS 16.32 seconds TestRunner_bnep-tester PASS 5.23 seconds TestRunner_mgmt-tester PASS 110.48 seconds TestRunner_rfcomm-tester PASS 8.42 seconds TestRunner_sco-tester PASS 7.88 seconds TestRunner_ioctl-tester PASS 9.04 seconds TestRunner_mesh-tester PASS 6.75 seconds TestRunner_smp-tester PASS 7.69 seconds TestRunner_userchan-tester PASS 5.50 seconds IncrementalBuild PASS 29.10 seconds --- Regards, Linux Bluetooth
Hi Tim, On Wed, Apr 12, 2023 at 11:46 PM Tim Jiang <quic_tjiang@quicinc.com> wrote: > > WCN6855 will report memdump via ACL data or HCI event when > it get crashed, so we collect memdump to debug firmware. > > Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com> > --- > drivers/bluetooth/btusb.c | 222 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 222 insertions(+) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 2303b0a66323..f045bbb0ee09 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -733,6 +733,16 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { > {} > }; > > +struct qca_dump_info { > + /* fields for dump collection */ > + u16 id_vendor; > + u16 id_product; > + u32 fw_version; > + u32 controller_id; > + u32 ram_dump_size; > + u16 ram_dump_seqno; > +}; > + > #define BTUSB_MAX_ISOC_FRAMES 10 > > #define BTUSB_INTR_RUNNING 0 > @@ -752,6 +762,7 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { > #define BTUSB_WAKEUP_AUTOSUSPEND 14 > #define BTUSB_USE_ALT3_FOR_WBS 15 > #define BTUSB_ALT6_CONTINUOUS_TX 16 > +#define BTUSB_HW_SSR_ACTIVE 17 > > struct btusb_data { > struct hci_dev *hdev; > @@ -814,6 +825,8 @@ struct btusb_data { > > int oob_wake_irq; /* irq for out-of-band wake-on-bt */ > unsigned cmd_timeout_cnt; > + > + struct qca_dump_info qca_dump; > }; > > static void btusb_reset(struct hci_dev *hdev) > @@ -904,6 +917,11 @@ static void btusb_qca_cmd_timeout(struct hci_dev *hdev) > struct btusb_data *data = hci_get_drvdata(hdev); > struct gpio_desc *reset_gpio = data->reset_gpio; > > + if (test_bit(BTUSB_HW_SSR_ACTIVE, &data->flags)) { > + bt_dev_info(hdev, "Ramdump in progress, defer cmd_timeout"); > + return; > + } > + > if (++data->cmd_timeout_cnt < 5) > return; > > @@ -3294,6 +3312,202 @@ static int btusb_set_bdaddr_wcn6855(struct hci_dev *hdev, > return 0; > } > > +#define QCA_MEMDUMP_ACL_HANDLE 0x2EDD > +#define QCA_MEMDUMP_SIZE_MAX 0x100000 > +#define QCA_MEMDUMP_VSE_CLASS 0x01 > +#define QCA_MEMDUMP_MSG_TYPE 0x08 > +#define QCA_MEMDUMP_PKT_SIZE 248 > +#define QCA_LAST_SEQUENCE_NUM 0xffff > + > +struct qca_dump_hdr { > + u8 vse_class; > + u8 msg_type; > + __le16 seqno; > + u8 reserved; > + union { > + u8 data[0]; > + struct { > + __le32 ram_dump_size; > + u8 data0[0]; > + } __packed; > + }; > +} __packed; > + > + > +static void btusb_dump_hdr_qca(struct hci_dev *hdev, struct sk_buff *skb) > +{ > + char buf[128]; > + struct btusb_data *btdata = hci_get_drvdata(hdev); > + > + snprintf(buf, sizeof(buf), "Controller Name: 0x%x\n", > + btdata->qca_dump.controller_id); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Firmware Version: 0x%x\n", > + btdata->qca_dump.fw_version); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Driver: %s\nVendor: qca\n", > + btusb_driver.name); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "VID: 0x%x\nPID:0x%x\n", > + btdata->qca_dump.id_vendor, btdata->qca_dump.id_product); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Lmp Subversion: 0x%x\n", > + hdev->lmp_subver); > + skb_put_data(skb, buf, strlen(buf)); > +} > + > +static void btusb_coredump_qca(struct hci_dev *hdev) > +{ > + static const u8 param[] = { 0x26 }; > + struct sk_buff *skb; > + > + skb = __hci_cmd_sync(hdev, 0xfc0c, 1, param, HCI_CMD_TIMEOUT); > + if (IS_ERR(skb)) > + bt_dev_err(hdev, "%s: triggle crash failed (%ld)", __func__, PTR_ERR(skb)); > + kfree_skb(skb); > +} > + > +/* > + * ==0: not a dump pkt. > + * < 0: fails to handle a dump pkt > + * > 0: otherwise. > + */ > +static int handle_dump_pkt_qca(struct hci_dev *hdev, struct sk_buff *skb) > +{ > + int ret = 1; > + u8 pkt_type; > + u8 *sk_ptr; > + unsigned int sk_len; > + u16 seqno; > + u32 dump_size; > + > + struct hci_event_hdr *event_hdr; > + struct hci_acl_hdr *acl_hdr; > + struct qca_dump_hdr *dump_hdr; > + struct btusb_data *btdata = hci_get_drvdata(hdev); > + struct usb_device *udev = btdata->udev; > + > + pkt_type = hci_skb_pkt_type(skb); > + sk_ptr = skb->data; > + sk_len = skb->len; > + > + if (pkt_type == HCI_ACLDATA_PKT) { > + acl_hdr = hci_acl_hdr(skb); > + if (le16_to_cpu(acl_hdr->handle) != QCA_MEMDUMP_ACL_HANDLE) > + return 0; > + sk_ptr += HCI_ACL_HDR_SIZE; > + sk_len -= HCI_ACL_HDR_SIZE; > + event_hdr = (struct hci_event_hdr *)sk_ptr; > + } else { > + event_hdr = hci_event_hdr(skb); > + } > + > + if ((event_hdr->evt != HCI_VENDOR_PKT) > + || (event_hdr->plen != (sk_len - HCI_EVENT_HDR_SIZE))) > + return 0; > + > + sk_ptr += HCI_EVENT_HDR_SIZE; > + sk_len -= HCI_EVENT_HDR_SIZE; > + > + dump_hdr = (struct qca_dump_hdr *)sk_ptr; > + if ((sk_len < offsetof(struct qca_dump_hdr, data)) > + || (dump_hdr->vse_class != QCA_MEMDUMP_VSE_CLASS) > + || (dump_hdr->msg_type != QCA_MEMDUMP_MSG_TYPE)) > + return 0; > + > + /*it is dump pkt now*/ > + seqno = le16_to_cpu(dump_hdr->seqno); > + if (seqno == 0) { > + set_bit(BTUSB_HW_SSR_ACTIVE, &btdata->flags); > + dump_size = le32_to_cpu(dump_hdr->ram_dump_size); > + if (!dump_size || (dump_size > QCA_MEMDUMP_SIZE_MAX)) { > + ret = -EILSEQ; > + bt_dev_err(hdev, "Invalid memdump size(%u)", > + dump_size); > + goto out; > + } > + > + ret = hci_devcd_init(hdev, dump_size); > + if (ret < 0) { > + bt_dev_err(hdev, "memdump init error(%d)", ret); > + goto out; > + } > + > + btdata->qca_dump.ram_dump_size = dump_size; > + btdata->qca_dump.ram_dump_seqno = 0; > + sk_ptr += offsetof(struct qca_dump_hdr, data0); > + sk_len -= offsetof(struct qca_dump_hdr, data0); > + > + usb_disable_autosuspend(udev); > + bt_dev_info(hdev, "%s memdump size(%u)\n", > + (pkt_type == HCI_ACLDATA_PKT) ? "ACL" : "event", > + dump_size); Lets not use bt_dev_info for devcd code, since the system should log these events via devcd interface, so please convert any instance of bt_dev_info to bt_dev_dbg. > + } else { > + sk_ptr += offsetof(struct qca_dump_hdr, data); > + sk_len -= offsetof(struct qca_dump_hdr, data); > + } > + > + if (!btdata->qca_dump.ram_dump_size) { > + ret = -EINVAL; > + bt_dev_err(hdev, "memdump is not active"); > + goto out; > + } > + > + if ((seqno > btdata->qca_dump.ram_dump_seqno + 1) && (seqno != QCA_LAST_SEQUENCE_NUM)) { > + dump_size = QCA_MEMDUMP_PKT_SIZE * (seqno - btdata->qca_dump.ram_dump_seqno - 1); > + hci_devcd_append_pattern(hdev, 0x0, dump_size); > + bt_dev_err(hdev, > + "expected memdump seqno(%u) is not received(%u)\n", > + btdata->qca_dump.ram_dump_seqno, seqno); > + btdata->qca_dump.ram_dump_seqno = seqno; > + kfree_skb(skb); > + return ret; > + } > + > + skb_pull(skb, skb->len - sk_len); > + hci_devcd_append(hdev, skb); > + btdata->qca_dump.ram_dump_seqno++; > + if (seqno == QCA_LAST_SEQUENCE_NUM) { > + bt_dev_info(hdev, > + "memdump done: pkts(%u), total(%u)\n", > + btdata->qca_dump.ram_dump_seqno, btdata->qca_dump.ram_dump_size); Ditto. > + hci_devcd_complete(hdev); > + goto out; > + } > + return ret; > + > +out: > + if (btdata->qca_dump.ram_dump_size) > + usb_enable_autosuspend(udev); > + btdata->qca_dump.ram_dump_size = 0; > + btdata->qca_dump.ram_dump_seqno = 0; > + clear_bit(BTUSB_HW_SSR_ACTIVE, &btdata->flags); > + > + if (ret < 0) > + kfree_skb(skb); > + return ret; > +} > + > +static int btusb_recv_acl_qca(struct hci_dev *hdev, struct sk_buff *skb) > +{ > + if (handle_dump_pkt_qca(hdev, skb)) > + return 0; > + return hci_recv_frame(hdev, skb); > +} > + > +static int btusb_recv_evt_qca(struct hci_dev *hdev, struct sk_buff *skb) > +{ > + if (handle_dump_pkt_qca(hdev, skb)) > + return 0; > + return hci_recv_frame(hdev, skb); > +} > + > + > #define QCA_DFU_PACKET_LEN 4096 > > #define QCA_GET_TARGET_VERSION 0x09 > @@ -3628,6 +3842,9 @@ static int btusb_setup_qca(struct hci_dev *hdev) > if (err < 0) > return err; > > + btdata->qca_dump.fw_version = le32_to_cpu(ver.patch_version); > + btdata->qca_dump.controller_id = le32_to_cpu(ver.rom_version); > + > if (!(status & QCA_SYSCFG_UPDATED)) { > err = btusb_setup_qca_load_nvm(hdev, &ver, info); > if (err < 0) > @@ -4117,6 +4334,11 @@ static int btusb_probe(struct usb_interface *intf, > } > > if (id->driver_info & BTUSB_QCA_WCN6855) { > + data->qca_dump.id_vendor = id->idVendor; > + data->qca_dump.id_product = id->idProduct; > + data->recv_event = btusb_recv_evt_qca; > + data->recv_acl = btusb_recv_acl_qca; > + hci_devcd_register(hdev, btusb_coredump_qca, btusb_dump_hdr_qca, NULL); > data->setup_on_usb = btusb_setup_qca; > hdev->shutdown = btusb_shutdown_qca; > hdev->set_bdaddr = btusb_set_bdaddr_wcn6855; > -- > 2.17.1 >
On Thu, 13 Apr 2023 at 09:44, Tim Jiang <quic_tjiang@quicinc.com> wrote: > > WCN6855 will report memdump via ACL data or HCI event when > it get crashed, so we collect memdump to debug firmware. Is it applicable only to wcn6855 or to some of earlier chips too? > > Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com> > --- > drivers/bluetooth/btusb.c | 222 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 222 insertions(+) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 2303b0a66323..f045bbb0ee09 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -733,6 +733,16 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { > {} > }; > > +struct qca_dump_info { > + /* fields for dump collection */ > + u16 id_vendor; > + u16 id_product; > + u32 fw_version; > + u32 controller_id; > + u32 ram_dump_size; > + u16 ram_dump_seqno; > +}; > + > #define BTUSB_MAX_ISOC_FRAMES 10 > > #define BTUSB_INTR_RUNNING 0 > @@ -752,6 +762,7 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { > #define BTUSB_WAKEUP_AUTOSUSPEND 14 > #define BTUSB_USE_ALT3_FOR_WBS 15 > #define BTUSB_ALT6_CONTINUOUS_TX 16 > +#define BTUSB_HW_SSR_ACTIVE 17 > > struct btusb_data { > struct hci_dev *hdev; > @@ -814,6 +825,8 @@ struct btusb_data { > > int oob_wake_irq; /* irq for out-of-band wake-on-bt */ > unsigned cmd_timeout_cnt; > + > + struct qca_dump_info qca_dump; > }; > > static void btusb_reset(struct hci_dev *hdev) > @@ -904,6 +917,11 @@ static void btusb_qca_cmd_timeout(struct hci_dev *hdev) > struct btusb_data *data = hci_get_drvdata(hdev); > struct gpio_desc *reset_gpio = data->reset_gpio; > > + if (test_bit(BTUSB_HW_SSR_ACTIVE, &data->flags)) { > + bt_dev_info(hdev, "Ramdump in progress, defer cmd_timeout"); > + return; > + } > + > if (++data->cmd_timeout_cnt < 5) > return; > > @@ -3294,6 +3312,202 @@ static int btusb_set_bdaddr_wcn6855(struct hci_dev *hdev, > return 0; > } > > +#define QCA_MEMDUMP_ACL_HANDLE 0x2EDD > +#define QCA_MEMDUMP_SIZE_MAX 0x100000 > +#define QCA_MEMDUMP_VSE_CLASS 0x01 > +#define QCA_MEMDUMP_MSG_TYPE 0x08 > +#define QCA_MEMDUMP_PKT_SIZE 248 > +#define QCA_LAST_SEQUENCE_NUM 0xffff > + > +struct qca_dump_hdr { > + u8 vse_class; > + u8 msg_type; > + __le16 seqno; > + u8 reserved; > + union { > + u8 data[0]; > + struct { > + __le32 ram_dump_size; > + u8 data0[0]; > + } __packed; > + }; > +} __packed; > + > + > +static void btusb_dump_hdr_qca(struct hci_dev *hdev, struct sk_buff *skb) > +{ > + char buf[128]; > + struct btusb_data *btdata = hci_get_drvdata(hdev); > + > + snprintf(buf, sizeof(buf), "Controller Name: 0x%x\n", > + btdata->qca_dump.controller_id); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Firmware Version: 0x%x\n", > + btdata->qca_dump.fw_version); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Driver: %s\nVendor: qca\n", > + btusb_driver.name); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "VID: 0x%x\nPID:0x%x\n", > + btdata->qca_dump.id_vendor, btdata->qca_dump.id_product); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Lmp Subversion: 0x%x\n", > + hdev->lmp_subver); > + skb_put_data(skb, buf, strlen(buf)); > +} > + > +static void btusb_coredump_qca(struct hci_dev *hdev) > +{ > + static const u8 param[] = { 0x26 }; > + struct sk_buff *skb; > + > + skb = __hci_cmd_sync(hdev, 0xfc0c, 1, param, HCI_CMD_TIMEOUT); > + if (IS_ERR(skb)) > + bt_dev_err(hdev, "%s: triggle crash failed (%ld)", __func__, PTR_ERR(skb)); > + kfree_skb(skb); > +} > + > +/* > + * ==0: not a dump pkt. > + * < 0: fails to handle a dump pkt > + * > 0: otherwise. > + */ > +static int handle_dump_pkt_qca(struct hci_dev *hdev, struct sk_buff *skb) > +{ > + int ret = 1; > + u8 pkt_type; > + u8 *sk_ptr; > + unsigned int sk_len; > + u16 seqno; > + u32 dump_size; > + > + struct hci_event_hdr *event_hdr; > + struct hci_acl_hdr *acl_hdr; > + struct qca_dump_hdr *dump_hdr; > + struct btusb_data *btdata = hci_get_drvdata(hdev); > + struct usb_device *udev = btdata->udev; > + > + pkt_type = hci_skb_pkt_type(skb); > + sk_ptr = skb->data; > + sk_len = skb->len; > + > + if (pkt_type == HCI_ACLDATA_PKT) { > + acl_hdr = hci_acl_hdr(skb); > + if (le16_to_cpu(acl_hdr->handle) != QCA_MEMDUMP_ACL_HANDLE) > + return 0; > + sk_ptr += HCI_ACL_HDR_SIZE; > + sk_len -= HCI_ACL_HDR_SIZE; > + event_hdr = (struct hci_event_hdr *)sk_ptr; > + } else { > + event_hdr = hci_event_hdr(skb); > + } > + > + if ((event_hdr->evt != HCI_VENDOR_PKT) > + || (event_hdr->plen != (sk_len - HCI_EVENT_HDR_SIZE))) > + return 0; > + > + sk_ptr += HCI_EVENT_HDR_SIZE; > + sk_len -= HCI_EVENT_HDR_SIZE; > + > + dump_hdr = (struct qca_dump_hdr *)sk_ptr; > + if ((sk_len < offsetof(struct qca_dump_hdr, data)) > + || (dump_hdr->vse_class != QCA_MEMDUMP_VSE_CLASS) > + || (dump_hdr->msg_type != QCA_MEMDUMP_MSG_TYPE)) > + return 0; > + > + /*it is dump pkt now*/ > + seqno = le16_to_cpu(dump_hdr->seqno); > + if (seqno == 0) { > + set_bit(BTUSB_HW_SSR_ACTIVE, &btdata->flags); > + dump_size = le32_to_cpu(dump_hdr->ram_dump_size); > + if (!dump_size || (dump_size > QCA_MEMDUMP_SIZE_MAX)) { > + ret = -EILSEQ; > + bt_dev_err(hdev, "Invalid memdump size(%u)", > + dump_size); > + goto out; > + } > + > + ret = hci_devcd_init(hdev, dump_size); > + if (ret < 0) { > + bt_dev_err(hdev, "memdump init error(%d)", ret); > + goto out; > + } > + > + btdata->qca_dump.ram_dump_size = dump_size; > + btdata->qca_dump.ram_dump_seqno = 0; > + sk_ptr += offsetof(struct qca_dump_hdr, data0); > + sk_len -= offsetof(struct qca_dump_hdr, data0); > + > + usb_disable_autosuspend(udev); > + bt_dev_info(hdev, "%s memdump size(%u)\n", > + (pkt_type == HCI_ACLDATA_PKT) ? "ACL" : "event", > + dump_size); > + } else { > + sk_ptr += offsetof(struct qca_dump_hdr, data); > + sk_len -= offsetof(struct qca_dump_hdr, data); > + } > + > + if (!btdata->qca_dump.ram_dump_size) { > + ret = -EINVAL; > + bt_dev_err(hdev, "memdump is not active"); > + goto out; > + } > + > + if ((seqno > btdata->qca_dump.ram_dump_seqno + 1) && (seqno != QCA_LAST_SEQUENCE_NUM)) { > + dump_size = QCA_MEMDUMP_PKT_SIZE * (seqno - btdata->qca_dump.ram_dump_seqno - 1); > + hci_devcd_append_pattern(hdev, 0x0, dump_size); > + bt_dev_err(hdev, > + "expected memdump seqno(%u) is not received(%u)\n", > + btdata->qca_dump.ram_dump_seqno, seqno); > + btdata->qca_dump.ram_dump_seqno = seqno; > + kfree_skb(skb); > + return ret; > + } > + > + skb_pull(skb, skb->len - sk_len); > + hci_devcd_append(hdev, skb); > + btdata->qca_dump.ram_dump_seqno++; > + if (seqno == QCA_LAST_SEQUENCE_NUM) { > + bt_dev_info(hdev, > + "memdump done: pkts(%u), total(%u)\n", > + btdata->qca_dump.ram_dump_seqno, btdata->qca_dump.ram_dump_size); > + > + hci_devcd_complete(hdev); > + goto out; > + } > + return ret; > + > +out: > + if (btdata->qca_dump.ram_dump_size) > + usb_enable_autosuspend(udev); > + btdata->qca_dump.ram_dump_size = 0; > + btdata->qca_dump.ram_dump_seqno = 0; > + clear_bit(BTUSB_HW_SSR_ACTIVE, &btdata->flags); > + > + if (ret < 0) > + kfree_skb(skb); > + return ret; > +} > + > +static int btusb_recv_acl_qca(struct hci_dev *hdev, struct sk_buff *skb) > +{ > + if (handle_dump_pkt_qca(hdev, skb)) > + return 0; > + return hci_recv_frame(hdev, skb); > +} > + > +static int btusb_recv_evt_qca(struct hci_dev *hdev, struct sk_buff *skb) > +{ > + if (handle_dump_pkt_qca(hdev, skb)) > + return 0; > + return hci_recv_frame(hdev, skb); > +} > + > + > #define QCA_DFU_PACKET_LEN 4096 > > #define QCA_GET_TARGET_VERSION 0x09 > @@ -3628,6 +3842,9 @@ static int btusb_setup_qca(struct hci_dev *hdev) > if (err < 0) > return err; > > + btdata->qca_dump.fw_version = le32_to_cpu(ver.patch_version); > + btdata->qca_dump.controller_id = le32_to_cpu(ver.rom_version); > + > if (!(status & QCA_SYSCFG_UPDATED)) { > err = btusb_setup_qca_load_nvm(hdev, &ver, info); > if (err < 0) > @@ -4117,6 +4334,11 @@ static int btusb_probe(struct usb_interface *intf, > } > > if (id->driver_info & BTUSB_QCA_WCN6855) { > + data->qca_dump.id_vendor = id->idVendor; > + data->qca_dump.id_product = id->idProduct; > + data->recv_event = btusb_recv_evt_qca; > + data->recv_acl = btusb_recv_acl_qca; > + hci_devcd_register(hdev, btusb_coredump_qca, btusb_dump_hdr_qca, NULL); > data->setup_on_usb = btusb_setup_qca; > hdev->shutdown = btusb_shutdown_qca; > hdev->set_bdaddr = btusb_set_bdaddr_wcn6855; > -- > 2.17.1 >
Hi Dmitry: -----Original Message----- From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Sent: Saturday, April 15, 2023 5:03 AM To: Tim Jiang (QUIC) <quic_tjiang@quicinc.com> Cc: marcel@holtmann.org; linux-kernel@vger.kernel.org; linux-bluetooth@vger.kernel.org; linux-arm-msm@vger.kernel.org; Balakrishna Godavarthi (QUIC) <quic_bgodavar@quicinc.com>; Hemant Gupta (QUIC) <quic_hemantg@quicinc.com>; mka@chromium.org Subject: Re: [PATCH v2] Bluetooth: btusb: Add WCN6855 devcoredump support On Thu, 13 Apr 2023 at 09:44, Tim Jiang <quic_tjiang@quicinc.com> wrote: > > WCN6855 will report memdump via ACL data or HCI event when it get > crashed, so we collect memdump to debug firmware. Is it applicable only to wcn6855 or to some of earlier chips too? [Tim] Also applicable to earlier chips , but currently google only require us to support wcn6855 > > Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com> > --- > drivers/bluetooth/btusb.c | 222 > ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 222 insertions(+) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 2303b0a66323..f045bbb0ee09 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -733,6 +733,16 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { > {} > }; > > +struct qca_dump_info { > + /* fields for dump collection */ > + u16 id_vendor; > + u16 id_product; > + u32 fw_version; > + u32 controller_id; > + u32 ram_dump_size; > + u16 ram_dump_seqno; > +}; > + > #define BTUSB_MAX_ISOC_FRAMES 10 > > #define BTUSB_INTR_RUNNING 0 > @@ -752,6 +762,7 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { > #define BTUSB_WAKEUP_AUTOSUSPEND 14 > #define BTUSB_USE_ALT3_FOR_WBS 15 > #define BTUSB_ALT6_CONTINUOUS_TX 16 > +#define BTUSB_HW_SSR_ACTIVE 17 > > struct btusb_data { > struct hci_dev *hdev; > @@ -814,6 +825,8 @@ struct btusb_data { > > int oob_wake_irq; /* irq for out-of-band wake-on-bt */ > unsigned cmd_timeout_cnt; > + > + struct qca_dump_info qca_dump; > }; > > static void btusb_reset(struct hci_dev *hdev) @@ -904,6 +917,11 @@ > static void btusb_qca_cmd_timeout(struct hci_dev *hdev) > struct btusb_data *data = hci_get_drvdata(hdev); > struct gpio_desc *reset_gpio = data->reset_gpio; > > + if (test_bit(BTUSB_HW_SSR_ACTIVE, &data->flags)) { > + bt_dev_info(hdev, "Ramdump in progress, defer cmd_timeout"); > + return; > + } > + > if (++data->cmd_timeout_cnt < 5) > return; > > @@ -3294,6 +3312,202 @@ static int btusb_set_bdaddr_wcn6855(struct hci_dev *hdev, > return 0; > } > > +#define QCA_MEMDUMP_ACL_HANDLE 0x2EDD #define QCA_MEMDUMP_SIZE_MAX > +0x100000 #define QCA_MEMDUMP_VSE_CLASS 0x01 #define > +QCA_MEMDUMP_MSG_TYPE 0x08 #define QCA_MEMDUMP_PKT_SIZE 248 #define > +QCA_LAST_SEQUENCE_NUM 0xffff > + > +struct qca_dump_hdr { > + u8 vse_class; > + u8 msg_type; > + __le16 seqno; > + u8 reserved; > + union { > + u8 data[0]; > + struct { > + __le32 ram_dump_size; > + u8 data0[0]; > + } __packed; > + }; > +} __packed; > + > + > +static void btusb_dump_hdr_qca(struct hci_dev *hdev, struct sk_buff > +*skb) { > + char buf[128]; > + struct btusb_data *btdata = hci_get_drvdata(hdev); > + > + snprintf(buf, sizeof(buf), "Controller Name: 0x%x\n", > + btdata->qca_dump.controller_id); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Firmware Version: 0x%x\n", > + btdata->qca_dump.fw_version); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Driver: %s\nVendor: qca\n", > + btusb_driver.name); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "VID: 0x%x\nPID:0x%x\n", > + btdata->qca_dump.id_vendor, btdata->qca_dump.id_product); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Lmp Subversion: 0x%x\n", > + hdev->lmp_subver); > + skb_put_data(skb, buf, strlen(buf)); } > + > +static void btusb_coredump_qca(struct hci_dev *hdev) { > + static const u8 param[] = { 0x26 }; > + struct sk_buff *skb; > + > + skb = __hci_cmd_sync(hdev, 0xfc0c, 1, param, HCI_CMD_TIMEOUT); > + if (IS_ERR(skb)) > + bt_dev_err(hdev, "%s: triggle crash failed (%ld)", __func__, PTR_ERR(skb)); > + kfree_skb(skb); > +} > + > +/* > + * ==0: not a dump pkt. > + * < 0: fails to handle a dump pkt > + * > 0: otherwise. > + */ > +static int handle_dump_pkt_qca(struct hci_dev *hdev, struct sk_buff > +*skb) { > + int ret = 1; > + u8 pkt_type; > + u8 *sk_ptr; > + unsigned int sk_len; > + u16 seqno; > + u32 dump_size; > + > + struct hci_event_hdr *event_hdr; > + struct hci_acl_hdr *acl_hdr; > + struct qca_dump_hdr *dump_hdr; > + struct btusb_data *btdata = hci_get_drvdata(hdev); > + struct usb_device *udev = btdata->udev; > + > + pkt_type = hci_skb_pkt_type(skb); > + sk_ptr = skb->data; > + sk_len = skb->len; > + > + if (pkt_type == HCI_ACLDATA_PKT) { > + acl_hdr = hci_acl_hdr(skb); > + if (le16_to_cpu(acl_hdr->handle) != QCA_MEMDUMP_ACL_HANDLE) > + return 0; > + sk_ptr += HCI_ACL_HDR_SIZE; > + sk_len -= HCI_ACL_HDR_SIZE; > + event_hdr = (struct hci_event_hdr *)sk_ptr; > + } else { > + event_hdr = hci_event_hdr(skb); > + } > + > + if ((event_hdr->evt != HCI_VENDOR_PKT) > + || (event_hdr->plen != (sk_len - HCI_EVENT_HDR_SIZE))) > + return 0; > + > + sk_ptr += HCI_EVENT_HDR_SIZE; > + sk_len -= HCI_EVENT_HDR_SIZE; > + > + dump_hdr = (struct qca_dump_hdr *)sk_ptr; > + if ((sk_len < offsetof(struct qca_dump_hdr, data)) > + || (dump_hdr->vse_class != QCA_MEMDUMP_VSE_CLASS) > + || (dump_hdr->msg_type != QCA_MEMDUMP_MSG_TYPE)) > + return 0; > + > + /*it is dump pkt now*/ > + seqno = le16_to_cpu(dump_hdr->seqno); > + if (seqno == 0) { > + set_bit(BTUSB_HW_SSR_ACTIVE, &btdata->flags); > + dump_size = le32_to_cpu(dump_hdr->ram_dump_size); > + if (!dump_size || (dump_size > QCA_MEMDUMP_SIZE_MAX)) { > + ret = -EILSEQ; > + bt_dev_err(hdev, "Invalid memdump size(%u)", > + dump_size); > + goto out; > + } > + > + ret = hci_devcd_init(hdev, dump_size); > + if (ret < 0) { > + bt_dev_err(hdev, "memdump init error(%d)", ret); > + goto out; > + } > + > + btdata->qca_dump.ram_dump_size = dump_size; > + btdata->qca_dump.ram_dump_seqno = 0; > + sk_ptr += offsetof(struct qca_dump_hdr, data0); > + sk_len -= offsetof(struct qca_dump_hdr, data0); > + > + usb_disable_autosuspend(udev); > + bt_dev_info(hdev, "%s memdump size(%u)\n", > + (pkt_type == HCI_ACLDATA_PKT) ? "ACL" : "event", > + dump_size); > + } else { > + sk_ptr += offsetof(struct qca_dump_hdr, data); > + sk_len -= offsetof(struct qca_dump_hdr, data); > + } > + > + if (!btdata->qca_dump.ram_dump_size) { > + ret = -EINVAL; > + bt_dev_err(hdev, "memdump is not active"); > + goto out; > + } > + > + if ((seqno > btdata->qca_dump.ram_dump_seqno + 1) && (seqno != QCA_LAST_SEQUENCE_NUM)) { > + dump_size = QCA_MEMDUMP_PKT_SIZE * (seqno - btdata->qca_dump.ram_dump_seqno - 1); > + hci_devcd_append_pattern(hdev, 0x0, dump_size); > + bt_dev_err(hdev, > + "expected memdump seqno(%u) is not received(%u)\n", > + btdata->qca_dump.ram_dump_seqno, seqno); > + btdata->qca_dump.ram_dump_seqno = seqno; > + kfree_skb(skb); > + return ret; > + } > + > + skb_pull(skb, skb->len - sk_len); > + hci_devcd_append(hdev, skb); > + btdata->qca_dump.ram_dump_seqno++; > + if (seqno == QCA_LAST_SEQUENCE_NUM) { > + bt_dev_info(hdev, > + "memdump done: pkts(%u), total(%u)\n", > + btdata->qca_dump.ram_dump_seqno, > + btdata->qca_dump.ram_dump_size); > + > + hci_devcd_complete(hdev); > + goto out; > + } > + return ret; > + > +out: > + if (btdata->qca_dump.ram_dump_size) > + usb_enable_autosuspend(udev); > + btdata->qca_dump.ram_dump_size = 0; > + btdata->qca_dump.ram_dump_seqno = 0; > + clear_bit(BTUSB_HW_SSR_ACTIVE, &btdata->flags); > + > + if (ret < 0) > + kfree_skb(skb); > + return ret; > +} > + > +static int btusb_recv_acl_qca(struct hci_dev *hdev, struct sk_buff > +*skb) { > + if (handle_dump_pkt_qca(hdev, skb)) > + return 0; > + return hci_recv_frame(hdev, skb); } > + > +static int btusb_recv_evt_qca(struct hci_dev *hdev, struct sk_buff > +*skb) { > + if (handle_dump_pkt_qca(hdev, skb)) > + return 0; > + return hci_recv_frame(hdev, skb); } > + > + > #define QCA_DFU_PACKET_LEN 4096 > > #define QCA_GET_TARGET_VERSION 0x09 > @@ -3628,6 +3842,9 @@ static int btusb_setup_qca(struct hci_dev *hdev) > if (err < 0) > return err; > > + btdata->qca_dump.fw_version = le32_to_cpu(ver.patch_version); > + btdata->qca_dump.controller_id = le32_to_cpu(ver.rom_version); > + > if (!(status & QCA_SYSCFG_UPDATED)) { > err = btusb_setup_qca_load_nvm(hdev, &ver, info); > if (err < 0) > @@ -4117,6 +4334,11 @@ static int btusb_probe(struct usb_interface *intf, > } > > if (id->driver_info & BTUSB_QCA_WCN6855) { > + data->qca_dump.id_vendor = id->idVendor; > + data->qca_dump.id_product = id->idProduct; > + data->recv_event = btusb_recv_evt_qca; > + data->recv_acl = btusb_recv_acl_qca; > + hci_devcd_register(hdev, btusb_coredump_qca, > + btusb_dump_hdr_qca, NULL); > data->setup_on_usb = btusb_setup_qca; > hdev->shutdown = btusb_shutdown_qca; > hdev->set_bdaddr = btusb_set_bdaddr_wcn6855; > -- > 2.17.1 > -- With best wishes Dmitry
Hi Luiz: -----Original Message----- From: Luiz Augusto von Dentz <luiz.dentz@gmail.com> Sent: Saturday, April 15, 2023 4:58 AM To: Tim Jiang (QUIC) <quic_tjiang@quicinc.com> Cc: marcel@holtmann.org; linux-kernel@vger.kernel.org; linux-bluetooth@vger.kernel.org; linux-arm-msm@vger.kernel.org; Balakrishna Godavarthi (QUIC) <quic_bgodavar@quicinc.com>; Hemant Gupta (QUIC) <quic_hemantg@quicinc.com>; mka@chromium.org Subject: Re: [PATCH v2] Bluetooth: btusb: Add WCN6855 devcoredump support Hi Tim, On Wed, Apr 12, 2023 at 11:46 PM Tim Jiang <quic_tjiang@quicinc.com> wrote: > > WCN6855 will report memdump via ACL data or HCI event when it get > crashed, so we collect memdump to debug firmware. > > Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com> > --- > drivers/bluetooth/btusb.c | 222 > ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 222 insertions(+) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 2303b0a66323..f045bbb0ee09 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -733,6 +733,16 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { > {} > }; > > +struct qca_dump_info { > + /* fields for dump collection */ > + u16 id_vendor; > + u16 id_product; > + u32 fw_version; > + u32 controller_id; > + u32 ram_dump_size; > + u16 ram_dump_seqno; > +}; > + > #define BTUSB_MAX_ISOC_FRAMES 10 > > #define BTUSB_INTR_RUNNING 0 > @@ -752,6 +762,7 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { > #define BTUSB_WAKEUP_AUTOSUSPEND 14 > #define BTUSB_USE_ALT3_FOR_WBS 15 > #define BTUSB_ALT6_CONTINUOUS_TX 16 > +#define BTUSB_HW_SSR_ACTIVE 17 > > struct btusb_data { > struct hci_dev *hdev; > @@ -814,6 +825,8 @@ struct btusb_data { > > int oob_wake_irq; /* irq for out-of-band wake-on-bt */ > unsigned cmd_timeout_cnt; > + > + struct qca_dump_info qca_dump; > }; > > static void btusb_reset(struct hci_dev *hdev) @@ -904,6 +917,11 @@ > static void btusb_qca_cmd_timeout(struct hci_dev *hdev) > struct btusb_data *data = hci_get_drvdata(hdev); > struct gpio_desc *reset_gpio = data->reset_gpio; > > + if (test_bit(BTUSB_HW_SSR_ACTIVE, &data->flags)) { > + bt_dev_info(hdev, "Ramdump in progress, defer cmd_timeout"); > + return; > + } > + > if (++data->cmd_timeout_cnt < 5) > return; > > @@ -3294,6 +3312,202 @@ static int btusb_set_bdaddr_wcn6855(struct hci_dev *hdev, > return 0; > } > > +#define QCA_MEMDUMP_ACL_HANDLE 0x2EDD #define QCA_MEMDUMP_SIZE_MAX > +0x100000 #define QCA_MEMDUMP_VSE_CLASS 0x01 #define > +QCA_MEMDUMP_MSG_TYPE 0x08 #define QCA_MEMDUMP_PKT_SIZE 248 #define > +QCA_LAST_SEQUENCE_NUM 0xffff > + > +struct qca_dump_hdr { > + u8 vse_class; > + u8 msg_type; > + __le16 seqno; > + u8 reserved; > + union { > + u8 data[0]; > + struct { > + __le32 ram_dump_size; > + u8 data0[0]; > + } __packed; > + }; > +} __packed; > + > + > +static void btusb_dump_hdr_qca(struct hci_dev *hdev, struct sk_buff > +*skb) { > + char buf[128]; > + struct btusb_data *btdata = hci_get_drvdata(hdev); > + > + snprintf(buf, sizeof(buf), "Controller Name: 0x%x\n", > + btdata->qca_dump.controller_id); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Firmware Version: 0x%x\n", > + btdata->qca_dump.fw_version); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Driver: %s\nVendor: qca\n", > + btusb_driver.name); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "VID: 0x%x\nPID:0x%x\n", > + btdata->qca_dump.id_vendor, btdata->qca_dump.id_product); > + skb_put_data(skb, buf, strlen(buf)); > + > + snprintf(buf, sizeof(buf), "Lmp Subversion: 0x%x\n", > + hdev->lmp_subver); > + skb_put_data(skb, buf, strlen(buf)); } > + > +static void btusb_coredump_qca(struct hci_dev *hdev) { > + static const u8 param[] = { 0x26 }; > + struct sk_buff *skb; > + > + skb = __hci_cmd_sync(hdev, 0xfc0c, 1, param, HCI_CMD_TIMEOUT); > + if (IS_ERR(skb)) > + bt_dev_err(hdev, "%s: triggle crash failed (%ld)", __func__, PTR_ERR(skb)); > + kfree_skb(skb); > +} > + > +/* > + * ==0: not a dump pkt. > + * < 0: fails to handle a dump pkt > + * > 0: otherwise. > + */ > +static int handle_dump_pkt_qca(struct hci_dev *hdev, struct sk_buff > +*skb) { > + int ret = 1; > + u8 pkt_type; > + u8 *sk_ptr; > + unsigned int sk_len; > + u16 seqno; > + u32 dump_size; > + > + struct hci_event_hdr *event_hdr; > + struct hci_acl_hdr *acl_hdr; > + struct qca_dump_hdr *dump_hdr; > + struct btusb_data *btdata = hci_get_drvdata(hdev); > + struct usb_device *udev = btdata->udev; > + > + pkt_type = hci_skb_pkt_type(skb); > + sk_ptr = skb->data; > + sk_len = skb->len; > + > + if (pkt_type == HCI_ACLDATA_PKT) { > + acl_hdr = hci_acl_hdr(skb); > + if (le16_to_cpu(acl_hdr->handle) != QCA_MEMDUMP_ACL_HANDLE) > + return 0; > + sk_ptr += HCI_ACL_HDR_SIZE; > + sk_len -= HCI_ACL_HDR_SIZE; > + event_hdr = (struct hci_event_hdr *)sk_ptr; > + } else { > + event_hdr = hci_event_hdr(skb); > + } > + > + if ((event_hdr->evt != HCI_VENDOR_PKT) > + || (event_hdr->plen != (sk_len - HCI_EVENT_HDR_SIZE))) > + return 0; > + > + sk_ptr += HCI_EVENT_HDR_SIZE; > + sk_len -= HCI_EVENT_HDR_SIZE; > + > + dump_hdr = (struct qca_dump_hdr *)sk_ptr; > + if ((sk_len < offsetof(struct qca_dump_hdr, data)) > + || (dump_hdr->vse_class != QCA_MEMDUMP_VSE_CLASS) > + || (dump_hdr->msg_type != QCA_MEMDUMP_MSG_TYPE)) > + return 0; > + > + /*it is dump pkt now*/ > + seqno = le16_to_cpu(dump_hdr->seqno); > + if (seqno == 0) { > + set_bit(BTUSB_HW_SSR_ACTIVE, &btdata->flags); > + dump_size = le32_to_cpu(dump_hdr->ram_dump_size); > + if (!dump_size || (dump_size > QCA_MEMDUMP_SIZE_MAX)) { > + ret = -EILSEQ; > + bt_dev_err(hdev, "Invalid memdump size(%u)", > + dump_size); > + goto out; > + } > + > + ret = hci_devcd_init(hdev, dump_size); > + if (ret < 0) { > + bt_dev_err(hdev, "memdump init error(%d)", ret); > + goto out; > + } > + > + btdata->qca_dump.ram_dump_size = dump_size; > + btdata->qca_dump.ram_dump_seqno = 0; > + sk_ptr += offsetof(struct qca_dump_hdr, data0); > + sk_len -= offsetof(struct qca_dump_hdr, data0); > + > + usb_disable_autosuspend(udev); > + bt_dev_info(hdev, "%s memdump size(%u)\n", > + (pkt_type == HCI_ACLDATA_PKT) ? "ACL" : "event", > + dump_size); Lets not use bt_dev_info for devcd code, since the system should log these events via devcd interface, so please convert any instance of bt_dev_info to bt_dev_dbg. [Tim] Ok , will address it in V3 version. > + } else { > + sk_ptr += offsetof(struct qca_dump_hdr, data); > + sk_len -= offsetof(struct qca_dump_hdr, data); > + } > + > + if (!btdata->qca_dump.ram_dump_size) { > + ret = -EINVAL; > + bt_dev_err(hdev, "memdump is not active"); > + goto out; > + } > + > + if ((seqno > btdata->qca_dump.ram_dump_seqno + 1) && (seqno != QCA_LAST_SEQUENCE_NUM)) { > + dump_size = QCA_MEMDUMP_PKT_SIZE * (seqno - btdata->qca_dump.ram_dump_seqno - 1); > + hci_devcd_append_pattern(hdev, 0x0, dump_size); > + bt_dev_err(hdev, > + "expected memdump seqno(%u) is not received(%u)\n", > + btdata->qca_dump.ram_dump_seqno, seqno); > + btdata->qca_dump.ram_dump_seqno = seqno; > + kfree_skb(skb); > + return ret; > + } > + > + skb_pull(skb, skb->len - sk_len); > + hci_devcd_append(hdev, skb); > + btdata->qca_dump.ram_dump_seqno++; > + if (seqno == QCA_LAST_SEQUENCE_NUM) { > + bt_dev_info(hdev, > + "memdump done: pkts(%u), total(%u)\n", > + btdata->qca_dump.ram_dump_seqno, > + btdata->qca_dump.ram_dump_size); Ditto. [Tim] will address it in V3 version > + hci_devcd_complete(hdev); > + goto out; > + } > + return ret; > + > +out: > + if (btdata->qca_dump.ram_dump_size) > + usb_enable_autosuspend(udev); > + btdata->qca_dump.ram_dump_size = 0; > + btdata->qca_dump.ram_dump_seqno = 0; > + clear_bit(BTUSB_HW_SSR_ACTIVE, &btdata->flags); > + > + if (ret < 0) > + kfree_skb(skb); > + return ret; > +} > + > +static int btusb_recv_acl_qca(struct hci_dev *hdev, struct sk_buff > +*skb) { > + if (handle_dump_pkt_qca(hdev, skb)) > + return 0; > + return hci_recv_frame(hdev, skb); } > + > +static int btusb_recv_evt_qca(struct hci_dev *hdev, struct sk_buff > +*skb) { > + if (handle_dump_pkt_qca(hdev, skb)) > + return 0; > + return hci_recv_frame(hdev, skb); } > + > + > #define QCA_DFU_PACKET_LEN 4096 > > #define QCA_GET_TARGET_VERSION 0x09 > @@ -3628,6 +3842,9 @@ static int btusb_setup_qca(struct hci_dev *hdev) > if (err < 0) > return err; > > + btdata->qca_dump.fw_version = le32_to_cpu(ver.patch_version); > + btdata->qca_dump.controller_id = le32_to_cpu(ver.rom_version); > + > if (!(status & QCA_SYSCFG_UPDATED)) { > err = btusb_setup_qca_load_nvm(hdev, &ver, info); > if (err < 0) > @@ -4117,6 +4334,11 @@ static int btusb_probe(struct usb_interface *intf, > } > > if (id->driver_info & BTUSB_QCA_WCN6855) { > + data->qca_dump.id_vendor = id->idVendor; > + data->qca_dump.id_product = id->idProduct; > + data->recv_event = btusb_recv_evt_qca; > + data->recv_acl = btusb_recv_acl_qca; > + hci_devcd_register(hdev, btusb_coredump_qca, > + btusb_dump_hdr_qca, NULL); > data->setup_on_usb = btusb_setup_qca; > hdev->shutdown = btusb_shutdown_qca; > hdev->set_bdaddr = btusb_set_bdaddr_wcn6855; > -- > 2.17.1 > -- Luiz Augusto von Dentz
On Tue, 18 Apr 2023 at 04:02, Tim Jiang (QUIC) <quic_tjiang@quicinc.com> wrote: > > Hi Dmitry: > > -----Original Message----- > From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Sent: Saturday, April 15, 2023 5:03 AM > To: Tim Jiang (QUIC) <quic_tjiang@quicinc.com> > Cc: marcel@holtmann.org; linux-kernel@vger.kernel.org; linux-bluetooth@vger.kernel.org; linux-arm-msm@vger.kernel.org; Balakrishna Godavarthi (QUIC) <quic_bgodavar@quicinc.com>; Hemant Gupta (QUIC) <quic_hemantg@quicinc.com>; mka@chromium.org > Subject: Re: [PATCH v2] Bluetooth: btusb: Add WCN6855 devcoredump support > > On Thu, 13 Apr 2023 at 09:44, Tim Jiang <quic_tjiang@quicinc.com> wrote: > > > > WCN6855 will report memdump via ACL data or HCI event when it get > > crashed, so we collect memdump to debug firmware. > > Is it applicable only to wcn6855 or to some of earlier chips too? > [Tim] Also applicable to earlier chips , but currently google only require us to support wcn6855 Since upstream is not a google kernel, please enable this feature for all relevant chipsets. > > > > > Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com> > > --- > > drivers/bluetooth/btusb.c | 222 > > ++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 222 insertions(+)
Hi Dmitry: -----Original Message----- From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Sent: Tuesday, April 18, 2023 5:03 PM To: Tim Jiang (QUIC) <quic_tjiang@quicinc.com> Cc: marcel@holtmann.org; linux-kernel@vger.kernel.org; linux-bluetooth@vger.kernel.org; linux-arm-msm@vger.kernel.org; Balakrishna Godavarthi (QUIC) <quic_bgodavar@quicinc.com>; Hemant Gupta (QUIC) <quic_hemantg@quicinc.com>; mka@chromium.org Subject: Re: [PATCH v2] Bluetooth: btusb: Add WCN6855 devcoredump support On Tue, 18 Apr 2023 at 04:02, Tim Jiang (QUIC) <quic_tjiang@quicinc.com> wrote: > > Hi Dmitry: > > -----Original Message----- > From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Sent: Saturday, April 15, 2023 5:03 AM > To: Tim Jiang (QUIC) <quic_tjiang@quicinc.com> > Cc: marcel@holtmann.org; linux-kernel@vger.kernel.org; > linux-bluetooth@vger.kernel.org; linux-arm-msm@vger.kernel.org; > Balakrishna Godavarthi (QUIC) <quic_bgodavar@quicinc.com>; Hemant > Gupta (QUIC) <quic_hemantg@quicinc.com>; mka@chromium.org > Subject: Re: [PATCH v2] Bluetooth: btusb: Add WCN6855 devcoredump > support > > On Thu, 13 Apr 2023 at 09:44, Tim Jiang <quic_tjiang@quicinc.com> wrote: > > > > WCN6855 will report memdump via ACL data or HCI event when it get > > crashed, so we collect memdump to debug firmware. > > Is it applicable only to wcn6855 or to some of earlier chips too? > [Tim] Also applicable to earlier chips , but currently google only > require us to support wcn6855 Since upstream is not a google kernel, please enable this feature for all relevant chipsets. [Tim] agreed , but the title of this gerrit unchanged, I raise a new gerrit for other relevant chipsets , is OK? > > > > > Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com> > > --- > > drivers/bluetooth/btusb.c | 222 > > ++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 222 insertions(+) -- With best wishes Dmitry
On Tue, 18 Apr 2023 at 12:07, Tim Jiang (QUIC) <quic_tjiang@quicinc.com> wrote: > > Hi Dmitry: > > -----Original Message----- > From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Sent: Tuesday, April 18, 2023 5:03 PM > To: Tim Jiang (QUIC) <quic_tjiang@quicinc.com> > Cc: marcel@holtmann.org; linux-kernel@vger.kernel.org; linux-bluetooth@vger.kernel.org; linux-arm-msm@vger.kernel.org; Balakrishna Godavarthi (QUIC) <quic_bgodavar@quicinc.com>; Hemant Gupta (QUIC) <quic_hemantg@quicinc.com>; mka@chromium.org > Subject: Re: [PATCH v2] Bluetooth: btusb: Add WCN6855 devcoredump support > > On Tue, 18 Apr 2023 at 04:02, Tim Jiang (QUIC) <quic_tjiang@quicinc.com> wrote: > > > > Hi Dmitry: > > > > -----Original Message----- > > From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > Sent: Saturday, April 15, 2023 5:03 AM > > To: Tim Jiang (QUIC) <quic_tjiang@quicinc.com> > > Cc: marcel@holtmann.org; linux-kernel@vger.kernel.org; > > linux-bluetooth@vger.kernel.org; linux-arm-msm@vger.kernel.org; > > Balakrishna Godavarthi (QUIC) <quic_bgodavar@quicinc.com>; Hemant > > Gupta (QUIC) <quic_hemantg@quicinc.com>; mka@chromium.org > > Subject: Re: [PATCH v2] Bluetooth: btusb: Add WCN6855 devcoredump > > support > > > > On Thu, 13 Apr 2023 at 09:44, Tim Jiang <quic_tjiang@quicinc.com> wrote: > > > > > > WCN6855 will report memdump via ACL data or HCI event when it get > > > crashed, so we collect memdump to debug firmware. > > > > Is it applicable only to wcn6855 or to some of earlier chips too? > > [Tim] Also applicable to earlier chips , but currently google only > > require us to support wcn6855 > > Since upstream is not a google kernel, please enable this feature for all relevant chipsets. > [Tim] agreed , but the title of this gerrit unchanged, I raise a new gerrit for other relevant chipsets , is OK? There is no gerrit here. Also, is there any chance you can fix your email client to stop putting old headers at the top of the email? > > > > > > > > > Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com> > > > --- > > > drivers/bluetooth/btusb.c | 222 > > > ++++++++++++++++++++++++++++++++++++++ > > > 1 file changed, 222 insertions(+) > > > > > -- > With best wishes > Dmitry
Hi Dmitry: > > On Thu, 13 Apr 2023 at 09:44, Tim Jiang <quic_tjiang@quicinc.com> wrote: > > > > > > WCN6855 will report memdump via ACL data or HCI event when it get > > > crashed, so we collect memdump to debug firmware. > > > > Is it applicable only to wcn6855 or to some of earlier chips too? > > [Tim] Also applicable to earlier chips , but currently google only > > require us to support wcn6855 > > Since upstream is not a google kernel, please enable this feature for all relevant chipsets. > [Tim] agreed , but the title of this gerrit unchanged, I raise a new gerrit for other relevant chipsets , is OK? There is no gerrit here. Also, is there any chance you can fix your email client to stop putting old headers at the top of the email? [Tim] sorry for confusion, I mean I will raise another new change for other relevant chipset, is OK ? and I use office 365 to reply your email which will adding old headers automatically , unless I delete the old headers manually, thank you. > > > > > > > > > Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com> > > > --- > > > drivers/bluetooth/btusb.c | 222 > > > ++++++++++++++++++++++++++++++++++++++ > > > 1 file changed, 222 insertions(+) > > > > > -- > With best wishes > Dmitry -- With best wishes Dmitry
On Tue, 18 Apr 2023 at 12:16, Tim Jiang (QUIC) <quic_tjiang@quicinc.com> wrote: > > Hi Dmitry: > > > > On Thu, 13 Apr 2023 at 09:44, Tim Jiang <quic_tjiang@quicinc.com> wrote: > > > > > > > > WCN6855 will report memdump via ACL data or HCI event when it get > > > > crashed, so we collect memdump to debug firmware. > > > > > > Is it applicable only to wcn6855 or to some of earlier chips too? > > > [Tim] Also applicable to earlier chips , but currently google only > > > require us to support wcn6855 > > > > Since upstream is not a google kernel, please enable this feature for all relevant chipsets. > > [Tim] agreed , but the title of this gerrit unchanged, I raise a new gerrit for other relevant chipsets , is OK? > > There is no gerrit here. > > Also, is there any chance you can fix your email client to stop putting old headers at the top of the email? > [Tim] sorry for confusion, I mean I will raise another new change for other relevant chipset, is OK ? I'd suggest using a single patch. > and I use office 365 to reply your email which will adding old headers automatically , unless I delete the old headers manually, thank you. > > > > > > > > > > > > > > Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com> > > > > --- > > > > drivers/bluetooth/btusb.c | 222 > > > > ++++++++++++++++++++++++++++++++++++++ > > > > 1 file changed, 222 insertions(+) > > > > > > > > > > -- > > With best wishes > > Dmitry > > > > -- > With best wishes > Dmitry
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 2303b0a66323..f045bbb0ee09 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -733,6 +733,16 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { {} }; +struct qca_dump_info { + /* fields for dump collection */ + u16 id_vendor; + u16 id_product; + u32 fw_version; + u32 controller_id; + u32 ram_dump_size; + u16 ram_dump_seqno; +}; + #define BTUSB_MAX_ISOC_FRAMES 10 #define BTUSB_INTR_RUNNING 0 @@ -752,6 +762,7 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { #define BTUSB_WAKEUP_AUTOSUSPEND 14 #define BTUSB_USE_ALT3_FOR_WBS 15 #define BTUSB_ALT6_CONTINUOUS_TX 16 +#define BTUSB_HW_SSR_ACTIVE 17 struct btusb_data { struct hci_dev *hdev; @@ -814,6 +825,8 @@ struct btusb_data { int oob_wake_irq; /* irq for out-of-band wake-on-bt */ unsigned cmd_timeout_cnt; + + struct qca_dump_info qca_dump; }; static void btusb_reset(struct hci_dev *hdev) @@ -904,6 +917,11 @@ static void btusb_qca_cmd_timeout(struct hci_dev *hdev) struct btusb_data *data = hci_get_drvdata(hdev); struct gpio_desc *reset_gpio = data->reset_gpio; + if (test_bit(BTUSB_HW_SSR_ACTIVE, &data->flags)) { + bt_dev_info(hdev, "Ramdump in progress, defer cmd_timeout"); + return; + } + if (++data->cmd_timeout_cnt < 5) return; @@ -3294,6 +3312,202 @@ static int btusb_set_bdaddr_wcn6855(struct hci_dev *hdev, return 0; } +#define QCA_MEMDUMP_ACL_HANDLE 0x2EDD +#define QCA_MEMDUMP_SIZE_MAX 0x100000 +#define QCA_MEMDUMP_VSE_CLASS 0x01 +#define QCA_MEMDUMP_MSG_TYPE 0x08 +#define QCA_MEMDUMP_PKT_SIZE 248 +#define QCA_LAST_SEQUENCE_NUM 0xffff + +struct qca_dump_hdr { + u8 vse_class; + u8 msg_type; + __le16 seqno; + u8 reserved; + union { + u8 data[0]; + struct { + __le32 ram_dump_size; + u8 data0[0]; + } __packed; + }; +} __packed; + + +static void btusb_dump_hdr_qca(struct hci_dev *hdev, struct sk_buff *skb) +{ + char buf[128]; + struct btusb_data *btdata = hci_get_drvdata(hdev); + + snprintf(buf, sizeof(buf), "Controller Name: 0x%x\n", + btdata->qca_dump.controller_id); + skb_put_data(skb, buf, strlen(buf)); + + snprintf(buf, sizeof(buf), "Firmware Version: 0x%x\n", + btdata->qca_dump.fw_version); + skb_put_data(skb, buf, strlen(buf)); + + snprintf(buf, sizeof(buf), "Driver: %s\nVendor: qca\n", + btusb_driver.name); + skb_put_data(skb, buf, strlen(buf)); + + snprintf(buf, sizeof(buf), "VID: 0x%x\nPID:0x%x\n", + btdata->qca_dump.id_vendor, btdata->qca_dump.id_product); + skb_put_data(skb, buf, strlen(buf)); + + snprintf(buf, sizeof(buf), "Lmp Subversion: 0x%x\n", + hdev->lmp_subver); + skb_put_data(skb, buf, strlen(buf)); +} + +static void btusb_coredump_qca(struct hci_dev *hdev) +{ + static const u8 param[] = { 0x26 }; + struct sk_buff *skb; + + skb = __hci_cmd_sync(hdev, 0xfc0c, 1, param, HCI_CMD_TIMEOUT); + if (IS_ERR(skb)) + bt_dev_err(hdev, "%s: triggle crash failed (%ld)", __func__, PTR_ERR(skb)); + kfree_skb(skb); +} + +/* + * ==0: not a dump pkt. + * < 0: fails to handle a dump pkt + * > 0: otherwise. + */ +static int handle_dump_pkt_qca(struct hci_dev *hdev, struct sk_buff *skb) +{ + int ret = 1; + u8 pkt_type; + u8 *sk_ptr; + unsigned int sk_len; + u16 seqno; + u32 dump_size; + + struct hci_event_hdr *event_hdr; + struct hci_acl_hdr *acl_hdr; + struct qca_dump_hdr *dump_hdr; + struct btusb_data *btdata = hci_get_drvdata(hdev); + struct usb_device *udev = btdata->udev; + + pkt_type = hci_skb_pkt_type(skb); + sk_ptr = skb->data; + sk_len = skb->len; + + if (pkt_type == HCI_ACLDATA_PKT) { + acl_hdr = hci_acl_hdr(skb); + if (le16_to_cpu(acl_hdr->handle) != QCA_MEMDUMP_ACL_HANDLE) + return 0; + sk_ptr += HCI_ACL_HDR_SIZE; + sk_len -= HCI_ACL_HDR_SIZE; + event_hdr = (struct hci_event_hdr *)sk_ptr; + } else { + event_hdr = hci_event_hdr(skb); + } + + if ((event_hdr->evt != HCI_VENDOR_PKT) + || (event_hdr->plen != (sk_len - HCI_EVENT_HDR_SIZE))) + return 0; + + sk_ptr += HCI_EVENT_HDR_SIZE; + sk_len -= HCI_EVENT_HDR_SIZE; + + dump_hdr = (struct qca_dump_hdr *)sk_ptr; + if ((sk_len < offsetof(struct qca_dump_hdr, data)) + || (dump_hdr->vse_class != QCA_MEMDUMP_VSE_CLASS) + || (dump_hdr->msg_type != QCA_MEMDUMP_MSG_TYPE)) + return 0; + + /*it is dump pkt now*/ + seqno = le16_to_cpu(dump_hdr->seqno); + if (seqno == 0) { + set_bit(BTUSB_HW_SSR_ACTIVE, &btdata->flags); + dump_size = le32_to_cpu(dump_hdr->ram_dump_size); + if (!dump_size || (dump_size > QCA_MEMDUMP_SIZE_MAX)) { + ret = -EILSEQ; + bt_dev_err(hdev, "Invalid memdump size(%u)", + dump_size); + goto out; + } + + ret = hci_devcd_init(hdev, dump_size); + if (ret < 0) { + bt_dev_err(hdev, "memdump init error(%d)", ret); + goto out; + } + + btdata->qca_dump.ram_dump_size = dump_size; + btdata->qca_dump.ram_dump_seqno = 0; + sk_ptr += offsetof(struct qca_dump_hdr, data0); + sk_len -= offsetof(struct qca_dump_hdr, data0); + + usb_disable_autosuspend(udev); + bt_dev_info(hdev, "%s memdump size(%u)\n", + (pkt_type == HCI_ACLDATA_PKT) ? "ACL" : "event", + dump_size); + } else { + sk_ptr += offsetof(struct qca_dump_hdr, data); + sk_len -= offsetof(struct qca_dump_hdr, data); + } + + if (!btdata->qca_dump.ram_dump_size) { + ret = -EINVAL; + bt_dev_err(hdev, "memdump is not active"); + goto out; + } + + if ((seqno > btdata->qca_dump.ram_dump_seqno + 1) && (seqno != QCA_LAST_SEQUENCE_NUM)) { + dump_size = QCA_MEMDUMP_PKT_SIZE * (seqno - btdata->qca_dump.ram_dump_seqno - 1); + hci_devcd_append_pattern(hdev, 0x0, dump_size); + bt_dev_err(hdev, + "expected memdump seqno(%u) is not received(%u)\n", + btdata->qca_dump.ram_dump_seqno, seqno); + btdata->qca_dump.ram_dump_seqno = seqno; + kfree_skb(skb); + return ret; + } + + skb_pull(skb, skb->len - sk_len); + hci_devcd_append(hdev, skb); + btdata->qca_dump.ram_dump_seqno++; + if (seqno == QCA_LAST_SEQUENCE_NUM) { + bt_dev_info(hdev, + "memdump done: pkts(%u), total(%u)\n", + btdata->qca_dump.ram_dump_seqno, btdata->qca_dump.ram_dump_size); + + hci_devcd_complete(hdev); + goto out; + } + return ret; + +out: + if (btdata->qca_dump.ram_dump_size) + usb_enable_autosuspend(udev); + btdata->qca_dump.ram_dump_size = 0; + btdata->qca_dump.ram_dump_seqno = 0; + clear_bit(BTUSB_HW_SSR_ACTIVE, &btdata->flags); + + if (ret < 0) + kfree_skb(skb); + return ret; +} + +static int btusb_recv_acl_qca(struct hci_dev *hdev, struct sk_buff *skb) +{ + if (handle_dump_pkt_qca(hdev, skb)) + return 0; + return hci_recv_frame(hdev, skb); +} + +static int btusb_recv_evt_qca(struct hci_dev *hdev, struct sk_buff *skb) +{ + if (handle_dump_pkt_qca(hdev, skb)) + return 0; + return hci_recv_frame(hdev, skb); +} + + #define QCA_DFU_PACKET_LEN 4096 #define QCA_GET_TARGET_VERSION 0x09 @@ -3628,6 +3842,9 @@ static int btusb_setup_qca(struct hci_dev *hdev) if (err < 0) return err; + btdata->qca_dump.fw_version = le32_to_cpu(ver.patch_version); + btdata->qca_dump.controller_id = le32_to_cpu(ver.rom_version); + if (!(status & QCA_SYSCFG_UPDATED)) { err = btusb_setup_qca_load_nvm(hdev, &ver, info); if (err < 0) @@ -4117,6 +4334,11 @@ static int btusb_probe(struct usb_interface *intf, } if (id->driver_info & BTUSB_QCA_WCN6855) { + data->qca_dump.id_vendor = id->idVendor; + data->qca_dump.id_product = id->idProduct; + data->recv_event = btusb_recv_evt_qca; + data->recv_acl = btusb_recv_acl_qca; + hci_devcd_register(hdev, btusb_coredump_qca, btusb_dump_hdr_qca, NULL); data->setup_on_usb = btusb_setup_qca; hdev->shutdown = btusb_shutdown_qca; hdev->set_bdaddr = btusb_set_bdaddr_wcn6855;
WCN6855 will report memdump via ACL data or HCI event when it get crashed, so we collect memdump to debug firmware. Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com> --- drivers/bluetooth/btusb.c | 222 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+)