Skip to content

Commit 3db3810

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 302ab40 commit 3db3810

13 files changed

+46
-15
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
@@ -69,12 +69,24 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
6969

7070
# Increase the below to receive interleaved advertising chains
7171
CONFIG_BT_CTLR_SCAN_AUX_SET=3
72+
CONFIG_BT_CTLR_LOW_LAT_ULL=y
7273
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
73-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
74+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
7475

7576
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
77+
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y
78+
CONFIG_BT_CTLR_SCAN_AUX_SYNC_RESERVE_MIN=y
79+
CONFIG_BT_CTLR_SYNC_PERIODIC_SKIP_ON_SCAN_AUX=n
80+
CONFIG_BT_CTLR_SYNC_ISO_RESERVE_MAX=n
81+
CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n
82+
CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n
83+
CONFIG_BT_CTLR_PERIPHERAL_ISO_RESERVE_MAX=n
84+
CONFIG_BT_CTLR_EVENT_OVERHEAD_RESERVE_MAX=y
85+
CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n
7686
CONFIG_BT_CTLR_SCAN_UNRESERVED=y
7787
CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
88+
CONFIG_BT_TICKER_EXT=y
89+
CONFIG_BT_TICKER_EXT_SLOT_WINDOW_YIELD=y
7890

7991
# Control Procedure
8092
CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
@@ -84,6 +96,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
8496
CONFIG_BT_CTLR_ADV_PERIODIC=y
8597
CONFIG_BT_CTLR_SYNC_TRANSFER_SENDER=y
8698
CONFIG_BT_CTLR_ADV_ISO=y
99+
CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
100+
CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
87101
CONFIG_BT_CTLR_ADV_ISO_SET=2
88102
CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
89103
CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
@@ -94,6 +108,8 @@ CONFIG_BT_CTLR_ADV_EXT=y
94108
CONFIG_BT_CTLR_SYNC_PERIODIC=y
95109
CONFIG_BT_CTLR_SYNC_TRANSFER_RECEIVER=y
96110
CONFIG_BT_CTLR_SYNC_ISO=y
111+
CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL=y
112+
CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED=y
97113
CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1
98114
CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2
99115
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
@@ -66,11 +66,16 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
6666

6767
# Increase the below to receive interleaved advertising chains
6868
CONFIG_BT_CTLR_SCAN_AUX_SET=3
69+
CONFIG_BT_CTLR_LOW_LAT_ULL=y
6970
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
70-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
71+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
7172

7273
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
74+
CONFIG_BT_CTLR_SCAN_AUX_SYNC_RESERVE_MIN=y
75+
CONFIG_BT_CTLR_SYNC_PERIODIC_SKIP_ON_SCAN_AUX=n
7376
CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n
77+
CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n
78+
CONFIG_BT_CTLR_EVENT_OVERHEAD_RESERVE_MAX=y
7479
CONFIG_BT_CTLR_SLOT_RESERVATION_UPDATE=n
7580
CONFIG_BT_CTLR_SCAN_UNRESERVED=y
7681
CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
@@ -91,7 +96,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
9196

9297
# ISO Transmissions
9398
CONFIG_BT_CTLR_ISOAL_SOURCES=2
94-
CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
99+
CONFIG_BT_CTLR_ISO_TX_BUFFERS=6
95100
CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
96101
CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
97102

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
5555
# Increase the below to receive interleaved advertising chains
5656
CONFIG_BT_CTLR_SCAN_AUX_SET=1
5757
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
58-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
58+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
5959

6060
CONFIG_BT_CTLR_SCAN_UNRESERVED=y
6161
CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y

‎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
@@ -80,7 +80,7 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
8080
CONFIG_BT_CTLR_SCAN_AUX_SET=3
8181
CONFIG_BT_CTLR_LOW_LAT_ULL=y
8282
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
83-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
83+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
8484

8585
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
8686
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
@@ -33,6 +33,8 @@ CONFIG_BT_LL_SW_SPLIT=y
3333
CONFIG_BT_CTLR_ADV_PERIODIC=y
3434
CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
3535
CONFIG_BT_CTLR_ADV_ISO=y
36+
CONFIG_BT_CTLR_ADV_ISO_SEQUENTIAL=y
37+
CONFIG_BT_CTLR_ADV_ISO_INTERLEAVED=y
3638
CONFIG_BT_CTLR_ADV_ISO_SET=2
3739
CONFIG_BT_CTLR_ADV_ISO_STREAM_COUNT=4
3840
CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=2
@@ -45,3 +47,4 @@ CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
4547

4648
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
4749
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
50+
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
@@ -54,7 +54,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
5454

5555
# ISO Transmissions
5656
CONFIG_BT_CTLR_ISOAL_SOURCES=2
57-
CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
57+
CONFIG_BT_CTLR_ISO_TX_BUFFERS=6
5858
CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
5959
CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
6060

‎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
@@ -54,7 +54,7 @@ CONFIG_BT_CTLR_CONN_ISO_LOW_LATENCY_POLICY=y
5454

5555
# ISO Transmissions
5656
CONFIG_BT_CTLR_ISOAL_SOURCES=2
57-
CONFIG_BT_CTLR_ISO_TX_BUFFERS=12
57+
CONFIG_BT_CTLR_ISO_TX_BUFFERS=6
5858
CONFIG_BT_CTLR_ISO_TX_BUFFER_SIZE=255
5959
CONFIG_BT_CTLR_ISO_TX_SDU_LEN_MAX=247
6060

@@ -64,3 +64,7 @@ CONFIG_BT_CTLR_ISO_RX_BUFFERS=4
6464

6565
CONFIG_BT_CTLR_ADVANCED_FEATURES=y
6666
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
67+
CONFIG_BT_CTLR_PERIPHERAL_RESERVE_MAX=n
68+
CONFIG_BT_CTLR_PERIPHERAL_ISO_RESERVE_MAX=n
69+
CONFIG_BT_CTLR_EVENT_OVERHEAD_RESERVE_MAX=y
70+
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
@@ -25,6 +25,8 @@ CONFIG_BT_LL_SW_SPLIT=y
2525
CONFIG_BT_CTLR_SYNC_PERIODIC=y
2626
CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
2727
CONFIG_BT_CTLR_SYNC_ISO=y
28+
CONFIG_BT_CTLR_SYNC_ISO_SEQUENTIAL=y
29+
CONFIG_BT_CTLR_SYNC_ISO_INTERLEAVED=y
2830
CONFIG_BT_CTLR_SCAN_SYNC_ISO_SET=1
2931
CONFIG_BT_CTLR_SYNC_ISO_STREAM_COUNT=2
3032
CONFIG_BT_CTLR_SYNC_ISO_STREAM_MAX=2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
5454
# Increase the below to receive interleaved advertising chains
5555
CONFIG_BT_CTLR_SCAN_AUX_SET=3
5656
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
57-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
57+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
5858

5959
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
6060
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6
5353
# Increase the below to receive interleaved advertising chains
5454
CONFIG_BT_CTLR_SCAN_AUX_SET=3
5555
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
56-
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
56+
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3
5757

5858
CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
5959
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y

0 commit comments

Comments
 (0)