Patchwork [1/1] (pre-stable) Bluetooth: Fix HCI_RESET command synchonization

login
register
mail settings
Submitter Andy Whitcroft
Date April 17, 2011, 11:35 a.m.
Message ID <1303040104-1629-2-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/91553/
State New
Headers show

Comments

Andy Whitcroft - April 17, 2011, 11:35 a.m.
From: Gustavo F. Padovan <padovan@profusion.mobi>

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

Reported-by: Mikko Vinni <mmvinni@yahoo.com>
Reported-by: Justin P. Mattock <justinmattock@gmail.com>
Reported-by: Ed Tomlinson <edt@aei.ca>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Tested-by: Justin P. Mattock <justinmattock@gmail.com>
Tested-by: Mikko Vinni <mmvinni@yahoo.com>
Tested-by: Ed Tomlinson <edt@aei.ca>

backported from commit f630cf0d5434e3923e1b8226ffa2753ead6b0ce5 upstream
[Justin P. Mattock: backported to stable. did not have the time to
compile test this, but patch applies.]
[apw@canonical.com: fixed up missing close brace.]
BugLink: http://bugs.launchpad.net/bugs/700292
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 include/net/bluetooth/hci.h |    1 +
 net/bluetooth/hci_core.c    |    5 ++++-
 net/bluetooth/hci_event.c   |    4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)
Tim Gardner - April 17, 2011, 6:51 p.m.
On 04/17/2011 05:35 AM, Andy Whitcroft wrote:
> From: Gustavo F. Padovan<padovan@profusion.mobi>
>
> We can't send new commands before a cmd_complete for the HCI_RESET command
> shows up.
>
> Reported-by: Mikko Vinni<mmvinni@yahoo.com>
> Reported-by: Justin P. Mattock<justinmattock@gmail.com>
> Reported-by: Ed Tomlinson<edt@aei.ca>
> Signed-off-by: Gustavo F. Padovan<padovan@profusion.mobi>
> Tested-by: Justin P. Mattock<justinmattock@gmail.com>
> Tested-by: Mikko Vinni<mmvinni@yahoo.com>
> Tested-by: Ed Tomlinson<edt@aei.ca>
>
> backported from commit f630cf0d5434e3923e1b8226ffa2753ead6b0ce5 upstream
> [Justin P. Mattock: backported to stable. did not have the time to
> compile test this, but patch applies.]
> [apw@canonical.com: fixed up missing close brace.]
> BugLink: http://bugs.launchpad.net/bugs/700292
> Signed-off-by: Andy Whitcroft<apw@canonical.com>
> ---
>   include/net/bluetooth/hci.h |    1 +
>   net/bluetooth/hci_core.c    |    5 ++++-
>   net/bluetooth/hci_event.c   |    4 +++-
>   3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> index 29a7a8c..845ab1d 100644
> --- a/include/net/bluetooth/hci.h
> +++ b/include/net/bluetooth/hci.h
> @@ -74,6 +74,7 @@ enum {
>   	HCI_AUTH,
>   	HCI_ENCRYPT,
>   	HCI_INQUIRY,
> +	HCI_RESET,
>
>   	HCI_RAW,
>   };
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index 9c4541b..fa8212b 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -184,6 +184,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);
>   }
>
> @@ -210,8 +211,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);
> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> index a290854..d2a0bf0 100644
> --- a/net/bluetooth/hci_event.c
> +++ b/net/bluetooth/hci_event.c
> @@ -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);
>   }
>
> @@ -1398,7 +1400,7 @@ static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *sk
>   		break;
>   	}
>
> -	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);

Acked-by: Tim Gardner <tim.gardner@canonical.com>
Brad Figg - April 17, 2011, 8:17 p.m.
On 04/17/2011 04:35 AM, Andy Whitcroft wrote:
> From: Gustavo F. Padovan<padovan@profusion.mobi>
>
> We can't send new commands before a cmd_complete for the HCI_RESET command
> shows up.
>
> Reported-by: Mikko Vinni<mmvinni@yahoo.com>
> Reported-by: Justin P. Mattock<justinmattock@gmail.com>
> Reported-by: Ed Tomlinson<edt@aei.ca>
> Signed-off-by: Gustavo F. Padovan<padovan@profusion.mobi>
> Tested-by: Justin P. Mattock<justinmattock@gmail.com>
> Tested-by: Mikko Vinni<mmvinni@yahoo.com>
> Tested-by: Ed Tomlinson<edt@aei.ca>
>
> backported from commit f630cf0d5434e3923e1b8226ffa2753ead6b0ce5 upstream
> [Justin P. Mattock: backported to stable. did not have the time to
> compile test this, but patch applies.]
> [apw@canonical.com: fixed up missing close brace.]
> BugLink: http://bugs.launchpad.net/bugs/700292
> Signed-off-by: Andy Whitcroft<apw@canonical.com>
> ---
>   include/net/bluetooth/hci.h |    1 +
>   net/bluetooth/hci_core.c    |    5 ++++-
>   net/bluetooth/hci_event.c   |    4 +++-
>   3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> index 29a7a8c..845ab1d 100644
> --- a/include/net/bluetooth/hci.h
> +++ b/include/net/bluetooth/hci.h
> @@ -74,6 +74,7 @@ enum {
>   	HCI_AUTH,
>   	HCI_ENCRYPT,
>   	HCI_INQUIRY,
> +	HCI_RESET,
>
>   	HCI_RAW,
>   };
> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
> index 9c4541b..fa8212b 100644
> --- a/net/bluetooth/hci_core.c
> +++ b/net/bluetooth/hci_core.c
> @@ -184,6 +184,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);
>   }
>
> @@ -210,8 +211,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);
> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> index a290854..d2a0bf0 100644
> --- a/net/bluetooth/hci_event.c
> +++ b/net/bluetooth/hci_event.c
> @@ -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);
>   }
>
> @@ -1398,7 +1400,7 @@ static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *sk
>   		break;
>   	}
>
> -	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);

Acked-by: Brad Figg <brad.figg@canonical.com>

Patch

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 29a7a8c..845ab1d 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -74,6 +74,7 @@  enum {
 	HCI_AUTH,
 	HCI_ENCRYPT,
 	HCI_INQUIRY,
+	HCI_RESET,
 
 	HCI_RAW,
 };
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 9c4541b..fa8212b 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -184,6 +184,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);
 }
 
@@ -210,8 +211,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);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index a290854..d2a0bf0 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -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);
 }
 
@@ -1398,7 +1400,7 @@  static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *sk
 		break;
 	}
 
-	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);