Bluetooth: btrtl: Load FW v2 otherwise FW v1 for RTL8852C

In this commit, prefer to load FW v2 if available. Fallback to FW v1
otherwise. This behavior is only for RTL8852C.

Fixes: 9a24ce5e29b1 ("Bluetooth: btrtl: Firmware format v2 support")
Cc: stable@vger.kernel.org
Suggested-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Tested-by: Hilda Wu <hildawu@realtek.com>
Signed-off-by: Max Chou <max.chou@realtek.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index ddae6524106d14bf9b4be7b55c3b27e7945bb6b5..84c2c2e1122fb62c6948293af84a106ec3732981 100644 (file)
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -104,7 +104,7 @@ static const struct id_table ic_id_table[] = {
        { IC_INFO(RTL_ROM_LMP_8723A, 0xb, 0x6, HCI_USB),
          .config_needed = false,
          .has_rom_version = false,
-         .fw_name = "rtl_bt/rtl8723a_fw.bin",
+         .fw_name = "rtl_bt/rtl8723a_fw",
          .cfg_name = NULL,
          .hw_info = "rtl8723au" },
 
@@ -112,7 +112,7 @@ static const struct id_table ic_id_table[] = {
        { IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_UART),
          .config_needed = true,
          .has_rom_version = true,
-         .fw_name  = "rtl_bt/rtl8723bs_fw.bin",
+         .fw_name  = "rtl_bt/rtl8723bs_fw",
          .cfg_name = "rtl_bt/rtl8723bs_config",
          .hw_info  = "rtl8723bs" },
 
@@ -120,7 +120,7 @@ static const struct id_table ic_id_table[] = {
        { IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_USB),
          .config_needed = false,
          .has_rom_version = true,
-         .fw_name  = "rtl_bt/rtl8723b_fw.bin",
+         .fw_name  = "rtl_bt/rtl8723b_fw",
          .cfg_name = "rtl_bt/rtl8723b_config",
          .hw_info  = "rtl8723bu" },
 
@@ -132,7 +132,7 @@ static const struct id_table ic_id_table[] = {
          .hci_bus = HCI_UART,
          .config_needed = true,
          .has_rom_version = true,
-         .fw_name  = "rtl_bt/rtl8723cs_cg_fw.bin",
+         .fw_name  = "rtl_bt/rtl8723cs_cg_fw",
          .cfg_name = "rtl_bt/rtl8723cs_cg_config",
          .hw_info  = "rtl8723cs-cg" },
 
@@ -144,7 +144,7 @@ static const struct id_table ic_id_table[] = {
          .hci_bus = HCI_UART,
          .config_needed = true,
          .has_rom_version = true,
-         .fw_name  = "rtl_bt/rtl8723cs_vf_fw.bin",
+         .fw_name  = "rtl_bt/rtl8723cs_vf_fw",
          .cfg_name = "rtl_bt/rtl8723cs_vf_config",
          .hw_info  = "rtl8723cs-vf" },
 
@@ -156,7 +156,7 @@ static const struct id_table ic_id_table[] = {
          .hci_bus = HCI_UART,
          .config_needed = true,
          .has_rom_version = true,
-         .fw_name  = "rtl_bt/rtl8723cs_xx_fw.bin",
+         .fw_name  = "rtl_bt/rtl8723cs_xx_fw",
          .cfg_name = "rtl_bt/rtl8723cs_xx_config",
          .hw_info  = "rtl8723cs" },
 
@@ -164,7 +164,7 @@ static const struct id_table ic_id_table[] = {
        { IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_USB),
          .config_needed = true,
          .has_rom_version = true,
-         .fw_name  = "rtl_bt/rtl8723d_fw.bin",
+         .fw_name  = "rtl_bt/rtl8723d_fw",
          .cfg_name = "rtl_bt/rtl8723d_config",
          .hw_info  = "rtl8723du" },
 
@@ -172,7 +172,7 @@ static const struct id_table ic_id_table[] = {
        { IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_UART),
          .config_needed = true,
          .has_rom_version = true,
-         .fw_name  = "rtl_bt/rtl8723ds_fw.bin",
+         .fw_name  = "rtl_bt/rtl8723ds_fw",
          .cfg_name = "rtl_bt/rtl8723ds_config",
          .hw_info  = "rtl8723ds" },
 
@@ -180,7 +180,7 @@ static const struct id_table ic_id_table[] = {
        { IC_INFO(RTL_ROM_LMP_8821A, 0xa, 0x6, HCI_USB),
          .config_needed = false,
          .has_rom_version = true,
-         .fw_name  = "rtl_bt/rtl8821a_fw.bin",
+         .fw_name  = "rtl_bt/rtl8821a_fw",
          .cfg_name = "rtl_bt/rtl8821a_config",
          .hw_info  = "rtl8821au" },
 
@@ -189,7 +189,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = false,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8821c_fw.bin",
+         .fw_name  = "rtl_bt/rtl8821c_fw",
          .cfg_name = "rtl_bt/rtl8821c_config",
          .hw_info  = "rtl8821cu" },
 
@@ -198,7 +198,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = true,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8821cs_fw.bin",
+         .fw_name  = "rtl_bt/rtl8821cs_fw",
          .cfg_name = "rtl_bt/rtl8821cs_config",
          .hw_info  = "rtl8821cs" },
 
@@ -206,7 +206,7 @@ static const struct id_table ic_id_table[] = {
        { IC_INFO(RTL_ROM_LMP_8761A, 0xa, 0x6, HCI_USB),
          .config_needed = false,
          .has_rom_version = true,
-         .fw_name  = "rtl_bt/rtl8761a_fw.bin",
+         .fw_name  = "rtl_bt/rtl8761a_fw",
          .cfg_name = "rtl_bt/rtl8761a_config",
          .hw_info  = "rtl8761au" },
 
@@ -215,7 +215,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = false,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8761b_fw.bin",
+         .fw_name  = "rtl_bt/rtl8761b_fw",
          .cfg_name = "rtl_bt/rtl8761b_config",
          .hw_info  = "rtl8761btv" },
 
@@ -223,7 +223,7 @@ static const struct id_table ic_id_table[] = {
        { IC_INFO(RTL_ROM_LMP_8761A, 0xb, 0xa, HCI_USB),
          .config_needed = false,
          .has_rom_version = true,
-         .fw_name  = "rtl_bt/rtl8761bu_fw.bin",
+         .fw_name  = "rtl_bt/rtl8761bu_fw",
          .cfg_name = "rtl_bt/rtl8761bu_config",
          .hw_info  = "rtl8761bu" },
 
@@ -232,7 +232,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = true,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8822cs_fw.bin",
+         .fw_name  = "rtl_bt/rtl8822cs_fw",
          .cfg_name = "rtl_bt/rtl8822cs_config",
          .hw_info  = "rtl8822cs" },
 
@@ -241,7 +241,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = true,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8822cs_fw.bin",
+         .fw_name  = "rtl_bt/rtl8822cs_fw",
          .cfg_name = "rtl_bt/rtl8822cs_config",
          .hw_info  = "rtl8822cs" },
 
@@ -250,7 +250,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = false,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8822cu_fw.bin",
+         .fw_name  = "rtl_bt/rtl8822cu_fw",
          .cfg_name = "rtl_bt/rtl8822cu_config",
          .hw_info  = "rtl8822cu" },
 
@@ -259,7 +259,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = true,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8822b_fw.bin",
+         .fw_name  = "rtl_bt/rtl8822b_fw",
          .cfg_name = "rtl_bt/rtl8822b_config",
          .hw_info  = "rtl8822bu" },
 
@@ -268,7 +268,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = false,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8852au_fw.bin",
+         .fw_name  = "rtl_bt/rtl8852au_fw",
          .cfg_name = "rtl_bt/rtl8852au_config",
          .hw_info  = "rtl8852au" },
 
@@ -277,7 +277,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = true,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8852bs_fw.bin",
+         .fw_name  = "rtl_bt/rtl8852bs_fw",
          .cfg_name = "rtl_bt/rtl8852bs_config",
          .hw_info  = "rtl8852bs" },
 
@@ -286,7 +286,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = false,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8852bu_fw.bin",
+         .fw_name  = "rtl_bt/rtl8852bu_fw",
          .cfg_name = "rtl_bt/rtl8852bu_config",
          .hw_info  = "rtl8852bu" },
 
@@ -295,7 +295,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = false,
          .has_rom_version = true,
          .has_msft_ext = true,
-         .fw_name  = "rtl_bt/rtl8852cu_fw.bin",
+         .fw_name  = "rtl_bt/rtl8852cu_fw",
          .cfg_name = "rtl_bt/rtl8852cu_config",
          .hw_info  = "rtl8852cu" },
 
@@ -304,7 +304,7 @@ static const struct id_table ic_id_table[] = {
          .config_needed = false,
          .has_rom_version = true,
          .has_msft_ext = false,
-         .fw_name  = "rtl_bt/rtl8851bu_fw.bin",
+         .fw_name  = "rtl_bt/rtl8851bu_fw",
          .cfg_name = "rtl_bt/rtl8851bu_config",
          .hw_info  = "rtl8851bu" },
        };
@@ -1045,6 +1045,7 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
        struct sk_buff *skb;
        struct hci_rp_read_local_version *resp;
        struct hci_command_hdr *cmd;
+       char fw_name[40];
        char cfg_name[40];
        u16 hci_rev, lmp_subver;
        u8 hci_ver, lmp_ver, chip_type = 0;
@@ -1154,8 +1155,26 @@ next:
                        goto err_free;
        }
 
-       btrtl_dev->fw_len = rtl_load_file(hdev, btrtl_dev->ic_info->fw_name,
-                                         &btrtl_dev->fw_data);
+       if (!btrtl_dev->ic_info->fw_name) {
+               ret = -ENOMEM;
+               goto err_free;
+       }
+
+       btrtl_dev->fw_len = -EIO;
+       if (lmp_subver == RTL_ROM_LMP_8852A && hci_rev == 0x000c) {
+               snprintf(fw_name, sizeof(fw_name), "%s_v2.bin",
+                               btrtl_dev->ic_info->fw_name);
+               btrtl_dev->fw_len = rtl_load_file(hdev, fw_name,
+                               &btrtl_dev->fw_data);
+       }
+
+       if (btrtl_dev->fw_len < 0) {
+               snprintf(fw_name, sizeof(fw_name), "%s.bin",
+                               btrtl_dev->ic_info->fw_name);
+               btrtl_dev->fw_len = rtl_load_file(hdev, fw_name,
+                               &btrtl_dev->fw_data);
+       }
+
        if (btrtl_dev->fw_len < 0) {
                rtl_dev_err(hdev, "firmware file %s not found",
                            btrtl_dev->ic_info->fw_name);
@@ -1491,4 +1510,5 @@ MODULE_FIRMWARE("rtl_bt/rtl8852bs_config.bin");
 MODULE_FIRMWARE("rtl_bt/rtl8852bu_fw.bin");
 MODULE_FIRMWARE("rtl_bt/rtl8852bu_config.bin");
 MODULE_FIRMWARE("rtl_bt/rtl8852cu_fw.bin");
+MODULE_FIRMWARE("rtl_bt/rtl8852cu_fw_v2.bin");
 MODULE_FIRMWARE("rtl_bt/rtl8852cu_config.bin");