| Message ID | 20220922103337.26167-1-hildawu@realtek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Bluetooth: btusb: Add Realtek devcoredump support | expand |
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=679375
---Test result---
Test Summary:
CheckPatch PASS 2.02 seconds
GitLint PASS 0.82 seconds
SubjectPrefix PASS 0.76 seconds
BuildKernel FAIL 31.01 seconds
BuildKernel32 FAIL 27.10 seconds
Incremental Build with patchesERROR 0.32 seconds
TestRunner: Setup PASS 513.22 seconds
TestRunner: l2cap-tester PASS 17.21 seconds
TestRunner: iso-tester PASS 16.16 seconds
TestRunner: bnep-tester PASS 6.50 seconds
TestRunner: mgmt-tester PASS 105.37 seconds
TestRunner: rfcomm-tester PASS 10.33 seconds
TestRunner: sco-tester PASS 9.77 seconds
TestRunner: smp-tester PASS 9.70 seconds
TestRunner: userchan-tester PASS 6.78 seconds
Details
##############################
Test: BuildKernel - FAIL - 31.01 seconds
Build Kernel with minimal configuration supports Bluetooth
drivers/bluetooth/btusb.c: In function ‘btusb_rtl_cmd_timeout’:
drivers/bluetooth/btusb.c:745:7: error: implicit declaration of function ‘hci_devcoredump_init’ [-Werror=implicit-function-declaration]
745 | if (!hci_devcoredump_init(hdev, skb->len)) {
| ^~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btusb.c:746:3: error: implicit declaration of function ‘hci_devcoredump_append’ [-Werror=implicit-function-declaration]
746 | hci_devcoredump_append(hdev, skb);
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btusb.c:747:3: error: implicit declaration of function ‘hci_devcoredump_complete’ [-Werror=implicit-function-declaration]
747 | hci_devcoredump_complete(hdev);
| ^~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/btusb.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1855: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL - 27.10 seconds
Build 32bit Kernel with minimal configuration supports Bluetooth
drivers/bluetooth/btusb.c: In function ‘btusb_rtl_cmd_timeout’:
drivers/bluetooth/btusb.c:745:7: error: implicit declaration of function ‘hci_devcoredump_init’ [-Werror=implicit-function-declaration]
745 | if (!hci_devcoredump_init(hdev, skb->len)) {
| ^~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btusb.c:746:3: error: implicit declaration of function ‘hci_devcoredump_append’ [-Werror=implicit-function-declaration]
746 | hci_devcoredump_append(hdev, skb);
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/bluetooth/btusb.c:747:3: error: implicit declaration of function ‘hci_devcoredump_complete’ [-Werror=implicit-function-declaration]
747 | hci_devcoredump_complete(hdev);
| ^~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:249: drivers/bluetooth/btusb.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:465: drivers/bluetooth] Error 2
make: *** [Makefile:1855: drivers] Error 2
##############################
Test: Incremental Build with patches - SKIPPED - 0.32 seconds
Incremental build per patch in the series
buildkernel failed
---
Regards,
Linux Bluetooth
Hi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on bluetooth/master]
[also build test ERROR on bluetooth-next/master linus/master v6.0-rc6 next-20220921]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/hildawu-realtek-com/Bluetooth-btusb-Add-Realtek-devcoredump-support/20220922-183533
base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git master
config: hexagon-randconfig-r023-20220922 (https://download.01.org/0day-ci/archive/20220923/202209230749.lLf1xA67-lkp@intel.com/config)
compiler: clang version 16.0.0 (https://github.com/llvm/llvm-project 791a7ae1ba3efd6bca96338e10ffde557ba83920)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/b896c161a197fbcb019f6e4f890b667bb9d6f15e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review hildawu-realtek-com/Bluetooth-btusb-Add-Realtek-devcoredump-support/20220922-183533
git checkout b896c161a197fbcb019f6e4f890b667bb9d6f15e
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash drivers/bluetooth/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/bluetooth/btrtl.c:657:8: error: call to undeclared function 'hci_devcoredump_register'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
err = hci_devcoredump_register(hdev, btrtl_coredump, btrtl_dmp_hdr,
^
1 error generated.
vim +/hci_devcoredump_register +657 drivers/bluetooth/btrtl.c
652
653 static int btrtl_register_devcoredump_support(struct hci_dev *hdev)
654 {
655 int err;
656
> 657 err = hci_devcoredump_register(hdev, btrtl_coredump, btrtl_dmp_hdr,
658 NULL);
659
660 return err;
661 }
662
Hi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on bluetooth/master]
[also build test ERROR on bluetooth-next/master linus/master v6.0-rc6 next-20220921]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/hildawu-realtek-com/Bluetooth-btusb-Add-Realtek-devcoredump-support/20220922-183533
base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git master
config: x86_64-randconfig-a003 (https://download.01.org/0day-ci/archive/20220923/202209231041.TfIbIGWJ-lkp@intel.com/config)
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/b896c161a197fbcb019f6e4f890b667bb9d6f15e
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review hildawu-realtek-com/Bluetooth-btusb-Add-Realtek-devcoredump-support/20220922-183533
git checkout b896c161a197fbcb019f6e4f890b667bb9d6f15e
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/bluetooth/btusb.c:731:7: error: implicit declaration of function 'hci_devcoredump_init' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
if (!hci_devcoredump_init(hdev, skb->len)) {
^
>> drivers/bluetooth/btusb.c:732:3: error: implicit declaration of function 'hci_devcoredump_append' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
hci_devcoredump_append(hdev, skb);
^
drivers/bluetooth/btusb.c:732:3: note: did you mean 'hci_devcoredump_init'?
drivers/bluetooth/btusb.c:731:7: note: 'hci_devcoredump_init' declared here
if (!hci_devcoredump_init(hdev, skb->len)) {
^
>> drivers/bluetooth/btusb.c:733:3: error: implicit declaration of function 'hci_devcoredump_complete' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
hci_devcoredump_complete(hdev);
^
drivers/bluetooth/btusb.c:733:3: note: did you mean 'hci_devcoredump_append'?
drivers/bluetooth/btusb.c:732:3: note: 'hci_devcoredump_append' declared here
hci_devcoredump_append(hdev, skb);
^
drivers/bluetooth/btusb.c:776:7: error: implicit declaration of function 'hci_devcoredump_init' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
if (!hci_devcoredump_init(hdev, skb->len)) {
^
drivers/bluetooth/btusb.c:777:3: error: implicit declaration of function 'hci_devcoredump_append' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
hci_devcoredump_append(hdev, skb);
^
drivers/bluetooth/btusb.c:778:3: error: implicit declaration of function 'hci_devcoredump_complete' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
hci_devcoredump_complete(hdev);
^
drivers/bluetooth/btusb.c:2361:8: error: implicit declaration of function 'hci_devcoredump_init' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
if (!hci_devcoredump_init(hdev, nskb->len)) {
^
drivers/bluetooth/btusb.c:2362:4: error: implicit declaration of function 'hci_devcoredump_append' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
hci_devcoredump_append(hdev, nskb);
^
drivers/bluetooth/btusb.c:2363:4: error: implicit declaration of function 'hci_devcoredump_complete' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
hci_devcoredump_complete(hdev);
^
9 errors generated.
--
>> drivers/bluetooth/btrtl.c:657:8: error: implicit declaration of function 'hci_devcoredump_register' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
err = hci_devcoredump_register(hdev, btrtl_coredump, btrtl_dmp_hdr,
^
1 error generated.
vim +/hci_devcoredump_init +731 drivers/bluetooth/btusb.c
719
720 static void btusb_rtl_cmd_timeout(struct hci_dev *hdev)
721 {
722 struct btusb_data *data = hci_get_drvdata(hdev);
723 struct gpio_desc *reset_gpio = data->reset_gpio;
724 struct sk_buff *skb;
725 u8 code[4] = { DEVCOREDUMP_CODE_CMD_TIMEOUT, 0, 0, 0 };
726
727 skb = alloc_skb(sizeof(code), GFP_ATOMIC);
728 if (!skb)
729 goto timeout_check;
730 skb_put_data(skb, code, sizeof(code));
> 731 if (!hci_devcoredump_init(hdev, skb->len)) {
> 732 hci_devcoredump_append(hdev, skb);
> 733 hci_devcoredump_complete(hdev);
734 } else {
735 bt_dev_err(hdev, "RTL: cmd timeout, failed to devcoredump");
736 kfree_skb(skb);
737 }
738
739 timeout_check:
740 if (++data->cmd_timeout_cnt < 5)
741 return;
742
743 if (!reset_gpio) {
744 bt_dev_err(hdev, "No gpio to reset Realtek device, ignoring");
745 return;
746 }
747
748 /* Toggle the hard reset line. The Realtek device is going to
749 * yank itself off the USB and then replug. The cleanup is handled
750 * correctly on the way out (standard USB disconnect), and the new
751 * device is detected cleanly and bound to the driver again like
752 * it should be.
753 */
754 if (test_and_set_bit(BTUSB_HW_RESET_ACTIVE, &data->flags)) {
755 bt_dev_err(hdev, "last reset failed? Not resetting again");
756 return;
757 }
758
759 bt_dev_err(hdev, "Reset Realtek device via gpio");
760 gpiod_set_value_cansleep(reset_gpio, 1);
761 msleep(200);
762 gpiod_set_value_cansleep(reset_gpio, 0);
763 }
764
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c index fb52313a1d45..94200cdcf1e2 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -64,6 +64,7 @@ struct id_table { bool has_msft_ext; char *fw_name; char *cfg_name; + char *hw_info; }; struct btrtl_device_info { @@ -83,42 +84,48 @@ 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" }, /* 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), @@ -126,14 +133,16 @@ 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"}, /* 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), @@ -141,14 +150,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 = "rtl8761bs" }, /* 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), @@ -156,7 +167,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), @@ -164,7 +176,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), @@ -172,7 +185,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), @@ -180,7 +194,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), @@ -188,7 +203,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 */ { IC_INFO(RTL_ROM_LMP_8852A, 0xb, 0xb, HCI_USB), @@ -196,7 +212,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), @@ -204,9 +221,17 @@ 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" }, }; +#define DRIVER_NAME_LEN 16 +static struct { + char driver_name[DRIVER_NAME_LEN]; + 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) { @@ -391,6 +416,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: @@ -587,6 +613,59 @@ 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, 0xfcff, sizeof(param), param); +} + +static int btrtl_dmp_hdr(struct hci_dev *hdev, char *buf, size_t size) +{ + char *ptr = buf; + size_t rem = size; + size_t read = 0; + + if (coredump_info.controller) + read = snprintf(ptr, rem, "Controller Name: %s\n", + coredump_info.controller); + else + read = snprintf(ptr, rem, "Controller Name: Unknown\n"); + 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: Realtek\n"); + rem -= read; + ptr += read; + + return size - rem; +} + +static int btrtl_register_devcoredump_support(struct hci_dev *hdev) +{ + int err; + + err = hci_devcoredump_register(hdev, btrtl_coredump, btrtl_dmp_hdr, + NULL); + + return err; +} + +void btrtl_set_driver_name(struct hci_dev *hdev, const char *driver_name) +{ + strncpy(coredump_info.driver_name, driver_name, DRIVER_NAME_LEN - 1); +} +EXPORT_SYMBOL_GPL(btrtl_set_driver_name); + void btrtl_free(struct btrtl_device_info *btrtl_dev) { kvfree(btrtl_dev->fw_data); @@ -724,6 +803,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: @@ -736,6 +818,8 @@ EXPORT_SYMBOL_GPL(btrtl_initialize); int btrtl_download_firmware(struct hci_dev *hdev, struct btrtl_device_info *btrtl_dev) { + int err; + /* 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 @@ -744,22 +828,30 @@ 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: - return btrtl_setup_rtl8723b(hdev, btrtl_dev); + err = btrtl_setup_rtl8723b(hdev, btrtl_dev); + break; default: + err = 0; rtl_dev_info(hdev, "assuming no firmware upload needed"); - return 0; + break; } +done: + if (!err) + btrtl_register_devcoredump_support(hdev); + return err; } EXPORT_SYMBOL_GPL(btrtl_download_firmware); diff --git a/drivers/bluetooth/btrtl.h b/drivers/bluetooth/btrtl.h index 2c441bda390a..455ccdd17cc4 100644 --- a/drivers/bluetooth/btrtl.h +++ b/drivers/bluetooth/btrtl.h @@ -62,6 +62,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 @@ -105,4 +106,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 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 271963805a38..5b1245c6f8cf 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -36,6 +36,10 @@ static bool reset = true; static struct usb_driver btusb_driver; +#define DEVCOREDUMP_CODE_MEMDUMP 0x01 +#define DEVCOREDUMP_CODE_HW_ERR 0x02 +#define DEVCOREDUMP_CODE_CMD_TIMEOUT 0x03 + #define BTUSB_IGNORE BIT(0) #define BTUSB_DIGIANSWER BIT(1) #define BTUSB_CSR BIT(2) @@ -731,7 +735,22 @@ static void btusb_rtl_cmd_timeout(struct hci_dev *hdev) { struct btusb_data *data = hci_get_drvdata(hdev); struct gpio_desc *reset_gpio = data->reset_gpio; + struct sk_buff *skb; + u8 code[4] = { DEVCOREDUMP_CODE_CMD_TIMEOUT, 0, 0, 0 }; + skb = alloc_skb(sizeof(code), GFP_ATOMIC); + if (!skb) + goto timeout_check; + skb_put_data(skb, code, sizeof(code)); + if (!hci_devcoredump_init(hdev, skb->len)) { + hci_devcoredump_append(hdev, skb); + hci_devcoredump_complete(hdev); + } else { + bt_dev_err(hdev, "RTL: cmd timeout, failed to devcoredump"); + kfree_skb(skb); + } + +timeout_check: if (++data->cmd_timeout_cnt < 5) return; @@ -757,6 +776,26 @@ static void btusb_rtl_cmd_timeout(struct hci_dev *hdev) gpiod_set_value_cansleep(reset_gpio, 0); } +static void btusb_rtl_hw_error(struct hci_dev *hdev, u8 code) +{ + u8 devcoredump_code[4] = { DEVCOREDUMP_CODE_HW_ERR, code, 0, 0 }; + struct sk_buff *skb; + + bt_dev_info(hdev, "RTL: hw err, trigger devcoredump"); + + skb = alloc_skb(sizeof(devcoredump_code), GFP_ATOMIC); + if (!skb) + return; + skb_put_data(skb, devcoredump_code, sizeof(devcoredump_code)); + if (!hci_devcoredump_init(hdev, skb->len)) { + hci_devcoredump_append(hdev, skb); + hci_devcoredump_complete(hdev); + } else { + bt_dev_err(hdev, "RTL: hw err, failed to generate devcoredump"); + kfree_skb(skb); + } +} + static void btusb_qca_cmd_timeout(struct hci_dev *hdev) { struct btusb_data *data = hci_get_drvdata(hdev); @@ -2315,6 +2354,38 @@ static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb) return -EILSEQ; } +static int btusb_recv_event_realtek(struct hci_dev *hdev, struct sk_buff *skb) +{ + struct btusb_data *data = hci_get_drvdata(hdev); + + if (skb->data[0] == HCI_VENDOR_PKT && skb->data[2] == 0x34) { + struct sk_buff *nskb; + u8 code[4] = { DEVCOREDUMP_CODE_MEMDUMP, 0, 0, 0 }; + + bt_dev_info(hdev, "RTL: received wdg reset vendor evt, len %u", + skb->len); + + nskb = alloc_skb(skb->len + sizeof(code), GFP_ATOMIC); + if (!nskb) + return -ENOMEM; + skb_put_data(nskb, code, sizeof(code)); + skb_put_data(nskb, skb->data, skb->len); + kfree_skb(skb); + + if (!hci_devcoredump_init(hdev, nskb->len)) { + hci_devcoredump_append(hdev, nskb); + hci_devcoredump_complete(hdev); + } else { + bt_dev_err(hdev, "Failed to generate devcoredump"); + kfree_skb(nskb); + } + + return 0; + } + + return hci_recv_frame(data->hdev, skb); +} + /* UHW CR mapping */ #define MTK_BT_MISC 0x70002510 #define MTK_BT_SUBSYS_RST 0x70002610 @@ -3755,6 +3826,8 @@ static int btusb_probe(struct usb_interface *intf, /* Override the rx handlers */ data->recv_event = btusb_recv_event_intel; data->recv_bulk = btusb_recv_bulk_intel; + } else if (id->driver_info & BTUSB_REALTEK) { + data->recv_event = btusb_recv_event_realtek; } data->recv_acl = hci_recv_frame; @@ -3913,9 +3986,11 @@ static int btusb_probe(struct usb_interface *intf, if (IS_ENABLED(CONFIG_BT_HCIBTUSB_RTL) && (id->driver_info & BTUSB_REALTEK)) { + btrtl_set_driver_name(hdev, btusb_driver.name); hdev->setup = btrtl_setup_realtek; hdev->shutdown = btrtl_shutdown_realtek; hdev->cmd_timeout = btusb_rtl_cmd_timeout; + hdev->hw_error = btusb_rtl_hw_error; /* Realtek devices need to set remote wakeup on auto-suspend */ set_bit(BTUSB_WAKEUP_AUTOSUSPEND, &data->flags);