Merge tag 'input-for-v5.19-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / net / bluetooth / hci_sync.c

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 13600bf..4d2203c 100644 (file)
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -1664,20 +1664,19 @@ static int hci_le_add_accept_list_sync(struct hci_dev *hdev,
        struct hci_cp_le_add_to_accept_list cp;
        int err;
 
+       /* During suspend, only wakeable devices can be in acceptlist */
+       if (hdev->suspended &&
+           !test_bit(HCI_CONN_FLAG_REMOTE_WAKEUP, params->flags))
+               return 0;
+
        /* Select filter policy to accept all advertising */
        if (*num_entries >= hdev->le_accept_list_size)
                return -ENOSPC;
 
        /* Accept list can not be used with RPAs */
        if (!use_ll_privacy(hdev) &&
-           hci_find_irk_by_addr(hdev, &params->addr, params->addr_type)) {
+           hci_find_irk_by_addr(hdev, &params->addr, params->addr_type))
                return -EINVAL;
-       }
-
-       /* During suspend, only wakeable devices can be in acceptlist */
-       if (hdev->suspended &&
-           !test_bit(HCI_CONN_FLAG_REMOTE_WAKEUP, params->flags))
-               return 0;
 
        /* Attempt to program the device in the resolving list first to avoid
         * having to rollback in case it fails since the resolving list is
@@ -3825,6 +3824,30 @@ static int hci_init_sync(struct hci_dev *hdev)
        return 0;
 }
 
+#define HCI_QUIRK_BROKEN(_quirk, _desc) { HCI_QUIRK_BROKEN_##_quirk, _desc }
+
+static const struct {
+       unsigned long quirk;
+       const char *desc;
+} hci_broken_table[] = {
+       HCI_QUIRK_BROKEN(LOCAL_COMMANDS,
+                        "HCI Read Local Supported Commands not supported"),
+       HCI_QUIRK_BROKEN(STORED_LINK_KEY,
+                        "HCI Delete Stored Link Key command is advertised, "
+                        "but not supported."),
+       HCI_QUIRK_BROKEN(ERR_DATA_REPORTING,
+                        "HCI Read Default Erroneous Data Reporting command is "
+                        "advertised, but not supported."),
+       HCI_QUIRK_BROKEN(READ_TRANSMIT_POWER,
+                        "HCI Read Transmit Power Level command is advertised, "
+                        "but not supported."),
+       HCI_QUIRK_BROKEN(FILTER_CLEAR_ALL,
+                        "HCI Set Event Filter command not supported."),
+       HCI_QUIRK_BROKEN(ENHANCED_SETUP_SYNC_CONN,
+                        "HCI Enhanced Setup Synchronous Connection command is "
+                        "advertised, but not supported.")
+};
+
 int hci_dev_open_sync(struct hci_dev *hdev)
 {
        int ret = 0;
@@ -3886,12 +3909,19 @@ int hci_dev_open_sync(struct hci_dev *hdev)
        if (hci_dev_test_flag(hdev, HCI_SETUP) ||
            test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {
                bool invalid_bdaddr;
+               size_t i;
 
                hci_sock_dev_event(hdev, HCI_DEV_SETUP);
 
                if (hdev->setup)
                        ret = hdev->setup(hdev);
 
+               for (i = 0; i < ARRAY_SIZE(hci_broken_table); i++) {
+                       if (test_bit(hci_broken_table[i].quirk, &hdev->quirks))
+                               bt_dev_warn(hdev, "%s",
+                                           hci_broken_table[i].desc);
+               }
+
                /* The transport driver can set the quirk to mark the
                 * BD_ADDR invalid before creating the HCI device or in
                 * its setup callback.
@@ -4058,6 +4088,7 @@ int hci_dev_close_sync(struct hci_dev *hdev)
 
        bt_dev_dbg(hdev, "");
 
+       cancel_work_sync(&hdev->power_on);
        cancel_delayed_work(&hdev->power_off);
        cancel_delayed_work(&hdev->ncmd_timer);
 
@@ -4881,10 +4912,28 @@ static int hci_update_event_filter_sync(struct hci_dev *hdev)
        return 0;
 }
 
+/* This function disables scan (BR and LE) and mark it as paused */
+static int hci_pause_scan_sync(struct hci_dev *hdev)
+{
+       if (hdev->scanning_paused)
+               return 0;
+
+       /* Disable page scan if enabled */
+       if (test_bit(HCI_PSCAN, &hdev->flags))
+               hci_write_scan_enable_sync(hdev, SCAN_DISABLED);
+
+       hci_scan_disable_sync(hdev);
+
+       hdev->scanning_paused = true;
+
+       return 0;
+}
+
 /* This function performs the HCI suspend procedures in the follow order:
  *
  * Pause discovery (active scanning/inquiry)
  * Pause Directed Advertising/Advertising
+ * Pause Scanning (passive scanning in case discovery was not active)
  * Disconnect all connections
  * Set suspend_status to BT_SUSPEND_DISCONNECT if hdev cannot wakeup
  * otherwise:
@@ -4910,15 +4959,11 @@ int hci_suspend_sync(struct hci_dev *hdev)
        /* Pause other advertisements */
        hci_pause_advertising_sync(hdev);
 
-       /* Disable page scan if enabled */
-       if (test_bit(HCI_PSCAN, &hdev->flags))
-               hci_write_scan_enable_sync(hdev, SCAN_DISABLED);
-
        /* Suspend monitor filters */
        hci_suspend_monitor_sync(hdev);
 
        /* Prevent disconnects from causing scanning to be re-enabled */
-       hdev->scanning_paused = true;
+       hci_pause_scan_sync(hdev);
 
        /* Soft disconnect everything (power off) */
        err = hci_disconnect_all_sync(hdev, HCI_ERROR_REMOTE_POWER_OFF);
@@ -4989,6 +5034,22 @@ static void hci_resume_monitor_sync(struct hci_dev *hdev)
        }
 }
 
+/* This function resume scan and reset paused flag */
+static int hci_resume_scan_sync(struct hci_dev *hdev)
+{
+       if (!hdev->scanning_paused)
+               return 0;
+
+       hci_update_scan_sync(hdev);
+
+       /* Reset passive scanning to normal */
+       hci_update_passive_scan_sync(hdev);
+
+       hdev->scanning_paused = false;
+
+       return 0;
+}
+
 /* This function performs the HCI suspend procedures in the follow order:
  *
  * Restore event mask
@@ -5011,10 +5072,9 @@ int hci_resume_sync(struct hci_dev *hdev)
 
        /* Clear any event filters and restore scan state */
        hci_clear_event_filter_sync(hdev);
-       hci_update_scan_sync(hdev);
 
-       /* Reset passive scanning to normal */
-       hci_update_passive_scan_sync(hdev);
+       /* Resume scanning */
+       hci_resume_scan_sync(hdev);
 
        /* Resume monitor filters */
        hci_resume_monitor_sync(hdev);