Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cc194ca authored by Hans de Goede's avatar Hans de Goede Committed by Marcel Holtmann
Browse files

Bluetooth: btrtl: Add support for a config filename postfix 



The contents of the rtl_bt/rtlXXXX_config.bin file may be board specific
allow the caller of btrtl_initialize to specify a postfix identifying
the board, which if specified will make btrtl_initialize look for
rtl_bt/rtlXXXX_config-<postfix>.bin instead.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent c50903e3

drivers/bluetooth/btrtl.c

+20 −12
Original line number Diff line number Diff line
@@ -89,21 +89,21 @@ 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.bin" },

	  .cfg_name = "rtl_bt/rtl8723bs_config" },



	/* 8723B */

	{ IC_INFO(RTL_ROM_LMP_8723B, 0xb),

	  .config_needed = false,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8723b_fw.bin",

	  .cfg_name = "rtl_bt/rtl8723b_config.bin" },

	  .cfg_name = "rtl_bt/rtl8723b_config" },



	/* 8723D */

	{ IC_INFO(RTL_ROM_LMP_8723B, 0xd),

	  .config_needed = true,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8723d_fw.bin",

	  .cfg_name = "rtl_bt/rtl8723d_config.bin" },

	  .cfg_name = "rtl_bt/rtl8723d_config" },



	/* 8723DS */

	{ .match_flags = IC_MATCH_FL_LMPSUBV | IC_MATCH_FL_HCIREV |
@@ -115,35 +115,35 @@ static const struct id_table ic_id_table[] = { 
	  .config_needed = true,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8723ds_fw.bin",

	  .cfg_name = "rtl_bt/rtl8723ds_config.bin" },

	  .cfg_name = "rtl_bt/rtl8723ds_config" },



	/* 8821A */

	{ IC_INFO(RTL_ROM_LMP_8821A, 0xa),

	  .config_needed = false,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8821a_fw.bin",

	  .cfg_name = "rtl_bt/rtl8821a_config.bin" },

	  .cfg_name = "rtl_bt/rtl8821a_config" },



	/* 8821C */

	{ IC_INFO(RTL_ROM_LMP_8821A, 0xc),

	  .config_needed = false,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8821c_fw.bin",

	  .cfg_name = "rtl_bt/rtl8821c_config.bin" },

	  .cfg_name = "rtl_bt/rtl8821c_config" },



	/* 8761A */

	{ IC_MATCH_FL_LMPSUBV, RTL_ROM_LMP_8761A, 0x0,

	  .config_needed = false,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8761a_fw.bin",

	  .cfg_name = "rtl_bt/rtl8761a_config.bin" },

	  .cfg_name = "rtl_bt/rtl8761a_config" },



	/* 8822B */

	{ IC_INFO(RTL_ROM_LMP_8822B, 0xb),

	  .config_needed = true,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8822b_fw.bin",

	  .cfg_name = "rtl_bt/rtl8822b_config.bin" },

	  .cfg_name = "rtl_bt/rtl8822b_config" },

	};



static const struct id_table *btrtl_match_ic(u16 lmp_subver, u16 hci_rev,
@@ -507,11 +507,13 @@ void btrtl_free(struct btrtl_device_info *btrtl_dev) 
}

EXPORT_SYMBOL_GPL(btrtl_free);



struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev)

struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,

					   const char *postfix)

{

	struct btrtl_device_info *btrtl_dev;

	struct sk_buff *skb;

	struct hci_rp_read_local_version *resp;

	char cfg_name[40];

	u16 hci_rev, lmp_subver;

	u8 hci_ver;

	int ret;
@@ -564,8 +566,14 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev) 
	}



	if (btrtl_dev->ic_info->cfg_name) {

		btrtl_dev->cfg_len = rtl_load_file(hdev,

						   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",

				 btrtl_dev->ic_info->cfg_name);

		}

		btrtl_dev->cfg_len = rtl_load_file(hdev, cfg_name,

						   &btrtl_dev->cfg_data);

		if (btrtl_dev->ic_info->config_needed &&

		    btrtl_dev->cfg_len <= 0) {
@@ -615,7 +623,7 @@ int btrtl_setup_realtek(struct hci_dev *hdev) 
	struct btrtl_device_info *btrtl_dev;

	int ret;



	btrtl_dev = btrtl_initialize(hdev);

	btrtl_dev = btrtl_initialize(hdev, NULL);

	if (IS_ERR(btrtl_dev))

		return PTR_ERR(btrtl_dev);

drivers/bluetooth/btrtl.h

+4 −2
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ struct rtl_vendor_config { 


#if IS_ENABLED(CONFIG_BT_RTL)



struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev);

struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,

					   const char *postfix);

void btrtl_free(struct btrtl_device_info *btrtl_dev);

int btrtl_download_firmware(struct hci_dev *hdev,

			    struct btrtl_device_info *btrtl_dev);
@@ -71,7 +72,8 @@ int btrtl_get_uart_settings(struct hci_dev *hdev, 


#else



static inline struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev)

static inline struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,

							 const char *postfix)

{

	return ERR_PTR(-EOPNOTSUPP);

}