tests: bsim: Bluetooth: Enable similar Controller Kconfig features

Enable similar Controller Kconfig features between nRF52 and
nRF5340 BabbleSIM LE Audio testing.

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

Author: cvinayak

samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf

@@ -69,12 +69,24 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
 
 # Increase the below to receive interleaved advertising chains
 CONFIG_BT_CTLR_SCAN_AUX_SET=3
+CONFIG_BT_CTLR_LOW_LAT_ULL=y
 # CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
 # CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
 
 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
+CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y
+CONFIG_BT_CTLR_SCAN_AUX_SYNC_RESERVE_MIN=y
+CONFIG_BT_CTLR_SYNC_PERIODIC_SKIP_ON_SCAN_AUX=n
+CONFIG_BT_CTLR_SYNC_ISO_RESERVE_MAX=n
+CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n
+CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n
+CONFIG_BT_CTLR_PERIPHERAL_ISO_RESERVE_MAX=n
+CONFIG_BT_CTLR_EVENT_OVERHEAD_RESERVE_MAX=y
+CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n
 CONFIG_BT_CTLR_SCAN_UNRESERVED=y
 CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
+CONFIG_BT_TICKER_EXT=y
+CONFIG_BT_TICKER_EXT_SLOT_WINDOW_YIELD=y
 
 # Control Procedure
 CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
@@ -84,6 +96,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_ADV_PERIODIC=y
 CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER=y
 CONFIG_BT_CTLR_ADV_ISO=y
+CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_ADV_ISO_SET=2
 CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
 CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
@@ -94,6 +108,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_SYNC_PERIODIC=y
 CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER=y
 CONFIG_BT_CTLR_SYNC_ISO=y
+CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2
@@ -106,5 +122,5 @@ CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
 CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
-CONFIG_BT_CTLR_ISO_RX_BUFFERS=8
 CONFIG_BT_CTLR_ISOAL_SINKS=2
+CONFIG_BT_CTLR_ISO_RX_BUFFERS=4

samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf

@@ -38,7 +38,7 @@ CONFIG_BT_ISO_MAX_CHAN=4
 # is used in the context of IPC which falls into a "Newton's Cradle" effect
 # where probably (CONFIG_BT_CTLR_ISO_TX_BUFFERS - CONFIG_BT_ISO_TX_BUF_COUNT)
 # buffers get throttled. Hence, always have the value equal or greater.
-CONFIG_BT_ISO_TX_BUF_COUNT=12
+CONFIG_BT_ISO_TX_BUF_COUNT=6
 CONFIG_BT_ISO_RX_BUF_COUNT=1
 
 # Controller
@@ -66,11 +66,16 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
 
 # Increase the below to receive interleaved advertising chains
 CONFIG_BT_CTLR_SCAN_AUX_SET=3
+CONFIG_BT_CTLR_LOW_LAT_ULL=y
 # CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
 # CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
 
 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
+CONFIG_BT_CTLR_SCAN_AUX_SYNC_RESERVE_MIN=y
+CONFIG_BT_CTLR_SYNC_PERIODIC_SKIP_ON_SCAN_AUX=n
 CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n
+CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n
+CONFIG_BT_CTLR_EVENT_OVERHEAD_RESERVE_MAX=y
 CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n
 CONFIG_BT_CTLR_SCAN_UNRESERVED=y
 CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
@@ -91,10 +96,10 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 
 # ISO Transmissions
 CONFIG_BT_CTLR_ISOAL_SOURCES=2
-CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
+CONFIG_BT_CTLR_ISO_TX_BUFFERS=6
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
 CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
-CONFIG_BT_CTLR_ISO_RX_BUFFERS=8
 CONFIG_BT_CTLR_ISOAL_SINKS=2
+CONFIG_BT_CTLR_ISO_RX_BUFFERS=4

samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf

@@ -81,6 +81,8 @@ CONFIG_BT_CTLR_LOW_LAT_ULL=y
 
 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
 CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y
+CONFIG_BT_CTLR_SCAN_AUX_SYNC_RESERVE_MIN=y
+CONFIG_BT_CTLR_SYNC_PERIODIC_SKIP_ON_SCAN_AUX=n
 CONFIG_BT_CTLR_SYNC_ISO_RESERVE_MAX=n
 CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n
 CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n
@@ -136,7 +138,7 @@ CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISOAL_SINKS=2
-CONFIG_BT_CTLR_ISO_RX_BUFFERS=8
+CONFIG_BT_CTLR_ISO_RX_BUFFERS=4
 
 # Tx Power Dynamic Control
 CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
@@ -155,7 +157,3 @@ CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y
 CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y
 CONFIG_MBEDTLS_AES_ROM_TABLES=y
 CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=3
-
-# Reduce RAM footprint further otherwise the image won't fit in cpu_net.
-CONFIG_BT_CTLR_ADV_ISO_SET=1
-CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=2

samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf

@@ -33,6 +33,8 @@ CONFIG_BT_LL_SW_SPLIT=y
 CONFIG_BT_CTLR_ADV_PERIODIC=y
 CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
 CONFIG_BT_CTLR_ADV_ISO=y
+CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_ADV_ISO_SET=2
 CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
 CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
@@ -45,3 +47,4 @@ CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 CONFIG_BT_CTLR_ADVANCED_FEATURES=y
 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
+CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y

samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf

@@ -35,7 +35,7 @@ CONFIG_BT_ISO_MAX_CHAN=2
 # is used in the context of IPC which falls into a "Newton's Cradle" effect
 # where probably (CONFIG_BT_CTLR_ISO_TX_BUFFERS - CONFIG_BT_ISO_TX_BUF_COUNT)
 # buffers get throttled. Hence, always have the value equal or greater.
-CONFIG_BT_ISO_TX_BUF_COUNT=12
+CONFIG_BT_ISO_TX_BUF_COUNT=6
 CONFIG_BT_ISO_RX_BUF_COUNT=1
 
 # Controller
@@ -54,13 +54,13 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 
 # ISO Transmissions
 CONFIG_BT_CTLR_ISOAL_SOURCES=2
-CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
+CONFIG_BT_CTLR_ISO_TX_BUFFERS=6
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
 CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISOAL_SINKS=2
-CONFIG_BT_CTLR_ISO_RX_BUFFERS=8
+CONFIG_BT_CTLR_ISO_RX_BUFFERS=4
 
 # Controller with minimum ACL event length and unreserved scanning
 CONFIG_BT_CTLR_ADVANCED_FEATURES=y

samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf

@@ -35,7 +35,7 @@ CONFIG_BT_ISO_MAX_CHAN=2
 # is used in the context of IPC which falls into a "Newton's Cradle" effect
 # where probably (CONFIG_BT_CTLR_ISO_TX_BUFFERS - CONFIG_BT_ISO_TX_BUF_COUNT)
 # buffers get throttled. Hence, always have the value equal or greater.
-CONFIG_BT_ISO_TX_BUF_COUNT=12
+CONFIG_BT_ISO_TX_BUF_COUNT=6
 CONFIG_BT_ISO_RX_BUF_COUNT=1
 
 # Controller
@@ -54,13 +54,17 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
 
 # ISO Transmissions
 CONFIG_BT_CTLR_ISOAL_SOURCES=2
-CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
+CONFIG_BT_CTLR_ISO_TX_BUFFERS=6
 CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
 CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
 
 # ISO Receptions
 CONFIG_BT_CTLR_ISOAL_SINKS=2
-CONFIG_BT_CTLR_ISO_RX_BUFFERS=8
+CONFIG_BT_CTLR_ISO_RX_BUFFERS=4
 
 CONFIG_BT_CTLR_ADVANCED_FEATURES=y
 CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
+CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n
+CONFIG_BT_CTLR_PERIPHERAL_ISO_RESERVE_MAX=n
+CONFIG_BT_CTLR_EVENT_OVERHEAD_RESERVE_MAX=y
+CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n

samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf

@@ -25,9 +25,11 @@ CONFIG_BT_LL_SW_SPLIT=y
 CONFIG_BT_CTLR_SYNC_PERIODIC=y
 CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
 CONFIG_BT_CTLR_SYNC_ISO=y
+CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2
 CONFIG_BT_CTLR_SYNC_ISO_PDU_LEN_MAX=251
 CONFIG_BT_CTLR_ISOAL_SINKS=2
-CONFIG_BT_CTLR_ISO_RX_BUFFERS=8
+CONFIG_BT_CTLR_ISO_RX_BUFFERS=4

tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf

@@ -24,6 +24,7 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
 
 # Increase the below to receive interleaved advertising chains
 CONFIG_BT_CTLR_SCAN_AUX_SET=3
+CONFIG_BT_CTLR_LOW_LAT_ULL=y
 # CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
 # CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
 
@@ -50,6 +51,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_ADV_PERIODIC=y
 CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER=y
 CONFIG_BT_CTLR_ADV_ISO=y
+CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_ADV_ISO_SET=1
 CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
 CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=4
@@ -60,6 +63,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
 CONFIG_BT_CTLR_SYNC_PERIODIC=y
 CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER=y
 CONFIG_BT_CTLR_SYNC_ISO=y
+CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL=y
+CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED=y
 CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=4
 CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=4

tests/bsim/bluetooth/audio_samples/bap_unicast_client/tests_scripts/unicast_client.sh

@@ -24,6 +24,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_samples_bap_unicast_client_p
   -testid=unicast_client
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=20e6 $@ -argschannel -at=40
+  -D=2 -sim_length=21e6 $@ -argschannel -at=40
 
 wait_for_background_jobs #Wait for all programs in background and return != 0 if any fails

tests/bsim/bluetooth/host/adv/chain/tests_scripts/adv_chain.sh

@@ -18,6 +18,6 @@ Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_host_adv_chain_prj_conf\
   -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=scan
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-  -D=2 -sim_length=10e6 $@
+  -D=2 -sim_length=11e6 $@
 
 wait_for_background_jobs