bluetooth: hci: ipc: assert when building HCI IPC driver w/o ACL FC

The HCI IPC driver is not reliable and can lead to lost ACL data if built without Controller-to-Host ACL flow control. This commit prevents building HCI IPC driver and hci_ipc sample without CONFIG_BT_HCI_ACL_FLOW_CONTROL. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
zephyrproject-rtos · Feb 20, 2025 · 28536c8 · 28536c8
1 parent e885c8c
commit 28536c8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/drivers/bluetooth/hci/ipc.c b/drivers/bluetooth/hci/ipc.c
@@ -18,6 +18,11 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_hci_driver);
 
+#if defined(CONFIG_BT_CONN)
+BUILD_ASSERT(IS_ENABLED(CONFIG_BT_HCI_ACL_FLOW_CONTROL),
+	     "IPC transport is not reliable without Controller-to-Host ACL flow control");
+#endif
+
 #define DT_DRV_COMPAT zephyr_bt_hci_ipc
 
 #define IPC_BOUND_TIMEOUT_IN_MS K_MSEC(1000)

diff --git a/samples/bluetooth/hci_ipc/src/main.c b/samples/bluetooth/hci_ipc/src/main.c
@@ -29,6 +29,11 @@
 
 LOG_MODULE_REGISTER(hci_ipc, CONFIG_BT_LOG_LEVEL);
 
+#if defined(CONFIG_BT_CONN)
+BUILD_ASSERT(IS_ENABLED(CONFIG_BT_HCI_ACL_FLOW_CONTROL),
+	     "IPC transport is not reliable without Controller-to-Host ACL flow control");
+#endif
+
 static struct ipc_ept hci_ept;
 
 static K_THREAD_STACK_DEFINE(tx_thread_stack, CONFIG_BT_HCI_TX_STACK_SIZE);

diff --git a/samples/bluetooth/pbp_public_broadcast_sink/prj.conf b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf
@@ -10,7 +10,6 @@ CONFIG_UTF8=y
 CONFIG_BT_SMP=y
 CONFIG_BT_KEYS_OVERWRITE_OLDEST=y
 CONFIG_BT_L2CAP_TX_BUF_COUNT=20
-CONFIG_BT_HCI_ACL_FLOW_CONTROL=n
 CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE=196
 
 # CAP

diff --git a/samples/bluetooth/pbp_public_broadcast_source/prj.conf b/samples/bluetooth/pbp_public_broadcast_source/prj.conf
@@ -10,7 +10,6 @@ CONFIG_BT_ISO_MAX_CHAN=2
 CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SRC_SUBGROUP_COUNT=2
 CONFIG_BT_ISO_TX_BUF_COUNT=4
-CONFIG_BT_HCI_ACL_FLOW_CONTROL=n
 
 # PBP support
 CONFIG_BT_PBP=y