Commit 0ae20159 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kern 


el/git/bluetooth/bluetooth-next

Johan Hedberg says:

====================
pull request: bluetooth-next 2021-02-11

Here's the main bluetooth-next pull request for 5.12:

 - Add support for advertising monitor offliading using Microsoft
   vendor extensions
 - Add firmware download support for MediaTek MT7921U USB devices
 - Suspend-related fixes for Qualcomm devices
 - Add support for Intel GarfieldPeak controller
 - Various other smaller fixes & cleanups

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1d131151 55c0bd77

Documentation/devicetree/bindings/net/btusb.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ Following example uses irq pin number 3 of gpio0 for out of band wake-on-bt: 
	compatible = "usb1286,204e";

	reg = <1>;

	interrupt-parent = <&gpio0>;

	interrupt-name = "wakeup";

	interrupt-names = "wakeup";

	interrupts = <3 IRQ_TYPE_LEVEL_LOW>;

    };

};

drivers/bluetooth/btintel.c

+7 −14
Original line number Diff line number Diff line
@@ -437,38 +437,31 @@ int btintel_read_version_tlv(struct hci_dev *hdev, struct intel_version_tlv *ver 
		tlv = (struct intel_tlv *)skb->data;

		switch (tlv->type) {

		case INTEL_TLV_CNVI_TOP:

			version->cnvi_top =

				__le32_to_cpu(get_unaligned_le32(tlv->val));

			version->cnvi_top = get_unaligned_le32(tlv->val);

			break;

		case INTEL_TLV_CNVR_TOP:

			version->cnvr_top =

				__le32_to_cpu(get_unaligned_le32(tlv->val));

			version->cnvr_top = get_unaligned_le32(tlv->val);

			break;

		case INTEL_TLV_CNVI_BT:

			version->cnvi_bt =

				__le32_to_cpu(get_unaligned_le32(tlv->val));

			version->cnvi_bt = get_unaligned_le32(tlv->val);

			break;

		case INTEL_TLV_CNVR_BT:

			version->cnvr_bt =

				__le32_to_cpu(get_unaligned_le32(tlv->val));

			version->cnvr_bt = get_unaligned_le32(tlv->val);

			break;

		case INTEL_TLV_DEV_REV_ID:

			version->dev_rev_id =

				__le16_to_cpu(get_unaligned_le16(tlv->val));

			version->dev_rev_id = get_unaligned_le16(tlv->val);

			break;

		case INTEL_TLV_IMAGE_TYPE:

			version->img_type = tlv->val[0];

			break;

		case INTEL_TLV_TIME_STAMP:

			version->timestamp =

				__le16_to_cpu(get_unaligned_le16(tlv->val));

			version->timestamp = get_unaligned_le16(tlv->val);

			break;

		case INTEL_TLV_BUILD_TYPE:

			version->build_type = tlv->val[0];

			break;

		case INTEL_TLV_BUILD_NUM:

			version->build_num =

				__le32_to_cpu(get_unaligned_le32(tlv->val));

			version->build_num = get_unaligned_le32(tlv->val);

			break;

		case INTEL_TLV_SECURE_BOOT:

			version->secure_boot = tlv->val[0];

drivers/bluetooth/btqca.c

+67 −0
Original line number Diff line number Diff line
@@ -94,6 +94,53 @@ int qca_read_soc_version(struct hci_dev *hdev, struct qca_btsoc_version *ver, 
}

EXPORT_SYMBOL_GPL(qca_read_soc_version);



static int qca_read_fw_build_info(struct hci_dev *hdev)

{

	struct sk_buff *skb;

	struct edl_event_hdr *edl;

	char cmd, build_label[QCA_FW_BUILD_VER_LEN];

	int build_lbl_len, err = 0;



	bt_dev_dbg(hdev, "QCA read fw build info");



	cmd = EDL_GET_BUILD_INFO_CMD;

	skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, EDL_PATCH_CMD_LEN,

				&cmd, 0, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "Reading QCA fw build info failed (%d)",

			   err);

		return err;

	}



	edl = (struct edl_event_hdr *)(skb->data);

	if (!edl) {

		bt_dev_err(hdev, "QCA read fw build info with no header");

		err = -EILSEQ;

		goto out;

	}



	if (edl->cresp != EDL_CMD_REQ_RES_EVT ||

	    edl->rtype != EDL_GET_BUILD_INFO_CMD) {

		bt_dev_err(hdev, "QCA Wrong packet received %d %d", edl->cresp,

			   edl->rtype);

		err = -EIO;

		goto out;

	}



	build_lbl_len = edl->data[0];

	if (build_lbl_len <= QCA_FW_BUILD_VER_LEN - 1) {

		memcpy(build_label, edl->data + 1, build_lbl_len);

		*(build_label + build_lbl_len) = '\0';

	}



	hci_set_fw_info(hdev, "%s", build_label);



out:

	kfree_skb(skb);

	return err;

}



static int qca_send_reset(struct hci_dev *hdev)

{

	struct sk_buff *skb;
@@ -517,6 +564,19 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
			return err;

	}



	/* WCN399x supports the Microsoft vendor extension with 0xFD70 as the

	 * VsMsftOpCode.

	 */

	switch (soc_type) {

	case QCA_WCN3990:

	case QCA_WCN3991:

	case QCA_WCN3998:

		hci_set_msft_opcode(hdev, 0xFD70);

		break;

	default:

		break;

	}



	/* Perform HCI reset */

	err = qca_send_reset(hdev);

	if (err < 0) {
@@ -524,6 +584,13 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		return err;

	}



	if (soc_type == QCA_WCN3991) {

		/* get fw build info */

		err = qca_read_fw_build_info(hdev);

		if (err < 0)

			return err;

	}



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



	return 0;

drivers/bluetooth/btqca.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define EDL_PATCH_CMD_LEN		(1)

#define EDL_PATCH_VER_REQ_CMD		(0x19)

#define EDL_PATCH_TLV_REQ_CMD		(0x1E)

#define EDL_GET_BUILD_INFO_CMD		(0x20)

#define EDL_NVM_ACCESS_SET_REQ_CMD	(0x01)

#define MAX_SIZE_PER_TLV_SEGMENT	(243)

#define QCA_PRE_SHUTDOWN_CMD		(0xFC08)

drivers/bluetooth/btqcomsmd.c

+19 −8
Original line number Diff line number Diff line
@@ -142,12 +142,16 @@ static int btqcomsmd_probe(struct platform_device *pdev) 


	btq->cmd_channel = qcom_wcnss_open_channel(wcnss, "APPS_RIVA_BT_CMD",

						   btqcomsmd_cmd_callback, btq);

	if (IS_ERR(btq->cmd_channel))

		return PTR_ERR(btq->cmd_channel);

	if (IS_ERR(btq->cmd_channel)) {

		ret = PTR_ERR(btq->cmd_channel);

		goto destroy_acl_channel;

	}



	hdev = hci_alloc_dev();

	if (!hdev)

		return -ENOMEM;

	if (!hdev) {

		ret = -ENOMEM;

		goto destroy_cmd_channel;

	}



	hci_set_drvdata(hdev, btq);

	btq->hdev = hdev;
@@ -161,14 +165,21 @@ static int btqcomsmd_probe(struct platform_device *pdev) 
	hdev->set_bdaddr = qca_set_bdaddr_rome;



	ret = hci_register_dev(hdev);

	if (ret < 0) {

		hci_free_dev(hdev);

		return ret;

	}

	if (ret < 0)

		goto hci_free_dev;



	platform_set_drvdata(pdev, btq);



	return 0;



hci_free_dev:

	hci_free_dev(hdev);

destroy_cmd_channel:

	rpmsg_destroy_ept(btq->cmd_channel);

destroy_acl_channel:

	rpmsg_destroy_ept(btq->acl_channel);



	return ret;

}



static int btqcomsmd_remove(struct platform_device *pdev)