| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <540fc6d93481e72e18b51f82f022ab34d57d5caa.1663020936.git.objelf@gmail.com>
Date: Tue, 13 Sep 2022 06:18:13 +0800
From: <sean.wang@...iatek.com>
To: <marcel@...tmann.org>, <johan.hedberg@...il.com>,
<luiz.dentz@...il.com>
CC: <sean.wang@...iatek.com>, <Soul.Huang@...iatek.com>,
<YN.Chen@...iatek.com>, <Leon.Yen@...iatek.com>,
<Eric-SY.Chang@...iatek.com>, <Deren.Wu@...iatek.com>,
<km.lin@...iatek.com>, <robin.chiu@...iatek.com>,
<Eddie.Chen@...iatek.com>, <ch.yeh@...iatek.com>,
<posh.sun@...iatek.com>, <ted.huang@...iatek.com>,
<Stella.Chang@...iatek.com>, <Tom.Chou@...iatek.com>,
<steve.lee@...iatek.com>, <jsiuda@...gle.com>,
<frankgor@...gle.com>, <abhishekpandit@...gle.com>,
<michaelfsun@...gle.com>, <abhishekpandit@...omium.org>,
<mcchou@...omium.org>, <shawnku@...gle.com>,
<linux-bluetooth@...r.kernel.org>,
<linux-mediatek@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>, Jing Cai <jing.cai@...iatek.com>
Subject: [PATCH 4/4] Bluetooth: btusb: mediatek: add MediaTek devcoredump support
From: Jing Cai <jing.cai@...iatek.com>
This patch implement function .coredump() and dmp_hdr() in btusb
driver for MediaTek controller. FW core dump was triggered by FW
specific event to show something unexpected happened in the controller.
The driver would be responsible for collecting and uploading the device
core dump pieces in hci driver using core dump API. Once we finished
the whole process, the driver would reset the controller to recover the
kind of fatal error.
Co-developed-by: Sean Wang <sean.wang@...iatek.com>
Signed-off-by: Sean Wang <sean.wang@...iatek.com>
Signed-off-by: Jing Cai <jing.cai@...iatek.com>
---
The patch need to work on the top of the patch provided from Manish Mandlik
in https://patchwork.kernel.org/project/bluetooth/patch/20220809083112.v4.3.Iaf638bb9f885f5880ab1b4e7ae2f73dd53a54661@changeid/
---
drivers/bluetooth/btmtk.c | 124 ++++++++++++++++++++++++++++++++++++++
drivers/bluetooth/btmtk.h | 13 ++++
drivers/bluetooth/btusb.c | 11 ++++
3 files changed, 148 insertions(+)
diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
index 77df7b5c3ef3..2835ae28ae35 100644
--- a/drivers/bluetooth/btmtk.c
+++ b/drivers/bluetooth/btmtk.c
@@ -18,6 +18,14 @@
#define MTK_FW_ROM_PATCH_SEC_MAP_SIZE 64
#define MTK_SEC_MAP_COMMON_SIZE 12
#define MTK_SEC_MAP_NEED_SEND_SIZE 52
+#define MTK_DRIVER_NAME_LEN 16
+#define MTK_COREDUMP_END "coredump end"
+
+enum {
+ BTMTK_COREDUMP_INIT,
+ BTMTK_COREDUMP_DISABLED,
+ BTMTK_COREDUMP_ACTIVE,
+};
struct btmtk_patch_header {
u8 datetime[16];
@@ -53,8 +61,65 @@ struct btmtk_section_map {
};
} __packed;
+static struct btmtk_coredump_info {
+ struct hci_dev *hdev;
+ char driver_name[MTK_DRIVER_NAME_LEN];
+ u32 dev_id;
+ u32 fw_version;
+ int state;
+} coredump_info;
+
static struct btmtk_reset_work reset_work;
+static void btmtk_coredump(struct hci_dev *hdev)
+{
+ int err;
+
+ err = __hci_cmd_send(hdev, 0xfd5b, 0, NULL);
+ if (err < 0)
+ bt_dev_err(hdev, "Coredump failed (%d)", err);
+}
+
+static int btmtk_coredump_hdr(struct hci_dev *hdev, char *buf, size_t size)
+{
+ char *ptr = buf;
+ size_t rem = size;
+ size_t read = 0;
+
+ read = snprintf(ptr, rem, "Controller Name: 0x%X\n", coredump_info.dev_id);
+ rem -= read;
+ ptr += read;
+
+ read = snprintf(ptr, rem, "Firmware Version: 0x%X\n", coredump_info.fw_version);
+ rem -= read;
+ ptr += read;
+
+ read = snprintf(ptr, rem, "Driver: %s\n", coredump_info.driver_name);
+ rem -= read;
+ ptr += read;
+
+ read = snprintf(ptr, rem, "Vendor: MediaTek\n");
+ rem -= read;
+ ptr += read;
+
+ return size - rem;
+}
+
+static void btmtk_coredump_notify(struct hci_dev *hdev, int state)
+{
+ switch (state) {
+ case HCI_DEVCOREDUMP_ACTIVE:
+ coredump_info.state = BTMTK_COREDUMP_ACTIVE;
+ break;
+ case HCI_DEVCOREDUMP_TIMEOUT:
+ case HCI_DEVCOREDUMP_ABORT:
+ case HCI_DEVCOREDUMP_DONE:
+ coredump_info.state = BTMTK_COREDUMP_INIT;
+ btmtk_reset_sync(coredump_info.hdev);
+ break;
+ }
+}
+
int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname,
wmt_cmd_sync_func_t wmt_cmd_sync)
{
@@ -296,6 +361,65 @@ void btmtk_reset_sync(struct hci_dev *hdev)
}
EXPORT_SYMBOL_GPL(btmtk_reset_sync);
+void btmtk_register_coredump(struct hci_dev *hdev, u32 dev_id,
+ const char *name, u32 fw_version)
+{
+ if (!IS_ENABLED(CONFIG_DEV_COREDUMP))
+ return;
+
+ coredump_info.hdev = hdev;
+ coredump_info.dev_id = dev_id;
+ coredump_info.fw_version = fw_version;
+ coredump_info.state = BTMTK_COREDUMP_INIT;
+ strncpy(coredump_info.driver_name, name, MTK_DRIVER_NAME_LEN - 1);
+
+ hci_devcoredump_register(hdev, btmtk_coredump, btmtk_coredump_hdr,
+ btmtk_coredump_notify);
+}
+EXPORT_SYMBOL_GPL(btmtk_register_coredump);
+
+int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb)
+{
+ int err;
+
+ if (!IS_ENABLED(CONFIG_DEV_COREDUMP))
+ return 0;
+
+ switch (coredump_info.state) {
+ case BTMTK_COREDUMP_DISABLED:
+ err = -EINVAL;
+ break;
+ case BTMTK_COREDUMP_INIT:
+ err = hci_devcoredump_init(hdev, 1024000);
+ if (err < 0)
+ break;
+ /* It is supposed coredump can be done within 5 seconds */
+ schedule_delayed_work(&hdev->dump.dump_timeout,
+ msecs_to_jiffies(5000));
+ fallthrough;
+ case BTMTK_COREDUMP_ACTIVE:
+ default:
+ err = hci_devcoredump_append(hdev, skb);
+ if (err < 0)
+ break;
+
+ if (skb->len > 12 &&
+ !strncmp((char *)&skb->data[skb->len - 13],
+ MTK_COREDUMP_END, 12))
+ hci_devcoredump_complete(hdev);
+
+ break;
+ }
+
+ if (err < 0) {
+ coredump_info.state = BTMTK_COREDUMP_DISABLED;
+ kfree_skb(skb);
+ }
+
+ return err;
+}
+EXPORT_SYMBOL_GPL(btmtk_process_coredump);
+
MODULE_AUTHOR("Sean Wang <sean.wang@...iatek.com>");
MODULE_AUTHOR("Mark Chen <mark-yw.chen@...iatek.com>");
MODULE_DESCRIPTION("Bluetooth support for MediaTek devices ver " VERSION);
diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h
index 22d39f637652..faf941ce7ca2 100644
--- a/drivers/bluetooth/btmtk.h
+++ b/drivers/bluetooth/btmtk.h
@@ -138,6 +138,9 @@ int btmtk_setup_firmware(struct hci_dev *hdev, const char *fwname,
wmt_cmd_sync_func_t wmt_cmd_sync);
void btmtk_init_reset_work(struct hci_dev *hdev, work_func_t func);
void btmtk_reset_sync(struct hci_dev *hdev);
+void btmtk_register_coredump(struct hci_dev *hdev, u32 dev_id, const char *name,
+ u32 fw_version);
+int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb);
#else
static inline int btmtk_set_bdaddr(struct hci_dev *hdev,
@@ -165,4 +168,14 @@ static void btmtk_init_reset_work(struct hci_dev *hdev, work_func_t func)
static void btmtk_reset_sync(struct hci_dev *hdev)
{
}
+
+void btmtk_register_coredump(struct hci_dev *hdev, u32 dev_id, const char *name,
+ u32 fw_version)
+{
+}
+
+static int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb)
+{
+ return -EOPNOTSUPP;
+}
#endif
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index dc86726c8271..e37919f46331 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2796,6 +2796,7 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
}
btmtk_init_reset_work(hdev, btusb_mtk_reset_work);
+ btmtk_register_coredump(hdev, dev_id, btusb_driver.name, fw_version);
switch (dev_id) {
case 0x7663:
@@ -2950,6 +2951,7 @@ static int btusb_recv_acl_mtk(struct hci_dev *hdev, struct sk_buff *skb)
{
struct btusb_data *data = hci_get_drvdata(hdev);
u16 handle = le16_to_cpu(hci_acl_hdr(skb)->handle);
+ struct sk_buff *skb_cd;
switch (handle) {
case 0xfc6f: /* Firmware dump from device */
@@ -2957,6 +2959,15 @@ static int btusb_recv_acl_mtk(struct hci_dev *hdev, struct sk_buff *skb)
* suspend and thus disable auto-suspend.
*/
usb_disable_autosuspend(data->udev);
+
+ /* We need to forward the diagnostic packet to userspace daemon
+ * for backward compatibility, so we have to clone the packet
+ * extraly for the in-kernel coredump support.
+ */
+ skb_cd = skb_clone(skb, GFP_ATOMIC);
+ if (skb_cd)
+ btmtk_process_coredump(hdev, skb_cd);
+
fallthrough;
case 0x05ff: /* Firmware debug logging 1 */
case 0x05fe: /* Firmware debug logging 2 */
--
2.25.1
Powered by blists - more mailing lists