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

Merge branch 'for-upstream' of... 

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



Johan Hedberg says:

====================
pull request: linux-bluetooth 2019-11-11

Here's one more bluetooth-next pull request for the 5.5 kernel release.

 - Several fixes for LE advertising
 - Added PM support to hci_qca driver
 - Added support for WCN3991 SoC in hci_qca driver
 - Added DT bindings for BCM43540 module
 - A few other small cleanups/fixes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e0580b50 7d250a06

Documentation/devicetree/bindings/net/broadcom-bluetooth.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Required properties: 
   * "brcm,bcm4330-bt"

   * "brcm,bcm43438-bt"

   * "brcm,bcm4345c5"

   * "brcm,bcm43540-bt"



Optional properties:

drivers/bluetooth/btmtksdio.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static const struct sdio_device_id btmtksdio_table[] = { 
	 .driver_data = (kernel_ulong_t)&mt7668_data },

	{ }	/* Terminating entry */

};

MODULE_DEVICE_TABLE(sdio, btmtksdio_table);



#define MTK_REG_CHLPCR		0x4	/* W1S */

#define C_INT_EN_SET		BIT(0)

drivers/bluetooth/btqca.c

+65 −27
Original line number Diff line number Diff line
@@ -14,19 +14,33 @@ 


#define VERSION "0.1"



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

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

			 enum qca_btsoc_type soc_type)

{

	struct sk_buff *skb;

	struct edl_event_hdr *edl;

	struct rome_version *ver;

	struct qca_btsoc_version *ver;

	char cmd;

	int err = 0;

	u8 event_type = HCI_EV_VENDOR;

	u8 rlen = sizeof(*edl) + sizeof(*ver);

	u8 rtype = EDL_APP_VER_RES_EVT;



	bt_dev_dbg(hdev, "QCA Version Request");



	/* Unlike other SoC's sending version command response as payload to

	 * VSE event. WCN3991 sends version command response as a payload to

	 * command complete event.

	 */

	if (soc_type == QCA_WCN3991) {

		event_type = 0;

		rlen += 1;

		rtype = EDL_PATCH_VER_REQ_CMD;

	}



	cmd = EDL_PATCH_VER_REQ_CMD;

	skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, EDL_PATCH_CMD_LEN,

				&cmd, HCI_EV_VENDOR, HCI_INIT_TIMEOUT);

				&cmd, event_type, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "Reading QCA version information failed (%d)",
@@ -34,7 +48,7 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version) 
		return err;

	}



	if (skb->len != sizeof(*edl) + sizeof(*ver)) {

	if (skb->len != rlen) {

		bt_dev_err(hdev, "QCA Version size mismatch len %d", skb->len);

		err = -EILSEQ;

		goto out;
@@ -48,18 +62,21 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version) 
	}



	if (edl->cresp != EDL_CMD_REQ_RES_EVT ||

	    edl->rtype != EDL_APP_VER_RES_EVT) {

	    edl->rtype != rtype) {

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

			   edl->rtype);

		err = -EIO;

		goto out;

	}



	ver = (struct rome_version *)(edl->data);

	if (soc_type == QCA_WCN3991)

		memmove(&edl->data, &edl->data[1], sizeof(*ver));



	ver = (struct qca_btsoc_version *)(edl->data);



	BT_DBG("%s: Product:0x%08x", hdev->name, le32_to_cpu(ver->product_id));

	BT_DBG("%s: Patch  :0x%08x", hdev->name, le16_to_cpu(ver->patch_ver));

	BT_DBG("%s: ROM    :0x%08x", hdev->name, le16_to_cpu(ver->rome_ver));

	BT_DBG("%s: ROM    :0x%08x", hdev->name, le16_to_cpu(ver->rom_ver));

	BT_DBG("%s: SOC    :0x%08x", hdev->name, le32_to_cpu(ver->soc_id));



	/* QCA chipset version can be decided by patch and SoC
@@ -67,7 +84,7 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version) 
	 * and lower 2 bytes from patch will be used.

	 */

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

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

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

	if (*soc_version == 0)

		err = -EILSEQ;
@@ -121,7 +138,7 @@ int qca_send_pre_shutdown_cmd(struct hci_dev *hdev) 
}

EXPORT_SYMBOL_GPL(qca_send_pre_shutdown_cmd);



static void qca_tlv_check_data(struct rome_config *config,

static void qca_tlv_check_data(struct qca_fw_config *config,

				const struct firmware *fw)

{

	const u8 *data;
@@ -140,8 +157,8 @@ static void qca_tlv_check_data(struct rome_config *config, 
	BT_DBG("TLV Type\t\t : 0x%x", type_len & 0x000000ff);

	BT_DBG("Length\t\t : %d bytes", length);



	config->dnld_mode = ROME_SKIP_EVT_NONE;

	config->dnld_type = ROME_SKIP_EVT_NONE;

	config->dnld_mode = QCA_SKIP_EVT_NONE;

	config->dnld_type = QCA_SKIP_EVT_NONE;



	switch (config->type) {

	case TLV_TYPE_PATCH:
@@ -223,31 +240,45 @@ static void qca_tlv_check_data(struct rome_config *config, 
}



static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size,

				 const u8 *data, enum rome_tlv_dnld_mode mode)

				const u8 *data, enum qca_tlv_dnld_mode mode,

				enum qca_btsoc_type soc_type)

{

	struct sk_buff *skb;

	struct edl_event_hdr *edl;

	struct tlv_seg_resp *tlv_resp;

	u8 cmd[MAX_SIZE_PER_TLV_SEGMENT + 2];

	int err = 0;

	u8 event_type = HCI_EV_VENDOR;

	u8 rlen = (sizeof(*edl) + sizeof(*tlv_resp));

	u8 rtype = EDL_TVL_DNLD_RES_EVT;



	cmd[0] = EDL_PATCH_TLV_REQ_CMD;

	cmd[1] = seg_size;

	memcpy(cmd + 2, data, seg_size);



	if (mode == ROME_SKIP_EVT_VSE_CC || mode == ROME_SKIP_EVT_VSE)

	if (mode == QCA_SKIP_EVT_VSE_CC || mode == QCA_SKIP_EVT_VSE)

		return __hci_cmd_send(hdev, EDL_PATCH_CMD_OPCODE, seg_size + 2,

				      cmd);



	/* Unlike other SoC's sending version command response as payload to

	 * VSE event. WCN3991 sends version command response as a payload to

	 * command complete event.

	 */

	if (soc_type == QCA_WCN3991) {

		event_type = 0;

		rlen = sizeof(*edl);

		rtype = EDL_PATCH_TLV_REQ_CMD;

	}



	skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, seg_size + 2, cmd,

				HCI_EV_VENDOR, HCI_INIT_TIMEOUT);

				event_type, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "QCA Failed to send TLV segment (%d)", err);

		return err;

	}



	if (skb->len != sizeof(*edl) + sizeof(*tlv_resp)) {

	if (skb->len != rlen) {

		bt_dev_err(hdev, "QCA TLV response size mismatch");

		err = -EILSEQ;

		goto out;
@@ -260,13 +291,19 @@ static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size, 
		goto out;

	}



	tlv_resp = (struct tlv_seg_resp *)(edl->data);

	if (edl->cresp != EDL_CMD_REQ_RES_EVT || edl->rtype != rtype) {

		bt_dev_err(hdev, "QCA TLV with error stat 0x%x rtype 0x%x",

			   edl->cresp, edl->rtype);

		err = -EIO;

	}



	if (edl->cresp != EDL_CMD_REQ_RES_EVT ||

	    edl->rtype != EDL_TVL_DNLD_RES_EVT || tlv_resp->result != 0x00) {

	if (soc_type == QCA_WCN3991)

		goto out;



	tlv_resp = (struct tlv_seg_resp *)(edl->data);

	if (tlv_resp->result) {

		bt_dev_err(hdev, "QCA TLV with error stat 0x%x rtype 0x%x (0x%x)",

			   edl->cresp, edl->rtype, tlv_resp->result);

		err = -EIO;

	}



out:
@@ -301,7 +338,8 @@ static int qca_inject_cmd_complete_event(struct hci_dev *hdev) 
}



static int qca_download_firmware(struct hci_dev *hdev,

				  struct rome_config *config)

				 struct qca_fw_config *config,

				 enum qca_btsoc_type soc_type)

{

	const struct firmware *fw;

	const u8 *segment;
@@ -328,10 +366,10 @@ static int qca_download_firmware(struct hci_dev *hdev, 
		remain -= segsize;

		/* The last segment is always acked regardless download mode */

		if (!remain || segsize < MAX_SIZE_PER_TLV_SEGMENT)

			config->dnld_mode = ROME_SKIP_EVT_NONE;

			config->dnld_mode = QCA_SKIP_EVT_NONE;



		ret = qca_tlv_send_segment(hdev, segsize, segment,

					    config->dnld_mode);

					   config->dnld_mode, soc_type);

		if (ret)

			goto out;
@@ -344,8 +382,8 @@ static int qca_download_firmware(struct hci_dev *hdev, 
	 * decrease the BT in initialization time. Here we will inject a command

	 * complete event to avoid a command timeout error message.

	 */

	if (config->dnld_type == ROME_SKIP_EVT_VSE_CC ||

	    config->dnld_type == ROME_SKIP_EVT_VSE)

	if (config->dnld_type == QCA_SKIP_EVT_VSE_CC ||

	    config->dnld_type == QCA_SKIP_EVT_VSE)

		ret = qca_inject_cmd_complete_event(hdev);



out:
@@ -382,7 +420,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		   enum qca_btsoc_type soc_type, u32 soc_ver,

		   const char *firmware_name)

{

	struct rome_config config;

	struct qca_fw_config config;

	int err;

	u8 rom_ver = 0;
@@ -405,7 +443,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
			 "qca/rampatch_%08x.bin", soc_ver);

	}



	err = qca_download_firmware(hdev, &config);

	err = qca_download_firmware(hdev, &config, soc_type);

	if (err < 0) {

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

		return err;
@@ -426,7 +464,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/nvm_%08x.bin", soc_ver);



	err = qca_download_firmware(hdev, &config);

	err = qca_download_firmware(hdev, &config, soc_type);

	if (err < 0) {

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

		return err;

drivers/bluetooth/btqca.h

+18 −14
Original line number Diff line number Diff line
@@ -56,24 +56,24 @@ enum qca_baudrate { 
	QCA_BAUDRATE_RESERVED

};



enum rome_tlv_dnld_mode {

	ROME_SKIP_EVT_NONE,

	ROME_SKIP_EVT_VSE,

	ROME_SKIP_EVT_CC,

	ROME_SKIP_EVT_VSE_CC

enum qca_tlv_dnld_mode {

	QCA_SKIP_EVT_NONE,

	QCA_SKIP_EVT_VSE,

	QCA_SKIP_EVT_CC,

	QCA_SKIP_EVT_VSE_CC

};



enum rome_tlv_type {

enum qca_tlv_type {

	TLV_TYPE_PATCH = 1,

	TLV_TYPE_NVM

};



struct rome_config {

struct qca_fw_config {

	u8 type;

	char fwname[64];

	uint8_t user_baud_rate;

	enum rome_tlv_dnld_mode dnld_mode;

	enum rome_tlv_dnld_mode dnld_type;

	enum qca_tlv_dnld_mode dnld_mode;

	enum qca_tlv_dnld_mode dnld_type;

};



struct edl_event_hdr {
@@ -82,10 +82,10 @@ struct edl_event_hdr { 
	__u8 data[0];

} __packed;



struct rome_version {

struct qca_btsoc_version {

	__le32 product_id;

	__le16 patch_ver;

	__le16 rome_ver;

	__le16 rom_ver;

	__le32 soc_id;

} __packed;
@@ -125,6 +125,7 @@ enum qca_btsoc_type { 
	QCA_AR3002,

	QCA_ROME,

	QCA_WCN3990,

	QCA_WCN3991,

	QCA_WCN3998,

};
@@ -134,12 +135,14 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr); 
int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,

		   enum qca_btsoc_type soc_type, u32 soc_ver,

		   const char *firmware_name);

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

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

			 enum qca_btsoc_type);

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

int qca_send_pre_shutdown_cmd(struct hci_dev *hdev);

static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type)

{

	return soc_type == QCA_WCN3990 || soc_type == QCA_WCN3998;

	return soc_type == QCA_WCN3990 || soc_type == QCA_WCN3991 ||

	       soc_type == QCA_WCN3998;

}

#else
@@ -155,7 +158,8 @@ static inline int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
	return -EOPNOTSUPP;

}



static inline int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version)

static inline int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version,

				       enum qca_btsoc_type)

{

	return -EOPNOTSUPP;

}

drivers/bluetooth/btrtl.c

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ int btrtl_get_uart_settings(struct hci_dev *hdev, 
			rtl_dev_dbg(hdev, "skipping config entry 0x%x (len %u)",

				   le16_to_cpu(entry->offset), entry->len);

			break;

		};

		}



		i += sizeof(*entry) + entry->len;

	}