Bluetooth: Allow suspend even when preparation has failed

It is preferable to allow suspend even when Bluetooth has problems
preparing for sleep. When Bluetooth fails to finish preparing for
suspend, log the error and allow the suspend notifier to continue
instead.

To also make it clearer why suspend failed, change bt_dev_dbg to
bt_dev_err when handling the suspend timeout.

Fixes: dd522a7429b07e ("Bluetooth: Handle LE devices during suspend")
Reported-by: Len Brown <len.brown@intel.com>
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index dbe2d79f233fba365913887c8079382992115279..83ce665d3cbfb0661d4d78541fd41fff700ce120 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3289,10 +3289,10 @@ static int hci_suspend_wait_event(struct hci_dev *hdev)
                                     WAKE_COND, SUSPEND_NOTIFIER_TIMEOUT);
 
        if (ret == 0) {
-               bt_dev_dbg(hdev, "Timed out waiting for suspend");
+               bt_dev_err(hdev, "Timed out waiting for suspend events");
                for (i = 0; i < __SUSPEND_NUM_TASKS; ++i) {
                        if (test_bit(i, hdev->suspend_tasks))
-                               bt_dev_dbg(hdev, "Bit %d is set", i);
+                               bt_dev_err(hdev, "Suspend timeout bit: %d", i);
                        clear_bit(i, hdev->suspend_tasks);
                }
 
@@ -3360,12 +3360,15 @@ static int hci_suspend_notifier(struct notifier_block *nb, unsigned long action,
                ret = hci_change_suspend_state(hdev, BT_RUNNING);
        }
 
-       /* If suspend failed, restore it to running */
-       if (ret && action == PM_SUSPEND_PREPARE)
-               hci_change_suspend_state(hdev, BT_RUNNING);
-
 done:
-       return ret ? notifier_from_errno(-EBUSY) : NOTIFY_STOP;
+       /* We always allow suspend even if suspend preparation failed and
+        * attempt to recover in resume.
+        */
+       if (ret)
+               bt_dev_err(hdev, "Suspend notifier action (%lu) failed: %d",
+                          action, ret);
+
+       return NOTIFY_STOP;
 }
 
 /* Alloc HCI device */