Commit f4198635 authored by Archie Pusaka's avatar Archie Pusaka Committed by Luiz Augusto von Dentz

Bluetooth: Cancel sync command before suspend and power off

Some of the sync commands might take a long time to complete, e.g.
LE Create Connection when the peer device isn't responding might take
20 seconds before it times out. If suspend command is issued during
this time, it will need to wait for completion since both commands are
using the same sync lock.

This patch cancel any running sync commands before attempting to
suspend or adapter power off.
Signed-off-by: default avatarArchie Pusaka <apusaka@chromium.org>
Reviewed-by: default avatarYing Hsu <yinghsu@chromium.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 7948fe1c
...@@ -2803,6 +2803,9 @@ int hci_suspend_dev(struct hci_dev *hdev) ...@@ -2803,6 +2803,9 @@ int hci_suspend_dev(struct hci_dev *hdev)
if (mgmt_powering_down(hdev)) if (mgmt_powering_down(hdev))
return 0; return 0;
/* Cancel potentially blocking sync operation before suspend */
__hci_cmd_sync_cancel(hdev, -EHOSTDOWN);
hci_req_sync_lock(hdev); hci_req_sync_lock(hdev);
ret = hci_suspend_sync(hdev); ret = hci_suspend_sync(hdev);
hci_req_sync_unlock(hdev); hci_req_sync_unlock(hdev);
......
...@@ -1399,6 +1399,10 @@ static int set_powered(struct sock *sk, struct hci_dev *hdev, void *data, ...@@ -1399,6 +1399,10 @@ static int set_powered(struct sock *sk, struct hci_dev *hdev, void *data,
goto failed; goto failed;
} }
/* Cancel potentially blocking sync operation before power off */
if (cp->val == 0x00)
__hci_cmd_sync_cancel(hdev, -EHOSTDOWN);
err = hci_cmd_sync_queue(hdev, set_powered_sync, cmd, err = hci_cmd_sync_queue(hdev, set_powered_sync, cmd,
mgmt_set_powered_complete); mgmt_set_powered_complete);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment