Commit 095327fe authored by Steev Klimaszewski's avatar Steev Klimaszewski Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: hci_qca: Add support for QTI Bluetooth chip wcn6855 



Add regulators, GPIOs and changes required to power on/off wcn6855.
Add support for firmware download for wcn6855 which is in the
linux-firmware repository as hpbtfw21.tlv and hpnv21.bin.

Based on the assumption that this is similar to the wcn6750

Tested-on: BTFW.HSP.2.1.0-00538-VER_PATCHZ-1

Signed-off-by: default avatarSteev Klimaszewski <steev@kali.org>
Reviewed-by: default avatarBjorn Andersson <andersson@kernel.org>
Tested-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent b1d00baa

drivers/bluetooth/btqca.c

+13 −1
Original line number Diff line number Diff line
@@ -614,6 +614,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		config.type = ELF_TYPE_PATCH;

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/msbtfw%02x.mbn", rom_ver);

	} else if (soc_type == QCA_WCN6855) {

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/hpbtfw%02x.tlv", rom_ver);

	} else {

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/rampatch_%08x.bin", soc_ver);
@@ -648,6 +651,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
	else if (soc_type == QCA_WCN6750)

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/msnv%02x.bin", rom_ver);

	else if (soc_type == QCA_WCN6855)

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/hpnv%02x.bin", rom_ver);

	else

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/nvm_%08x.bin", soc_ver);
@@ -685,11 +691,17 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		return err;

	}



	if (soc_type == QCA_WCN3991 || soc_type == QCA_WCN6750) {

	switch (soc_type) {

	case QCA_WCN3991:

	case QCA_WCN6750:

	case QCA_WCN6855:

		/* get fw build info */

		err = qca_read_fw_build_info(hdev);

		if (err < 0)

			return err;

		break;

	default:

		break;

	}



	bt_dev_info(hdev, "QCA setup on UART is completed");

drivers/bluetooth/btqca.h

+10 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ enum qca_btsoc_type { 
	QCA_WCN3991,

	QCA_QCA6390,

	QCA_WCN6750,

	QCA_WCN6855,

};



#if IS_ENABLED(CONFIG_BT_QCA)
@@ -168,6 +169,10 @@ static inline bool qca_is_wcn6750(enum qca_btsoc_type soc_type) 
{

	return soc_type == QCA_WCN6750;

}

static inline bool qca_is_wcn6855(enum qca_btsoc_type soc_type)

{

	return soc_type == QCA_WCN6855;

}



#else
@@ -206,6 +211,11 @@ static inline bool qca_is_wcn6750(enum qca_btsoc_type soc_type) 
	return false;

}



static inline bool qca_is_wcn6855(enum qca_btsoc_type soc_type)

{

	return false;

}



static inline int qca_send_pre_shutdown_cmd(struct hci_dev *hdev)

{

	return -EOPNOTSUPP;

drivers/bluetooth/hci_qca.c

+43 −14
Original line number Diff line number Diff line
@@ -1317,7 +1317,8 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate) 


	/* Give the controller time to process the request */

	if (qca_is_wcn399x(qca_soc_type(hu)) ||

	    qca_is_wcn6750(qca_soc_type(hu)))

	    qca_is_wcn6750(qca_soc_type(hu)) ||

	    qca_is_wcn6855(qca_soc_type(hu)))

		usleep_range(1000, 10000);

	else

		msleep(300);
@@ -1394,7 +1395,8 @@ static unsigned int qca_get_speed(struct hci_uart *hu, 
static int qca_check_speeds(struct hci_uart *hu)

{

	if (qca_is_wcn399x(qca_soc_type(hu)) ||

	    qca_is_wcn6750(qca_soc_type(hu))) {

	    qca_is_wcn6750(qca_soc_type(hu)) ||

	    qca_is_wcn6855(qca_soc_type(hu))) {

		if (!qca_get_speed(hu, QCA_INIT_SPEED) &&

		    !qca_get_speed(hu, QCA_OPER_SPEED))

			return -EINVAL;
@@ -1428,7 +1430,8 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type) 
		 * changing the baudrate of chip and host.

		 */

		if (qca_is_wcn399x(soc_type) ||

		    qca_is_wcn6750(soc_type))

		    qca_is_wcn6750(soc_type) ||

		    qca_is_wcn6855(soc_type))

			hci_uart_set_flow_control(hu, true);



		if (soc_type == QCA_WCN3990) {
@@ -1446,7 +1449,8 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type) 


error:

		if (qca_is_wcn399x(soc_type) ||

		    qca_is_wcn6750(soc_type))

		    qca_is_wcn6750(soc_type) ||

		    qca_is_wcn6855(soc_type))

			hci_uart_set_flow_control(hu, false);



		if (soc_type == QCA_WCN3990) {
@@ -1682,7 +1686,8 @@ static int qca_power_on(struct hci_dev *hdev) 
		return 0;



	if (qca_is_wcn399x(soc_type) ||

	    qca_is_wcn6750(soc_type)) {

	    qca_is_wcn6750(soc_type) ||

	    qca_is_wcn6855(soc_type)) {

		ret = qca_regulator_init(hu);

	} else {

		qcadev = serdev_device_get_drvdata(hu->serdev);
@@ -1723,7 +1728,8 @@ static int qca_setup(struct hci_uart *hu) 


	bt_dev_info(hdev, "setting up %s",

		qca_is_wcn399x(soc_type) ? "wcn399x" :

		(soc_type == QCA_WCN6750) ? "wcn6750" : "ROME/QCA6390");

		(soc_type == QCA_WCN6750) ? "wcn6750" :

		(soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390");



	qca->memdump_state = QCA_MEMDUMP_IDLE;
@@ -1735,7 +1741,8 @@ static int qca_setup(struct hci_uart *hu) 
	clear_bit(QCA_SSR_TRIGGERED, &qca->flags);



	if (qca_is_wcn399x(soc_type) ||

	    qca_is_wcn6750(soc_type)) {

	    qca_is_wcn6750(soc_type) ||

	    qca_is_wcn6855(soc_type)) {

		set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);

		hci_set_aosp_capable(hdev);
@@ -1757,7 +1764,8 @@ static int qca_setup(struct hci_uart *hu) 
	}



	if (!(qca_is_wcn399x(soc_type) ||

	     qca_is_wcn6750(soc_type))) {

	      qca_is_wcn6750(soc_type) ||

	      qca_is_wcn6855(soc_type))) {

		/* Get QCA version information */

		ret = qca_read_soc_version(hdev, &ver, soc_type);

		if (ret)
@@ -1883,6 +1891,20 @@ static const struct qca_device_data qca_soc_data_wcn6750 __maybe_unused = { 
	.capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES,

};



static const struct qca_device_data qca_soc_data_wcn6855 = {

	.soc_type = QCA_WCN6855,

	.vregs = (struct qca_vreg []) {

		{ "vddio", 5000 },

		{ "vddbtcxmx", 126000 },

		{ "vddrfacmn", 12500 },

		{ "vddrfa0p8", 102000 },

		{ "vddrfa1p7", 302000 },

		{ "vddrfa1p2", 257000 },

	},

	.num_vregs = 6,

	.capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES,

};



static void qca_power_shutdown(struct hci_uart *hu)

{

	struct qca_serdev *qcadev;
@@ -1912,7 +1934,7 @@ static void qca_power_shutdown(struct hci_uart *hu) 
		host_set_baudrate(hu, 2400);

		qca_send_power_pulse(hu, false);

		qca_regulator_disable(qcadev);

	} else if (soc_type == QCA_WCN6750) {

	} else if (soc_type == QCA_WCN6750 || soc_type == QCA_WCN6855) {

		gpiod_set_value_cansleep(qcadev->bt_en, 0);

		msleep(100);

		qca_regulator_disable(qcadev);
@@ -2047,7 +2069,8 @@ static int qca_serdev_probe(struct serdev_device *serdev) 


	if (data &&

	    (qca_is_wcn399x(data->soc_type) ||

	    qca_is_wcn6750(data->soc_type))) {

	     qca_is_wcn6750(data->soc_type) ||

	     qca_is_wcn6855(data->soc_type))) {

		qcadev->btsoc_type = data->soc_type;

		qcadev->bt_power = devm_kzalloc(&serdev->dev,

						sizeof(struct qca_power),
@@ -2067,14 +2090,18 @@ static int qca_serdev_probe(struct serdev_device *serdev) 


		qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable",

					       GPIOD_OUT_LOW);

		if (IS_ERR_OR_NULL(qcadev->bt_en) && data->soc_type == QCA_WCN6750) {

		if (IS_ERR_OR_NULL(qcadev->bt_en) &&

		    (data->soc_type == QCA_WCN6750 ||

		     data->soc_type == QCA_WCN6855)) {

			dev_err(&serdev->dev, "failed to acquire BT_EN gpio\n");

			power_ctrl_enabled = false;

		}



		qcadev->sw_ctrl = devm_gpiod_get_optional(&serdev->dev, "swctrl",

					       GPIOD_IN);

		if (IS_ERR_OR_NULL(qcadev->sw_ctrl) && data->soc_type == QCA_WCN6750)

		if (IS_ERR_OR_NULL(qcadev->sw_ctrl) &&

		    (data->soc_type == QCA_WCN6750 ||

		     data->soc_type == QCA_WCN6855))

			dev_warn(&serdev->dev, "failed to acquire SW_CTRL gpio\n");



		qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL);
@@ -2150,7 +2177,8 @@ static void qca_serdev_remove(struct serdev_device *serdev) 
	struct qca_power *power = qcadev->bt_power;



	if ((qca_is_wcn399x(qcadev->btsoc_type) ||

	     qca_is_wcn6750(qcadev->btsoc_type)) &&

	     qca_is_wcn6750(qcadev->btsoc_type) ||

	     qca_is_wcn6855(qcadev->btsoc_type)) &&

	    power->vregs_on)

		qca_power_shutdown(&qcadev->serdev_hu);

	else if (qcadev->susclk)
@@ -2335,6 +2363,7 @@ static const struct of_device_id qca_bluetooth_of_match[] = { 
	{ .compatible = "qcom,wcn3991-bt", .data = &qca_soc_data_wcn3991},

	{ .compatible = "qcom,wcn3998-bt", .data = &qca_soc_data_wcn3998},

	{ .compatible = "qcom,wcn6750-bt", .data = &qca_soc_data_wcn6750},

	{ .compatible = "qcom,wcn6855-bt", .data = &qca_soc_data_wcn6855},

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);