Samples: Bluetooth: Explicitly set CONFIG_BT_BUF_EVT_RX_COUNT

weeTike · cvinayak · commit 98e50b493d33 · 2025-10-07T09:03:47.000+02:00
This is needed after changes in upstream zephyr. Signed-off-by: Timothy Keys <timothy.keys@nordicsemi.no> (cherry picked from commit 85ce826) Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
diff --git a/Kconfig.nrf b/Kconfig.nrf
@@ -86,6 +86,7 @@ config MCUMGR_TRANSPORT_NETBUF_SIZE
 
 # When using HCI on the nRF5340 we need a larger command buffer.
 config BT_BUF_CMD_TX_COUNT
+	depends on !BT_LL_SW_SPLIT
 	default 10 if SOC_COMPATIBLE_NRF5340_CPUAPP || SOC_COMPATIBLE_NRF5340_CPUNET
 
 config INIT_ARCH_HW_AT_BOOT
diff --git a/applications/connectivity_bridge/boards/thingy91_nrf52840.conf b/applications/connectivity_bridge/boards/thingy91_nrf52840.conf
@@ -19,6 +19,7 @@ CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_SMP=y
 CONFIG_BT_CTLR=y
 CONFIG_BT_CTLR_RX_BUFFERS=10
+CONFIG_BT_BUF_EVT_RX_COUNT=11
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
diff --git a/applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf b/applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf
@@ -17,6 +17,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=251
 CONFIG_BT_NUS=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_SMP=y
+CONFIG_BT_BUF_EVT_RX_COUNT=11
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf
@@ -63,11 +63,13 @@ CONFIG_SIZE_OPTIMIZATIONS=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 
-CONFIG_USB_NRFX_EVT_QUEUE_SIZE=16
+CONFIG_USB_NRFX_EVT_QUEUE_SIZE=10
 
 CONFIG_BT_PRIVACY=y
 CONFIG_BT_LL_SW_SPLIT=y
 
+CONFIG_BT_BUF_EVT_RX_COUNT=4
+CONFIG_BT_BUF_ACL_TX_COUNT=3
 CONFIG_BT_BUF_ACL_TX_SIZE=35
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
 CONFIG_BT_L2CAP_TX_BUF_COUNT=6
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf
@@ -64,11 +64,13 @@ CONFIG_SIZE_OPTIMIZATIONS=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 
-CONFIG_USB_NRFX_EVT_QUEUE_SIZE=16
+CONFIG_USB_NRFX_EVT_QUEUE_SIZE=10
 
 CONFIG_BT_PRIVACY=y
 CONFIG_BT_LL_SW_SPLIT=y
 
+CONFIG_BT_BUF_EVT_RX_COUNT=4
+CONFIG_BT_BUF_ACL_TX_COUNT=3
 CONFIG_BT_BUF_ACL_TX_SIZE=35
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
 CONFIG_BT_L2CAP_TX_BUF_COUNT=6
diff --git a/samples/bluetooth/peripheral_lbs/prj_minimal.conf b/samples/bluetooth/peripheral_lbs/prj_minimal.conf
@@ -102,9 +102,9 @@ CONFIG_BT_CTLR_PHY_2M=n
 # Reduce Bluetooth buffers
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=43
-CONFIG_BT_BUF_EVT_RX_COUNT=2
 
 CONFIG_BT_CONN_TX_MAX=2
 CONFIG_BT_L2CAP_TX_BUF_COUNT=2
+CONFIG_BT_BUF_EVT_RX_COUNT=4
 CONFIG_BT_BUF_ACL_TX_COUNT=3
 CONFIG_BT_BUF_ACL_TX_SIZE=27
diff --git a/samples/bluetooth/peripheral_uart/prj_minimal.conf b/samples/bluetooth/peripheral_uart/prj_minimal.conf
@@ -122,9 +122,9 @@ CONFIG_BT_CTLR_PHY_2M=n
 # Reduce Bluetooth buffers
 CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
 CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=43
-CONFIG_BT_BUF_EVT_RX_COUNT=2
 
 CONFIG_BT_CONN_TX_MAX=2
 CONFIG_BT_L2CAP_TX_BUF_COUNT=2
+CONFIG_BT_BUF_EVT_RX_COUNT=4
 CONFIG_BT_BUF_ACL_TX_COUNT=3
 CONFIG_BT_BUF_ACL_TX_SIZE=27
diff --git a/samples/bluetooth/throughput/prj.conf b/samples/bluetooth/throughput/prj.conf
@@ -36,6 +36,7 @@ CONFIG_BT_L2CAP_TX_BUF_COUNT=10
 CONFIG_BT_L2CAP_TX_MTU=498
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_CONN_TX_MAX=10
+CONFIG_BT_BUF_EVT_RX_COUNT=11
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_SIZE=502
 
diff --git a/tests/bluetooth/iso/prj.conf b/tests/bluetooth/iso/prj.conf
@@ -24,6 +24,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_NUS_CLIENT=y
 CONFIG_BT_GATT_DM=y
 CONFIG_BT_GATT_CLIENT=y
+CONFIG_BT_BUF_EVT_RX_COUNT=11
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_ATT_PREPARE_COUNT=2
 CONFIG_BT_L2CAP_TX_BUF_COUNT=10
