Bluetooth: Add new quirk for non-persistent setup settings

Add a new quirk HCI_QUIRK_NON_PERSISTENT_SETUP allowing that a quirk that
runs setup() after every open() and not just after the first open().

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 8ff36463719fa94e97d5ebdd673041ce6e80a1b7..7f008097552ea86a7a1b180be3b480db92302d39 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -183,6 +183,15 @@ enum {
         * during the hdev->setup vendor callback.
         */
        HCI_QUIRK_NON_PERSISTENT_DIAG,
+
+       /* When this quirk is set, setup() would be run after every
+        * open() and not just after the first open().
+        *
+        * This quirk can be set before hci_register_dev is called or
+        * during the hdev->setup vendor callback.
+        *
+        */
+       HCI_QUIRK_NON_PERSISTENT_SETUP,
 };
 
 /* HCI device flags */

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 79e02d24a215782f0143cef05573a619fdae3eb4..74b29c7d841c66192b8d697c845b24d2c2a5b820 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1415,7 +1415,8 @@ static int hci_dev_do_open(struct hci_dev *hdev)
        atomic_set(&hdev->cmd_cnt, 1);
        set_bit(HCI_INIT, &hdev->flags);
 
-       if (hci_dev_test_flag(hdev, HCI_SETUP)) {
+       if (hci_dev_test_flag(hdev, HCI_SETUP) ||
+           test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {
                hci_sock_dev_event(hdev, HCI_DEV_SETUP);
 
                if (hdev->setup)