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: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Ying Hsu <yinghsu@chromium.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 393b317ae68f691782f6ff5d45456cdaa4af3b48..a856b1051d355b454c13a9c7ac10504ee93069af 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2803,6 +2803,9 @@ int hci_suspend_dev(struct hci_dev *hdev)
        if (mgmt_powering_down(hdev))
                return 0;
 
+       /* Cancel potentially blocking sync operation before suspend */
+       __hci_cmd_sync_cancel(hdev, -EHOSTDOWN);
+
        hci_req_sync_lock(hdev);
        ret = hci_suspend_sync(hdev);
        hci_req_sync_unlock(hdev);

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 5f8c144c84b886533244066f98da905ebca5d50f..13c745876b39080a629a330dc701a292ea050e35 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1399,6 +1399,10 @@ static int set_powered(struct sock *sk, struct hci_dev *hdev, void *data,
                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,
                                 mgmt_set_powered_complete);