Bluetooth: btrtl: Add Realtek devcoredump support
PATCH v2 1/1 Bluetooth: btrtl: Add Realtek devcoredump support
From: Hilda Wu <[email protected]>
Catch debug exception from controller and driver, and trigger a devcoredump using hci devcoredump APIs. The debug exception data will be parsed in userspace.
Signed-off-by Alex Lu <[email protected]>
Signed-off-by Hilda Wu <[email protected]>
---
- According to devcoredump API revision, modified related part.
---
--- drivers/bluetooth/btrtl.c | 141 +++++++++++++++++++++++++++++++------- drivers/bluetooth/btrtl.h | 6 ++ drivers/bluetooth/btusb.c | 74 ++++++++++++++++++++ 3 files changed, 195 insertions(+), 26 deletions(-)
drivers/bluetooth/btrtl.c +115 -26
@@ -31,6 +31,8 @@#define RTL_ROM_LMP_8852A 0x8852#define RTL_CONFIG_MAGIC 0x8723ab55 +#define RTL_VSC_OP_COREDUMP 0xfcff +#define IC_MATCH_FL_LMPSUBV (1 << 0)#define IC_MATCH_FL_HCIREV (1 << 1)#define IC_MATCH_FL_HCIVER (1 << 2)
@@ -79,6 +81,7 @@ struct id_table {bool has_msft_ext;char *fw_name;char *cfg_name; +char *hw_info; };struct btrtl_device_info {
@@ -100,21 +103,24 @@ static const struct id_table ic_id_table[] = { .config_needed = false, .has_rom_version = false, .fw_name = "rtl_bt/rtl8723a_fw.bin", - .cfg_name = NULL }, + .cfg_name = NULL, + .hw_info = "rtl8723au" },/* 8723BS */ { IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_UART), .config_needed = true, .has_rom_version = true, .fw_name = "rtl_bt/rtl8723bs_fw.bin", - .cfg_name = "rtl_bt/rtl8723bs_config" }, + .cfg_name = "rtl_bt/rtl8723bs_config", + .hw_info = "rtl8723bs" }, /* 8723B */ { IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_USB), .config_needed = false, .has_rom_version = true, .fw_name = "rtl_bt/rtl8723b_fw.bin", - .cfg_name = "rtl_bt/rtl8723b_config" }, + .cfg_name = "rtl_bt/rtl8723b_config", + .hw_info = "rtl8723bu" }, /* 8723CS-CG */ { .match_flags = IC_MATCH_FL_LMPSUBV | IC_MATCH_FL_CHIP_TYPE |
@@ -125,7 +131,8 @@ static const struct id_table ic_id_table[] = { .config_needed = true, .has_rom_version = true, .fw_name = "rtl_bt/rtl8723cs_cg_fw.bin", - .cfg_name = "rtl_bt/rtl8723cs_cg_config" }, + .cfg_name = "rtl_bt/rtl8723cs_cg_config", + .hw_info = "rtl8723cs-cg" },/* 8723CS-VF */ { .match_flags = IC_MATCH_FL_LMPSUBV | IC_MATCH_FL_CHIP_TYPE |
@@ -136,7 +143,8 @@ static const struct id_table ic_id_table[] = { .config_needed = true, .has_rom_version = true, .fw_name = "rtl_bt/rtl8723cs_vf_fw.bin", - .cfg_name = "rtl_bt/rtl8723cs_vf_config" }, + .cfg_name = "rtl_bt/rtl8723cs_vf_config", + .hw_info = "rtl8723cs-vf" },/* 8723CS-XX */ { .match_flags = IC_MATCH_FL_LMPSUBV | IC_MATCH_FL_CHIP_TYPE |
@@ -147,28 +155,32 @@ static const struct id_table ic_id_table[] = { .config_needed = true, .has_rom_version = true, .fw_name = "rtl_bt/rtl8723cs_xx_fw.bin", - .cfg_name = "rtl_bt/rtl8723cs_xx_config" }, + .cfg_name = "rtl_bt/rtl8723cs_xx_config", + .hw_info = "rtl8723cs" },/* 8723D */ { IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_USB), .config_needed = true, .has_rom_version = true, .fw_name = "rtl_bt/rtl8723d_fw.bin", - .cfg_name = "rtl_bt/rtl8723d_config" }, + .cfg_name = "rtl_bt/rtl8723d_config", + .hw_info = "rtl8723du" }, /* 8723DS */ { IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_UART), .config_needed = true, .has_rom_version = true, .fw_name = "rtl_bt/rtl8723ds_fw.bin", - .cfg_name = "rtl_bt/rtl8723ds_config" }, + .cfg_name = "rtl_bt/rtl8723ds_config", + .hw_info = "rtl8723ds" }, /* 8821A */ { IC_INFO(RTL_ROM_LMP_8821A, 0xa, 0x6, HCI_USB), .config_needed = false, .has_rom_version = true, .fw_name = "rtl_bt/rtl8821a_fw.bin", - .cfg_name = "rtl_bt/rtl8821a_config" }, + .cfg_name = "rtl_bt/rtl8821a_config", + .hw_info = "rtl8821au" },/* 8821C */ { IC_INFO(RTL_ROM_LMP_8821A, 0xc, 0x8, HCI_USB),
@@ -176,7 +188,8 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8821c_fw.bin", - .cfg_name = "rtl_bt/rtl8821c_config" }, + .cfg_name = "rtl_bt/rtl8821c_config", + .hw_info = "rtl8821cu" },/* 8821CS */ { IC_INFO(RTL_ROM_LMP_8821A, 0xc, 0x8, HCI_UART),
@@ -184,14 +197,16 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8821cs_fw.bin", - .cfg_name = "rtl_bt/rtl8821cs_config" }, + .cfg_name = "rtl_bt/rtl8821cs_config", + .hw_info = "rtl8821cs" },/* 8761A */ { IC_INFO(RTL_ROM_LMP_8761A, 0xa, 0x6, HCI_USB), .config_needed = false, .has_rom_version = true, .fw_name = "rtl_bt/rtl8761a_fw.bin", - .cfg_name = "rtl_bt/rtl8761a_config" }, + .cfg_name = "rtl_bt/rtl8761a_config", + .hw_info = "rtl8761au" },/* 8761B */ { IC_INFO(RTL_ROM_LMP_8761A, 0xb, 0xa, HCI_UART),
@@ -199,14 +214,16 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8761b_fw.bin", - .cfg_name = "rtl_bt/rtl8761b_config" }, + .cfg_name = "rtl_bt/rtl8761b_config", + .hw_info = "rtl8761btv" },/* 8761BU */ { IC_INFO(RTL_ROM_LMP_8761A, 0xb, 0xa, HCI_USB), .config_needed = false, .has_rom_version = true, .fw_name = "rtl_bt/rtl8761bu_fw.bin", - .cfg_name = "rtl_bt/rtl8761bu_config" }, + .cfg_name = "rtl_bt/rtl8761bu_config", + .hw_info = "rtl8761bu" },/* 8822C with UART interface */ { IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0x8, HCI_UART),
@@ -214,7 +231,8 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8822cs_fw.bin", - .cfg_name = "rtl_bt/rtl8822cs_config" }, + .cfg_name = "rtl_bt/rtl8822cs_config", + .hw_info = "rtl8822cs" },/* 8822C with UART interface */ { IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0xa, HCI_UART),
@@ -222,7 +240,8 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8822cs_fw.bin", - .cfg_name = "rtl_bt/rtl8822cs_config" }, + .cfg_name = "rtl_bt/rtl8822cs_config", + .hw_info = "rtl8822cs" },/* 8822C with USB interface */ { IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0xa, HCI_USB),
@@ -230,7 +249,8 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8822cu_fw.bin", - .cfg_name = "rtl_bt/rtl8822cu_config" }, + .cfg_name = "rtl_bt/rtl8822cu_config", + .hw_info = "rtl8822cu" },/* 8822B */ { IC_INFO(RTL_ROM_LMP_8822B, 0xb, 0x7, HCI_USB),
@@ -238,7 +258,8 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8822b_fw.bin", - .cfg_name = "rtl_bt/rtl8822b_config" }, + .cfg_name = "rtl_bt/rtl8822b_config", + .hw_info = "rtl8822bu" },/* 8852A */ { IC_INFO(RTL_ROM_LMP_8852A, 0xa, 0xb, HCI_USB),
@@ -246,7 +267,8 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8852au_fw.bin", - .cfg_name = "rtl_bt/rtl8852au_config" }, + .cfg_name = "rtl_bt/rtl8852au_config", + .hw_info = "rtl8852au" },/* 8852B with UART interface */ { IC_INFO(RTL_ROM_LMP_8852A, 0xb, 0xb, HCI_UART),
@@ -254,7 +276,8 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8852bs_fw.bin", - .cfg_name = "rtl_bt/rtl8852bs_config" }, + .cfg_name = "rtl_bt/rtl8852bs_config", + .hw_info = "rtl8852bs" },/* 8852B */ { IC_INFO(RTL_ROM_LMP_8852A, 0xb, 0xb, HCI_USB),
@@ -262,7 +285,8 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8852bu_fw.bin", - .cfg_name = "rtl_bt/rtl8852bu_config" }, + .cfg_name = "rtl_bt/rtl8852bu_config", + .hw_info = "rtl8852bu" },/* 8852C */ { IC_INFO(RTL_ROM_LMP_8852A, 0xc, 0xc, HCI_USB),
@@ -270,9 +294,16 @@ static const struct id_table ic_id_table[] = { .has_rom_version = true, .has_msft_ext = true, .fw_name = "rtl_bt/rtl8852cu_fw.bin", - .cfg_name = "rtl_bt/rtl8852cu_config" }, + .cfg_name = "rtl_bt/rtl8852cu_config", + .hw_info = "rtl8852cu" }, }; +static struct { +const char *driver_name; +char *controller; +u32 fw_version; +} coredump_info; +static const struct id_table *btrtl_match_ic (u16 lmp_subver,u16 hci_rev,u8 hci_ver,u8 hci_bus,u8 chip_type)
@@ -696,6 +727,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, num_patches =le16_to_cpu (epatch_info->num_patches);BT_DBG ("fw_version=%x, num_patches=%d" ,le32_to_cpu (epatch_info->fw_version), num_patches); + coredump_info.fw_version =le32_to_cpu (epatch_info->fw_version);/* After the rtl_epatch_header there is a funky patch metadata section. * Assuming 2 patches, the layout is:
@@ -892,6 +924,50 @@ static int btrtl_setup_rtl8723b(struct hci_dev *hdev,return ret; } +static void btrtl_coredump (struct hci_dev *hdev) +{ +static const u8 param[] = {0x00 ,0x00 }; + +__hci_cmd_send (hdev,RTL_VSC_OP_COREDUMP ,sizeof (param), param); +} + +static void btrtl_dmp_hdr (struct hci_dev *hdev,struct sk_buff *skb) +{ +char buf[80 ]; + +if (coredump_info.controller) +snprintf (buf,sizeof (buf),"Controller Name: %s\n" , + coredump_info.controller); +else +snprintf (buf,sizeof (buf),"Controller Name: Unknown\n" ); +skb_put_data (skb, buf,strlen (buf)); + +snprintf (buf,sizeof (buf),"Firmware Version: 0x%X\n" , + coredump_info.fw_version); +skb_put_data (skb, buf,strlen (buf)); + +snprintf (buf,sizeof (buf),"Driver: %s\n" , coredump_info.driver_name); +skb_put_data (skb, buf,strlen (buf)); + +snprintf (buf,sizeof (buf),"Vendor: Realtek\n" ); +skb_put_data (skb, buf,strlen (buf)); +} + +static int btrtl_register_devcoredump_support (struct hci_dev *hdev) +{ +int err; + + err =hci_devcd_register (hdev, btrtl_coredump, btrtl_dmp_hdr,NULL ); + +return err; +} + +void btrtl_set_driver_name (struct hci_dev *hdev,const char *driver_name) +{ + coredump_info.driver_name = driver_name; +} +EXPORT_SYMBOL_GPL (btrtl_set_driver_name); +static bool rtl_has_chip_type (u16 lmp_subver) {switch (lmp_subver) {
@@ -1102,6 +1178,9 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,if (btrtl_dev->ic_info->has_msft_ext)hci_set_msft_opcode (hdev,0xFCF0 ); +if (btrtl_dev->ic_info) + coredump_info.controller = btrtl_dev->ic_info->hw_info; +return btrtl_dev; err_free:
@@ -1114,6 +1193,8 @@ EXPORT_SYMBOL_GPL(btrtl_initialize);int btrtl_download_firmware (struct hci_dev *hdev,struct btrtl_device_info *btrtl_dev) { +int err =0 ; +/* Match a set of subver values that correspond to stock firmware, * which is not compatible with standard btusb. * If matched, upload an alternative firmware that does conform to
@@ -1122,23 +1203,31 @@ int btrtl_download_firmware(struct hci_dev *hdev,*/ if (!btrtl_dev->ic_info) {rtl_dev_info (hdev,"assuming no firmware upload needed" ); -return 0 ; + err =0 ; + goto done; }switch (btrtl_dev->ic_info->lmp_subver) {case RTL_ROM_LMP_8723A : -return btrtl_setup_rtl8723a (hdev, btrtl_dev); + err =btrtl_setup_rtl8723a (hdev, btrtl_dev); +break ;case RTL_ROM_LMP_8723B :case RTL_ROM_LMP_8821A :case RTL_ROM_LMP_8761A :case RTL_ROM_LMP_8822B :case RTL_ROM_LMP_8852A :case RTL_ROM_LMP_8703B : -return btrtl_setup_rtl8723b (hdev, btrtl_dev); + err =btrtl_setup_rtl8723b (hdev, btrtl_dev); +break ;default :rtl_dev_info (hdev,"assuming no firmware upload needed" ); -return 0 ; +break ; } +done: +if (!err) + err =btrtl_register_devcoredump_support (hdev); + +return err; }EXPORT_SYMBOL_GPL (btrtl_download_firmware);
drivers/bluetooth/btrtl.h +6 -0
@@ -139,6 +139,7 @@ int btrtl_get_uart_settings(struct hci_dev *hdev,struct btrtl_device_info *btrtl_dev, unsigned int *controller_baudrate, u32 *device_baudrate, bool *flow_control); +void btrtl_set_driver_name (struct hci_dev *hdev,const char *driver_name);#else
@@ -182,4 +183,9 @@ static inline int btrtl_get_uart_settings(struct hci_dev *hdev, return -ENOENT; } +static inline void btrtl_set_driver_name (struct hci_dev *hdev,const char *driver_name) +{ +return -EOPNOTSUPP ; +} +#endif
drivers/bluetooth/btusb.c +74 -0
111 lines not on this page · raw message
Signature · 1 line
2.17.1
This is an automated email and please do not reply to this email.
Dear Submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository.
----- Output -----
error: patch failed: drivers/bluetooth/btrtl.c:31
error: drivers/bluetooth/btrtl.c: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Please resolve the issue and submit the patches again.
---
Regards,
Linux Bluetooth