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

commit bd003fb338afee97c76f13c3e9144a7e4ad37179 upstream.

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>
[juergh: Adjusted context due to missing .hw_info struct element]
Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 2915c82d719d886b953b0362e2e1b626f30ab64d..c22c1d10cc46e74537d578edb52ae3a4fa2bc72e 100644 (file)
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -101,21 +101,21 @@ 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 },
 
        /* 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",
+         .fw_name  = "rtl_bt/rtl8723bs_fw",
          .cfg_name = "rtl_bt/rtl8723bs_config" },
 
        /* 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",
+         .fw_name  = "rtl_bt/rtl8723b_fw",
          .cfg_name = "rtl_bt/rtl8723b_config" },
 
        /* 8723CS-CG */
@@ -126,7 +126,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" },
 
        /* 8723CS-VF */
@@ -137,7 +137,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" },
 
        /* 8723CS-XX */
@@ -148,28 +148,28 @@ 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" },
 
        /* 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",
+         .fw_name  = "rtl_bt/rtl8723d_fw",
          .cfg_name = "rtl_bt/rtl8723d_config" },
 
        /* 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",
+         .fw_name  = "rtl_bt/rtl8723ds_fw",
          .cfg_name = "rtl_bt/rtl8723ds_config" },
 
        /* 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",
+         .fw_name  = "rtl_bt/rtl8821a_fw",
          .cfg_name = "rtl_bt/rtl8821a_config" },
 
        /* 8821C */
@@ -177,7 +177,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" },
 
        /* 8821CS */
@@ -185,14 +185,14 @@ 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" },
 
        /* 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",
+         .fw_name  = "rtl_bt/rtl8761a_fw",
          .cfg_name = "rtl_bt/rtl8761a_config" },
 
        /* 8761B */
@@ -200,14 +200,14 @@ 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" },
 
        /* 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",
+         .fw_name  = "rtl_bt/rtl8761bu_fw",
          .cfg_name = "rtl_bt/rtl8761bu_config" },
 
        /* 8822C with UART interface */
@@ -215,7 +215,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" },
 
        /* 8822C with UART interface */
@@ -223,7 +223,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" },
 
        /* 8822C with USB interface */
@@ -231,7 +231,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" },
 
        /* 8822B */
@@ -239,7 +239,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" },
 
        /* 8852A */
@@ -247,7 +247,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" },
 
        /* 8852B with UART interface */
@@ -255,7 +255,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" },
 
        /* 8852B */
@@ -263,7 +263,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" },
 
        /* 8852C */
@@ -271,7 +271,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" },
 
        /* 8851B */
@@ -279,7 +279,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" },
        };
 
@@ -967,6 +967,7 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
        struct btrtl_device_info *btrtl_dev;
        struct sk_buff *skb;
        struct hci_rp_read_local_version *resp;
+       char fw_name[40];
        char cfg_name[40];
        u16 hci_rev, lmp_subver;
        u8 hci_ver, lmp_ver, chip_type = 0;
@@ -1079,8 +1080,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);
@@ -1382,6 +1401,7 @@ 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");
 MODULE_FIRMWARE("rtl_bt/rtl8851bu_fw.bin");
 MODULE_FIRMWARE("rtl_bt/rtl8851bu_config.bin");