fixup! Bluetooth: Host: Add bt_taskq workqueue for quick non-blocking tasks

Author: alwa-nordic

subsys/bluetooth/host/Kconfig

@@ -35,20 +35,6 @@ config BT_LONG_WQ_INIT_PRIO
 
 endif # BT_LONG_WQ
 
-config BT_TASKQ_STACK_SIZE_WITH_PROMPT
-	bool "Override BT taskq thread stack size"
-
-config BT_TASKQ_STACK_SIZE
-	int
-	prompt "BT taskq thread stack size" if BT_HCI_TX_STACK_SIZE_WITH_PROMPT
-	default 1024
-
-config BT_TASKQ_THREAD_PRIO
-	int
-	# -1 is the least urgent cooperative priority.
-	# tx_processor() needs a cooperative thread for now.
-	default -1
-
 config BT_HCI_HOST
 	# Hidden option to make the conditions more intuitive
 	bool
@@ -179,6 +165,7 @@ menu "Bluetooth Host"
 
 if BT_HCI_HOST
 
+rsource "Kconfig.bt_taskq"
 rsource "../mesh/Kconfig"
 rsource "../audio/Kconfig"
 

subsys/bluetooth/host/bt_taskq.c

@@ -7,26 +7,36 @@
  */
 
 #include <zephyr/autoconf.h>
-#include <zephyr/kernel.h>
 #include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <zephyr/kernel/thread_stack.h>
+#include <zephyr/sys/util_macro.h>
+#include <zephyr/toolchain.h>
 
 static K_THREAD_STACK_DEFINE(bt_taskq_stack, CONFIG_BT_TASKQ_STACK_SIZE);
-struct k_work_q bt_taskq;
+static struct k_work_q bt_taskq;
 
-static int bt_taskq_init(void)
+__maybe_unused static int bt_taskq_init(void)
 {
-	struct k_work_queue_config cfg = {
-		.name = "bt_taskq",
-	};
+	struct k_work_queue_config cfg = {};
+
+	if (IS_ENABLED(CONFIG_THREAD_NAME)) {
+		cfg.name = "bt_taskq";
+	}
 
 	k_work_queue_start(&bt_taskq, bt_taskq_stack, K_THREAD_STACK_SIZEOF(bt_taskq_stack),
 			   CONFIG_BT_TASKQ_THREAD_PRIO, &cfg);
 
 	return 0;
 }
 
+#if defined(CONFIG_BT_TASKQ_DEDICATED)
 /* The init priority is set to POST_KERNEL 999, the last level
  * before APPLICATION.
  */
 SYS_INIT(bt_taskq_init, POST_KERNEL, 999);
+#endif /* CONFIG_BT_TASKQ_DEDICATED */
+
+/* Exports */
+struct k_work_q *const bt_taskq_chosen =
+	COND_CODE_1(CONFIG_BT_TASKQ_DEDICATED, (&bt_taskq), (&k_sys_work_q));

subsys/bluetooth/host/bt_taskq.h

@@ -37,4 +37,4 @@
  *
  * Available in APPLICATION initialization level and later.
  */
-extern struct k_work_q bt_taskq;
+extern struct k_work_q *const bt_taskq_chosen;