1 From 396e04f4bb9afefb0744715dc76d9abe18ee5fb0 Mon Sep 17 00:00:00 2001
2 From: Chin-Ran Lo <crlo@marvell.com>
3 Date: Tue, 1 Jul 2014 14:00:14 -0700
4 Subject: Bluetooth: btmrvl: wait for HOST_SLEEP_ENABLE event in suspend
6 From: Chin-Ran Lo <crlo@marvell.com>
8 commit 396e04f4bb9afefb0744715dc76d9abe18ee5fb0 upstream.
10 After BT_CMD_HOST_SLEEP_ENABLE command finishes, driver should
11 wait until getting BT_EVENT_HOST_SLEEP_ENABLE event to complete
13 Without this patch the suspend handler would return success
14 earlier. By the time when the BT_EVENT_HOST_SLEEP_ENABLE event
15 comes in the controller driver could have already turned off the
16 bus clock. This causes kernel crash or system reboot eventually.
18 Signed-off-by: Chin-Ran Lo <crlo@marvell.com>
19 Signed-off-by: Jeff CF Chen <jeffc@marvell.com>
20 Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
21 Signed-off-by: Bing Zhao <bzhao@marvell.com>
22 Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
23 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
26 drivers/bluetooth/btmrvl_drv.h | 1 +
27 drivers/bluetooth/btmrvl_main.c | 25 ++++++++++++++++++++++++-
28 2 files changed, 25 insertions(+), 1 deletion(-)
30 --- a/drivers/bluetooth/btmrvl_drv.h
31 +++ b/drivers/bluetooth/btmrvl_drv.h
32 @@ -68,6 +68,7 @@ struct btmrvl_adapter {
35 wait_queue_head_t cmd_wait_q;
36 + wait_queue_head_t event_hs_wait_q;
40 --- a/drivers/bluetooth/btmrvl_main.c
41 +++ b/drivers/bluetooth/btmrvl_main.c
42 @@ -114,6 +114,7 @@ int btmrvl_process_event(struct btmrvl_p
43 adapter->hs_state = HS_ACTIVATED;
45 adapter->ps_state = PS_SLEEP;
46 + wake_up_interruptible(&adapter->event_hs_wait_q);
47 BT_DBG("HS ACTIVATED!");
49 BT_DBG("HS Enable failed");
50 @@ -253,11 +254,31 @@ EXPORT_SYMBOL_GPL(btmrvl_enable_ps);
52 int btmrvl_enable_hs(struct btmrvl_private *priv)
54 + struct btmrvl_adapter *adapter = priv->adapter;
57 ret = btmrvl_send_sync_cmd(priv, BT_CMD_HOST_SLEEP_ENABLE, NULL, 0);
60 BT_ERR("Host sleep enable command failed\n");
64 + ret = wait_event_interruptible_timeout(adapter->event_hs_wait_q,
66 + msecs_to_jiffies(WAIT_UNTIL_HS_STATE_CHANGED));
68 + BT_ERR("event_hs_wait_q terminated (%d): %d,%d,%d",
69 + ret, adapter->hs_state, adapter->ps_state,
70 + adapter->wakeup_tries);
72 + BT_ERR("hs_enable timeout: %d,%d,%d", adapter->hs_state,
73 + adapter->ps_state, adapter->wakeup_tries);
76 + BT_DBG("host sleep enabled: %d,%d,%d", adapter->hs_state,
77 + adapter->ps_state, adapter->wakeup_tries);
83 @@ -358,6 +379,7 @@ static void btmrvl_init_adapter(struct b
86 init_waitqueue_head(&priv->adapter->cmd_wait_q);
87 + init_waitqueue_head(&priv->adapter->event_hs_wait_q);
90 static void btmrvl_free_adapter(struct btmrvl_private *priv)
91 @@ -666,6 +688,7 @@ int btmrvl_remove_card(struct btmrvl_pri
92 hdev = priv->btmrvl_dev.hcidev;
94 wake_up_interruptible(&priv->adapter->cmd_wait_q);
95 + wake_up_interruptible(&priv->adapter->event_hs_wait_q);
97 kthread_stop(priv->main_thread.task);