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

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



Johan Hedberg says:

====================
pull request: bluetooth 2019-08-17

Here's a set of Bluetooth fixes for the 5.3-rc series:

 - Multiple fixes for Qualcomm (btqca & hci_qca) drivers
 - Minimum encryption key size debugfs setting (this is required for
   Bluetooth Qualification)
 - Fix hidp_send_message() to have a meaningful return value
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 71204231 58a96fc3

drivers/bluetooth/btqca.c

+27 −2
Original line number Diff line number Diff line
@@ -99,6 +99,27 @@ static int qca_send_reset(struct hci_dev *hdev) 
	return 0;

}



int qca_send_pre_shutdown_cmd(struct hci_dev *hdev)

{

	struct sk_buff *skb;

	int err;



	bt_dev_dbg(hdev, "QCA pre shutdown cmd");



	skb = __hci_cmd_sync(hdev, QCA_PRE_SHUTDOWN_CMD, 0,

				NULL, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		bt_dev_err(hdev, "QCA preshutdown_cmd failed (%d)", err);

		return err;

	}



	kfree_skb(skb);



	return 0;

}

EXPORT_SYMBOL_GPL(qca_send_pre_shutdown_cmd);



static void qca_tlv_check_data(struct rome_config *config,

				const struct firmware *fw)

{
@@ -119,6 +140,7 @@ static void qca_tlv_check_data(struct rome_config *config, 
	BT_DBG("Length\t\t : %d bytes", length);



	config->dnld_mode = ROME_SKIP_EVT_NONE;

	config->dnld_type = ROME_SKIP_EVT_NONE;



	switch (config->type) {

	case TLV_TYPE_PATCH:
@@ -268,7 +290,7 @@ static int qca_inject_cmd_complete_event(struct hci_dev *hdev) 


	evt = skb_put(skb, sizeof(*evt));

	evt->ncmd = 1;

	evt->opcode = QCA_HCI_CC_OPCODE;

	evt->opcode = cpu_to_le16(QCA_HCI_CC_OPCODE);



	skb_put_u8(skb, QCA_HCI_CC_SUCCESS);
@@ -323,7 +345,7 @@ static int qca_download_firmware(struct hci_dev *hdev, 
	 */

	if (config->dnld_type == ROME_SKIP_EVT_VSE_CC ||

	    config->dnld_type == ROME_SKIP_EVT_VSE)

		return qca_inject_cmd_complete_event(hdev);

		ret = qca_inject_cmd_complete_event(hdev);



out:

	release_firmware(fw);
@@ -388,6 +410,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		return err;

	}



	/* Give the controller some time to get ready to receive the NVM */

	msleep(10);



	/* Download NVM configuration */

	config.type = TLV_TYPE_NVM;

	if (firmware_name)

drivers/bluetooth/btqca.h

+7 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#define EDL_PATCH_TLV_REQ_CMD		(0x1E)

#define EDL_NVM_ACCESS_SET_REQ_CMD	(0x01)

#define MAX_SIZE_PER_TLV_SEGMENT	(243)

#define QCA_PRE_SHUTDOWN_CMD		(0xFC08)



#define EDL_CMD_REQ_RES_EVT		(0x00)

#define EDL_PATCH_VER_RES_EVT		(0x19)
@@ -135,6 +136,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		   const char *firmware_name);

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

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;
@@ -167,4 +169,9 @@ static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type) 
{

	return false;

}



static inline int qca_send_pre_shutdown_cmd(struct hci_dev *hdev)

{

	return -EOPNOTSUPP;

}

#endif

drivers/bluetooth/btusb.c

+3 −1
Original line number Diff line number Diff line
@@ -2762,8 +2762,10 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) 
	fw_size = fw->size;



	/* The size of patch header is 30 bytes, should be skip */

	if (fw_size < 30)

	if (fw_size < 30) {

		err = -EINVAL;

		goto err_release_fw;

	}



	fw_size -= 30;

	fw_ptr += 30;

drivers/bluetooth/hci_qca.c

+6 −3
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static void device_want_to_sleep(struct hci_uart *hu) 
	unsigned long flags;

	struct qca_data *qca = hu->priv;



	BT_DBG("hu %p want to sleep", hu);

	BT_DBG("hu %p want to sleep in %d state", hu, qca->rx_ibs_state);



	spin_lock_irqsave(&qca->hci_ibs_lock, flags);
@@ -720,7 +720,7 @@ static void device_want_to_sleep(struct hci_uart *hu) 
		break;



	case HCI_IBS_RX_ASLEEP:

		/* Fall through */

		break;



	default:

		/* Any other state is illegal */
@@ -912,7 +912,7 @@ static int qca_recv_event(struct hci_dev *hdev, struct sk_buff *skb) 
		if (hdr->evt == HCI_EV_VENDOR)

			complete(&qca->drop_ev_comp);



		kfree(skb);

		kfree_skb(skb);



		return 0;

	}
@@ -1386,6 +1386,9 @@ static int qca_power_off(struct hci_dev *hdev) 
{

	struct hci_uart *hu = hci_get_drvdata(hdev);



	/* Perform pre shutdown command */

	qca_send_pre_shutdown_cmd(hdev);



	qca_power_shutdown(hu);

	return 0;

}

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ struct hci_dev { 
	__u16		conn_info_min_age;

	__u16		conn_info_max_age;

	__u16		auth_payload_timeout;

	__u8		min_enc_key_size;

	__u8		ssp_debug_mode;

	__u8		hw_error_code;

	__u32		clock;

CRA Git | Maintained and supported by SUSTech CRA and CCSE