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

Commit aadebac4 authored by Balakrishna Godavarthi's avatar Balakrishna Godavarthi Committed by Marcel Holtmann
Browse files

Bluetooth: btqca: Redefine qca_uart_setup() to generic function. 



Redefinition of qca_uart_setup will help future Qualcomm Bluetooth
SoC, to use the same function instead of duplicating the function.
Added new arguments soc_type and soc_ver to the functions.

These arguments will help to decide type of firmware files
to be loaded into Bluetooth chip.
soc_type holds the Bluetooth chip connected to APPS processor.
soc_ver holds the Bluetooth chip version.

Signed-off-by: default avatarBalakrishna Godavarthi <bgodavar@codeaurora.org>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent ba493d4f

drivers/bluetooth/btqca.c

+8 −13
Original line number Diff line number Diff line
@@ -81,9 +81,13 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version) 
	 */

	*soc_version = (le32_to_cpu(ver->soc_id) << 16) |

			(le16_to_cpu(ver->rome_ver) & 0x0000ffff);

	if (*soc_version == 0)

		err = -EILSEQ;



out:

	kfree_skb(skb);

	if (err)

		bt_dev_err(hdev, "QCA Failed to get version (%d)", err);



	return err;

}
@@ -327,9 +331,9 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
}

EXPORT_SYMBOL_GPL(qca_set_bdaddr_rome);



int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate)

int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,

		   enum qca_btsoc_type soc_type, u32 soc_ver)

{

	u32 rome_ver = 0;

	struct rome_config config;

	int err;
@@ -337,19 +341,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate) 


	config.user_baud_rate = baudrate;



	/* Get QCA version information */

	err = qca_read_soc_version(hdev, &rome_ver);

	if (err < 0 || rome_ver == 0) {

		bt_dev_err(hdev, "QCA Failed to get version %d", err);

		return err;

	}



	bt_dev_info(hdev, "QCA controller version 0x%08x", rome_ver);



	/* Download rampatch file */

	config.type = TLV_TYPE_PATCH;

	snprintf(config.fwname, sizeof(config.fwname), "qca/rampatch_%08x.bin",

		 rome_ver);

		 soc_ver);

	err = qca_download_firmware(hdev, &config);

	if (err < 0) {

		bt_dev_err(hdev, "QCA Failed to download patch (%d)", err);
@@ -359,7 +354,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate) 
	/* Download NVM configuration */

	config.type = TLV_TYPE_NVM;

	snprintf(config.fwname, sizeof(config.fwname), "qca/nvm_%08x.bin",

		 rome_ver);

		 soc_ver);

	err = qca_download_firmware(hdev, &config);

	if (err < 0) {

		bt_dev_err(hdev, "QCA Failed to download NVM (%d)", err);

drivers/bluetooth/btqca.h

+11 −2
Original line number Diff line number Diff line
@@ -124,10 +124,18 @@ struct tlv_type_hdr { 
	__u8   data[0];

} __packed;



enum qca_btsoc_type {

	QCA_INVALID = -1,

	QCA_AR3002,

	QCA_ROME,

	QCA_WCN3990

};



#if IS_ENABLED(CONFIG_BT_QCA)



int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr);

int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate);

int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,

		   enum qca_btsoc_type soc_type, u32 soc_ver);

int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version);



#else
@@ -137,7 +145,8 @@ static inline int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdad 
	return -EOPNOTSUPP;

}



static inline int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate)

static inline int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,

				 enum qca_btsoc_type soc_type, u32 soc_ver)

{

	return -EOPNOTSUPP;

}

drivers/bluetooth/hci_qca.c

+9 −1
Original line number Diff line number Diff line
@@ -929,6 +929,7 @@ static int qca_setup(struct hci_uart *hu) 
	struct qca_data *qca = hu->priv;

	unsigned int speed, qca_baudrate = QCA_BAUDRATE_115200;

	int ret;

	int soc_ver = 0;



	bt_dev_info(hdev, "ROME setup");
@@ -965,8 +966,15 @@ static int qca_setup(struct hci_uart *hu) 
		host_set_baudrate(hu, speed);

	}



	/* Get QCA version information */

	ret = qca_read_soc_version(hdev, &soc_ver);

	if (ret)

		return ret;



	bt_dev_info(hdev, "QCA controller version 0x%08x", soc_ver);



	/* Setup patch / NVM configurations */

	ret = qca_uart_setup(hdev, qca_baudrate);

	ret = qca_uart_setup(hdev, qca_baudrate, QCA_ROME, soc_ver);

	if (!ret) {

		set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);

		qca_debugfs_init(hdev);