Firmware for rtl chipset is as part of the linux-firmware repository
in dir linux-firmware/rtl_bt. Today, the rtl8761a_config,
rtl8821a_config, rtl8723b_config and rtl8723bs_config files are used
in btrtl, but it doesn't actually exist, which causes errors like:
bluetooth: Direct firmware load for rtl_bt/rtl8821a_config.bin
failed with error -2
According to the files in the rtl_bt directory in the Linux firmware,
fixes the driver to load correct firmware file for rtl.
Signed-off-by: Meng Tang <[email protected]>
---
drivers/bluetooth/btrtl.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index c2030f7e25b4..c10e07ad2fa3 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -88,14 +88,14 @@ static const struct id_table ic_id_table[] = {
.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-OBDA8723" },
/* 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 = NULL },
/* 8723D */
{ IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_USB),
@@ -116,7 +116,7 @@ static const struct id_table ic_id_table[] = {
.config_needed = false,
.has_rom_version = true,
.fw_name = "rtl_bt/rtl8821a_fw.bin",
- .cfg_name = "rtl_bt/rtl8821a_config" },
+ .cfg_name = NULL },
/* 8821C */
{ IC_INFO(RTL_ROM_LMP_8821A, 0xc, 0x8, HCI_USB),
@@ -131,7 +131,7 @@ static const struct id_table ic_id_table[] = {
.config_needed = false,
.has_rom_version = true,
.fw_name = "rtl_bt/rtl8761a_fw.bin",
- .cfg_name = "rtl_bt/rtl8761a_config" },
+ .cfg_name = NULL },
/* 8761B */
{ IC_INFO(RTL_ROM_LMP_8761A, 0xb, 0xa, HCI_UART),
@@ -184,7 +184,7 @@ static const struct id_table ic_id_table[] = {
{ IC_INFO(RTL_ROM_LMP_8852A, 0xa, 0xb, HCI_USB),
.config_needed = false,
.has_rom_version = true,
- .has_msft_ext = true,
+ n.has_msft_ext = true,
.fw_name = "rtl_bt/rtl8852au_fw.bin",
.cfg_name = "rtl_bt/rtl8852au_config" },
};
@@ -921,15 +921,12 @@ MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
MODULE_FIRMWARE("rtl_bt/rtl8723a_fw.bin");
MODULE_FIRMWARE("rtl_bt/rtl8723b_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8723b_config.bin");
MODULE_FIRMWARE("rtl_bt/rtl8723bs_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8723bs_config.bin");
+MODULE_FIRMWARE("rtl_bt/rtl8723bs_config-OBDA8723.bin");
MODULE_FIRMWARE("rtl_bt/rtl8723ds_fw.bin");
MODULE_FIRMWARE("rtl_bt/rtl8723ds_config.bin");
MODULE_FIRMWARE("rtl_bt/rtl8761a_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8761a_config.bin");
MODULE_FIRMWARE("rtl_bt/rtl8821a_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8821a_config.bin");
MODULE_FIRMWARE("rtl_bt/rtl8822b_fw.bin");
MODULE_FIRMWARE("rtl_bt/rtl8822b_config.bin");
MODULE_FIRMWARE("rtl_bt/rtl8852au_fw.bin");
--
2.20.1
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=622463
---Test result---
Test Summary:
CheckPatch PASS 1.78 seconds
GitLint PASS 1.04 seconds
SubjectPrefix PASS 0.88 seconds
BuildKernel FAIL 37.65 seconds
BuildKernel32 FAIL 34.43 seconds
Incremental Build with patchesERROR 0.42 seconds
TestRunner: Setup PASS 599.06 seconds
TestRunner: l2cap-tester PASS 18.38 seconds
TestRunner: bnep-tester PASS 7.33 seconds
TestRunner: mgmt-tester PASS 117.49 seconds
TestRunner: rfcomm-tester PASS 9.92 seconds
TestRunner: sco-tester PASS 9.53 seconds
TestRunner: smp-tester PASS 9.46 seconds
TestRunner: userchan-tester PASS 7.85 seconds
Details
##############################
Test: BuildKernel - FAIL - 37.65 seconds
Build Kernel with minimal configuration supports Bluetooth
drivers/bluetooth/btrtl.c:187:4: error: ‘n’ undeclared here (not in a function)
187 | n.has_msft_ext = true,
| ^
make[2]: *** [scripts/Makefile.build:288: drivers/bluetooth/btrtl.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:550: drivers/bluetooth] Error 2
make: *** [Makefile:1831: drivers] Error 2
##############################
Test: BuildKernel32 - FAIL - 34.43 seconds
Build 32bit Kernel with minimal configuration supports Bluetooth
drivers/bluetooth/btrtl.c:187:4: error: ‘n’ undeclared here (not in a function)
187 | n.has_msft_ext = true,
| ^
make[2]: *** [scripts/Makefile.build:288: drivers/bluetooth/btrtl.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [scripts/Makefile.build:550: drivers/bluetooth] Error 2
make: *** [Makefile:1831: drivers] Error 2
##############################
Test: Incremental Build with patches - SKIPPED - 0.42 seconds
Incremental build per patch in the series
buildkernel failed
---
Regards,
Linux Bluetooth