Skip to content

Commit 4f69eb1

Browse files
cvinayakcvinayak
committed
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]>
1 parent 2baee8a commit 4f69eb1

12 files changed

+48
-13
lines changed

‎samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,24 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
7070

7171
# Increase the below to receive interleaved advertising chains
7272
CONFIG_BT_CTLR_SCAN_AUX_SET=3
73+
CONFIG_BT_CTLR_LOW_LAT_ULL=y
7374
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
74-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
75+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
7576

7677
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
78+
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y
79+
CONFIG_BT_CTLR_SCAN_AUX_SYNC_RESERVE_MIN=y
80+
CONFIG_BT_CTLR_SYNC_PERIODIC_SKIP_ON_SCAN_AUX=n
81+
CONFIG_BT_CTLR_SYNC_ISO_RESERVE_MAX=n
82+
CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n
83+
CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n
84+
CONFIG_BT_CTLR_PERIPHERAL_ISO_RESERVE_MAX=n
85+
CONFIG_BT_CTLR_EVENT_OVERHEAD_RESERVE_MAX=y
86+
CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n
7787
CONFIG_BT_CTLR_SCAN_UNRESERVED=y
7888
CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
89+
CONFIG_BT_TICKER_EXT=y
90+
CONFIG_BT_TICKER_EXT_SLOT_WINDOW_YIELD=y
7991

8092
# Control Procedure
8193
CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
@@ -85,6 +97,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
8597
CONFIG_BT_CTLR_ADV_PERIODIC=y
8698
CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER=y
8799
CONFIG_BT_CTLR_ADV_ISO=y
100+
CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
101+
CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
88102
CONFIG_BT_CTLR_ADV_ISO_SET=2
89103
CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
90104
CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
@@ -95,6 +109,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
95109
CONFIG_BT_CTLR_SYNC_PERIODIC=y
96110
CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER=y
97111
CONFIG_BT_CTLR_SYNC_ISO=y
112+
CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL=y
113+
CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED=y
98114
CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1
99115
CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2
100116
CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2

‎samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CONFIG_BT_ISO_MAX_CHAN=4
3838
# is used in the context of IPC which falls into a "Newton's Cradle" effect
3939
# where probably (CONFIG_BT_CTLR_ISO_TX_BUFFERS - CONFIG_BT_ISO_TX_BUF_COUNT)
4040
# buffers get throttled. Hence, always have the value equal or greater.
41-
CONFIG_BT_ISO_TX_BUF_COUNT=12
41+
CONFIG_BT_ISO_TX_BUF_COUNT=6
4242
CONFIG_BT_ISO_RX_BUF_COUNT=1
4343

4444
# Controller
@@ -67,11 +67,16 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
6767

6868
# Increase the below to receive interleaved advertising chains
6969
CONFIG_BT_CTLR_SCAN_AUX_SET=3
70+
CONFIG_BT_CTLR_LOW_LAT_ULL=y
7071
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
71-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
72+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
7273

7374
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
75+
CONFIG_BT_CTLR_SCAN_AUX_SYNC_RESERVE_MIN=y
76+
CONFIG_BT_CTLR_SYNC_PERIODIC_SKIP_ON_SCAN_AUX=n
7477
CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n
78+
CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n
79+
CONFIG_BT_CTLR_EVENT_OVERHEAD_RESERVE_MAX=y
7580
CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n
7681
CONFIG_BT_CTLR_SCAN_UNRESERVED=y
7782
CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
@@ -92,7 +97,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
9297

9398
# ISO Transmissions
9499
CONFIG_BT_CTLR_ISOAL_SOURCES=2
95-
CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
100+
CONFIG_BT_CTLR_ISO_TX_BUFFERS=6
96101
CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
97102
CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
98103

‎samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
5555

5656
# Increase the below to receive interleaved advertising chains
5757
CONFIG_BT_CTLR_SCAN_AUX_SET=1
58+
CONFIG_BT_CTLR_LOW_LAT_ULL=y
5859
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
5960
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
6061

‎samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
8686
CONFIG_BT_CTLR_SCAN_AUX_SET=3
8787
CONFIG_BT_CTLR_LOW_LAT_ULL=y
8888
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
89-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
89+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
9090

9191
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
9292
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y

‎samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ CONFIG_BT_HCI_VS_FATAL_ERROR=y
3535
CONFIG_BT_CTLR_ADV_PERIODIC=y
3636
CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
3737
CONFIG_BT_CTLR_ADV_ISO=y
38+
CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
39+
CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
3840
CONFIG_BT_CTLR_ADV_ISO_SET=2
3941
CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
4042
CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
@@ -47,3 +49,4 @@ CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
4749

4850
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
4951
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
52+
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y

‎samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CONFIG_BT_ISO_MAX_CHAN=2
3535
# is used in the context of IPC which falls into a "Newton's Cradle" effect
3636
# where probably (CONFIG_BT_CTLR_ISO_TX_BUFFERS - CONFIG_BT_ISO_TX_BUF_COUNT)
3737
# buffers get throttled. Hence, always have the value equal or greater.
38-
CONFIG_BT_ISO_TX_BUF_COUNT=12
38+
CONFIG_BT_ISO_TX_BUF_COUNT=6
3939
CONFIG_BT_ISO_RX_BUF_COUNT=1
4040

4141
# Controller
@@ -56,7 +56,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
5656

5757
# ISO Transmissions
5858
CONFIG_BT_CTLR_ISOAL_SOURCES=2
59-
CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
59+
CONFIG_BT_CTLR_ISO_TX_BUFFERS=6
6060
CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
6161
CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
6262

‎samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CONFIG_BT_ISO_MAX_CHAN=2
3535
# is used in the context of IPC which falls into a "Newton's Cradle" effect
3636
# where probably (CONFIG_BT_CTLR_ISO_TX_BUFFERS - CONFIG_BT_ISO_TX_BUF_COUNT)
3737
# buffers get throttled. Hence, always have the value equal or greater.
38-
CONFIG_BT_ISO_TX_BUF_COUNT=12
38+
CONFIG_BT_ISO_TX_BUF_COUNT=6
3939
CONFIG_BT_ISO_RX_BUF_COUNT=1
4040

4141
# Controller
@@ -56,7 +56,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
5656

5757
# ISO Transmissions
5858
CONFIG_BT_CTLR_ISOAL_SOURCES=2
59-
CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
59+
CONFIG_BT_CTLR_ISO_TX_BUFFERS=6
6060
CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
6161
CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
6262

@@ -66,3 +66,7 @@ CONFIG_BT_CTLR_ISO_RX_BUFFERS=4
6666

6767
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
6868
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
69+
CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n
70+
CONFIG_BT_CTLR_PERIPHERAL_ISO_RESERVE_MAX=n
71+
CONFIG_BT_CTLR_EVENT_OVERHEAD_RESERVE_MAX=y
72+
CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n

‎samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ CONFIG_BT_HCI_VS_FATAL_ERROR=y
2727
CONFIG_BT_CTLR_SYNC_PERIODIC=y
2828
CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
2929
CONFIG_BT_CTLR_SYNC_ISO=y
30+
CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL=y
31+
CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED=y
3032
CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1
3133
CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2
3234
CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2

‎samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
6767

6868
# Increase the below to receive interleaved advertising chains
6969
CONFIG_BT_CTLR_SCAN_AUX_SET=3
70+
CONFIG_BT_CTLR_LOW_LAT_ULL=y
7071
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
71-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
72+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
7273

7374
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
7475
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y

‎samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
5252

5353
# Increase the below to receive interleaved advertising chains
5454
CONFIG_BT_CTLR_SCAN_AUX_SET=3
55+
CONFIG_BT_CTLR_LOW_LAT_ULL=y
5556
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
56-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
57+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
5758

5859
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
5960
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y

0 commit comments

Comments
 (0)