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

Commit f630cf0d authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: Fix HCI_RESET command synchronization 



We can't send new commands before a cmd_complete for the HCI_RESET command
shows up.

Reported-by: default avatarMikko Vinni <mmvinni@yahoo.com>
Reported-by: default avatarJustin P. Mattock <justinmattock@gmail.com>
Reported-by: default avatarEd Tomlinson <edt@aei.ca>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Tested-by: default avatarJustin P. Mattock <justinmattock@gmail.com>
Tested-by: default avatarMikko Vinni <mmvinni@yahoo.com>
Tested-by: default avatarEd Tomlinson <edt@aei.ca>
parent 52cb1c0d

include/net/bluetooth/hci.h

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ enum { 
	HCI_SERVICE_CACHE,

	HCI_LINK_KEYS,

	HCI_DEBUG_KEYS,



	HCI_RESET,

};



/* HCI ioctl defines */

net/bluetooth/hci_core.c

+5 −1
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ static void hci_reset_req(struct hci_dev *hdev, unsigned long opt) 
	BT_DBG("%s %ld", hdev->name, opt);



	/* Reset device */

	set_bit(HCI_RESET, &hdev->flags);

	hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);

}
@@ -213,8 +214,10 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt) 
	/* Mandatory initialization */



	/* Reset */

	if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks))

	if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) {

			set_bit(HCI_RESET, &hdev->flags);

			hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);

	}



	/* Read Local Supported Features */

	hci_send_cmd(hdev, HCI_OP_READ_LOCAL_FEATURES, 0, NULL);
@@ -1074,6 +1077,7 @@ static void hci_cmd_timer(unsigned long arg) 


	BT_ERR("%s command tx timeout", hdev->name);

	atomic_set(&hdev->cmd_cnt, 1);

	clear_bit(HCI_RESET, &hdev->flags);

	tasklet_schedule(&hdev->cmd_task);

}

net/bluetooth/hci_event.c

+3 −1
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("%s status 0x%x", hdev->name, status);



	clear_bit(HCI_RESET, &hdev->flags);



	hci_req_complete(hdev, HCI_OP_RESET, status);

}
@@ -1847,7 +1849,7 @@ static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	if (ev->opcode != HCI_OP_NOP)

		del_timer(&hdev->cmd_timer);



	if (ev->ncmd) {

	if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) {

		atomic_set(&hdev->cmd_cnt, 1);

		if (!skb_queue_empty(&hdev->cmd_q))

			tasklet_schedule(&hdev->cmd_task);