Revert "Bluetooth: Fix deadlock with settings and bt_hci_cmd_send_sync()"

This reverts commit fb5e1de.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

subsys/bluetooth/host/id.c

@@ -866,7 +866,7 @@ static void pending_id_update(struct bt_keys *keys, void *data)
 	}
 }
 
-void bt_id_pending_keys_update_set(struct bt_keys *keys, uint8_t flag)
+static void bt_id_pending_keys_update_set(struct bt_keys *keys, uint8_t flag)
 {
 	atomic_set_bit(bt_dev.flags, BT_DEV_ID_PENDING);
 	keys->state |= flag;

subsys/bluetooth/host/id.h

@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "keys.h"
-
 #define RPA_TIMEOUT_MS(_rpa_timeout) (_rpa_timeout * MSEC_PER_SEC)
 
 static inline bool bt_id_rpa_is_new(void)
@@ -46,6 +44,4 @@ int bt_id_set_private_addr(uint8_t id);
 
 void bt_id_pending_keys_update(void);
 
-void bt_id_pending_keys_update_set(struct bt_keys *keys, uint8_t flag);
-
 void bt_id_adv_limited_stopped(struct bt_le_ext_adv *adv);

subsys/bluetooth/host/keys.c

@@ -28,7 +28,6 @@
 #include "hci_core.h"
 #include "smp.h"
 #include "settings.h"
-#include "id.h"
 #include "keys.h"
 
 #define LOG_LEVEL CONFIG_BT_KEYS_LOG_LEVEL
@@ -427,19 +426,11 @@ static int keys_set(const char *name, size_t len_rd, settings_read_cb read_cb,
 	return 0;
 }
 
-static void add_id_cb(struct k_work *work)
-{
-	bt_id_pending_keys_update();
-}
-
-static K_WORK_DEFINE(add_id_work, add_id_cb);
-
 static void id_add(struct bt_keys *keys, void *user_data)
 {
 	__ASSERT_NO_MSG(keys != NULL);
 
-	bt_id_pending_keys_update_set(keys, BT_KEYS_ID_PENDING_ADD);
-	k_work_submit(&add_id_work);
+	bt_id_add(keys);
 }
 
 static int keys_commit(void)

tests/bluetooth/host/keys/mocks/id.c

@@ -8,6 +8,3 @@
 #include "mocks/id.h"
 
 DEFINE_FAKE_VOID_FUNC(bt_id_del, struct bt_keys *);
-DEFINE_FAKE_VOID_FUNC(bt_id_pending_keys_update);
-DEFINE_FAKE_VOID_FUNC(bt_id_pending_keys_update_set, struct bt_keys *, uint8_t);
-DEFINE_FAKE_VALUE_FUNC(int, k_work_submit, struct k_work *);

tests/bluetooth/host/keys/mocks/id.h

@@ -10,13 +10,7 @@
 #include <host/keys.h>
 
 /* List of fakes used by this unit tester */
-#define ID_FFF_FAKES_LIST(FAKE)                     \
-		FAKE(bt_id_del)                     \
-		FAKE(bt_id_pending_keys_update)     \
-		FAKE(bt_id_pending_keys_update_set) \
-		FAKE(k_work_submit)
+#define ID_FFF_FAKES_LIST(FAKE)        \
+		FAKE(bt_id_del)                \
 
 DECLARE_FAKE_VOID_FUNC(bt_id_del, struct bt_keys *);
-DECLARE_FAKE_VOID_FUNC(bt_id_pending_keys_update);
-DECLARE_FAKE_VOID_FUNC(bt_id_pending_keys_update_set, struct bt_keys *, uint8_t);
-DECLARE_FAKE_VALUE_FUNC(int, k_work_submit, struct k_work *);