Bluetooth: btrtl: btmrvl: Fix firmware filename for rtl8723bs chipset

Firmware for rtl8723bs chipset is as part of the linux-firmware repository in filename rtl8723bs_config-OBDA8723.bin.

This patch fixes mwifiex driver to load correct firmware file for rtl8723bs.

---
 drivers/bluetooth/btrtl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index c2030f7e25b4..449858b65e8e 100644
@@ -88,7 +88,7 @@ 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),

@@ -923,7 +923,7 @@ 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");

2.20.1

Firmware for rtl chipset is as part of the linux-firmware repository in dir linux-firmware/rtl_bt. Today, the rtl8761a_config, rtl8821a_config and rtl8723b_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.

---
 drivers/bluetooth/btrtl.c | 3 ---
 1 file changed, 3 deletions(-)

index 449858b65e8e..56cec18475f7 100644
@@ -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-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

Hi,

These config files can be board specific. I don't know the policy for MODULE_FIRMWARE macros.
Personally I think: if the driver tries to load a specific firmware file then it's fine to have a MODULE_FIRMWARE entry. Even if this firmware is not part of the linux-firmware repository.

Best regards,
Martin

Hi Meng,

I am ignoring this patch since the subject is bogus.

Regards

Marcel

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=623467

---Test result---

Test Summary:

CheckPatch                    PASS      3.06 seconds
GitLint                       PASS      2.07 seconds
SubjectPrefix                 PASS      1.72 seconds
BuildKernel                   PASS      29.67 seconds
BuildKernel32                 PASS      26.39 seconds
Incremental Build with patchesPASS      44.25 seconds
TestRunner: Setup             PASS      457.53 seconds
TestRunner: l2cap-tester      PASS      15.11 seconds
TestRunner: bnep-tester       PASS      5.91 seconds
TestRunner: mgmt-tester       PASS      97.37 seconds
TestRunner: rfcomm-tester     PASS      7.41 seconds
TestRunner: sco-tester        PASS      7.23 seconds
TestRunner: smp-tester        PASS      7.31 seconds
TestRunner: userchan-tester   PASS      6.00 seconds

---
Regards,
Linux Bluetooth

Hello,

This raises some serious questions for me:
- the subject states that this patch is for the btmrvl driver
- mwifiex is for Marvell based chips which to my knowledge are not related to any Realtek chips, so mwifiex should never try to load Realtek firmware files

[...]

  if (btrtl_dev->ic_info->cfg_name) {
    if (postfix) {
       snprintf(cfg_name, sizeof(cfg_name), "%s-%s.bin",
btrtl_dev->ic_info->cfg_name, postfix);
     } else {
       snprintf(cfg_name, sizeof(cfg_name), "%s.bin",