Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bluetooth: Controller: Default to BT_CTLR_SCAN_AUX_USE_CHAINS #85717

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −24
Open

Bluetooth: Controller: Default to BT_CTLR_SCAN_AUX_USE_CHAINS #85717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/releases/release-notes-4.1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ Deprecated APIs and options

* :kconfig:option:`CONFIG_BT_BUF_ACL_RX_COUNT`

* :kconfig:option:`CONFIG_BT_CTLR_SCAN_AUX_SET`

* All HWMv1 board name aliases which were added as deprecated in v3.7 are now removed
(:github:`82247`).

Expand Down
4 changes: 3 additions & 1 deletion samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6

# Increase the below to receive interleaved advertising chains
CONFIG_BT_CTLR_SCAN_AUX_SET=1
# CONFIG_BT_CTLR_SCAN_AUX_SET=1 # DEPRECATED
CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3

CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
CONFIG_BT_CTLR_SCAN_UNRESERVED=y
Expand Down
4 changes: 3 additions & 1 deletion samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ CONFIG_BT_CTLR_ADV_AUX_PDU_BACK2BACK=y
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6

# Increase the below to receive interleaved advertising chains
CONFIG_BT_CTLR_SCAN_AUX_SET=1
# CONFIG_BT_CTLR_SCAN_AUX_SET=1 # DEPRECATED
CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3

CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n
Expand Down
4 changes: 3 additions & 1 deletion samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6

# Increase the below to receive interleaved advertising chains
CONFIG_BT_CTLR_SCAN_AUX_SET=1
# CONFIG_BT_CTLR_SCAN_AUX_SET=1 # DEPRECATED
CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3

CONFIG_BT_CTLR_SCAN_UNRESERVED=y
CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH=y
Expand Down
6 changes: 3 additions & 3 deletions samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6

# Increase the below to receive interleaved advertising chains
CONFIG_BT_CTLR_SCAN_AUX_SET=1
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
# CONFIG_BT_CTLR_SCAN_AUX_SET=1 # DEPRECATED
CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3

CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y
Expand Down
6 changes: 3 additions & 3 deletions samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6

# Increase the below to receive interleaved advertising chains
CONFIG_BT_CTLR_SCAN_AUX_SET=1
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
# CONFIG_BT_CTLR_SCAN_AUX_SET=1 # DEPRECATED
CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3

CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y
Expand Down
6 changes: 3 additions & 3 deletions samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6

# Increase the below to receive interleaved advertising chains
CONFIG_BT_CTLR_SCAN_AUX_SET=1
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
# CONFIG_BT_CTLR_SCAN_AUX_SET=1 # DEPRECATED
CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3

CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y
Expand Down
24 changes: 16 additions & 8 deletions subsys/bluetooth/controller/Kconfig.ll_sw_split
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,20 +515,13 @@ config BT_CTRL_ADV_ADI_IN_SCAN_RSP
config BT_CTLR_SCAN_AUX_USE_CHAINS
bool "Use new chains based implementation for following advertising chains"
depends on BT_OBSERVER && BT_CTLR_ADV_EXT
default y
help
Use the new chains based implementation of following advertising chains
instead of the old sets based one. The new implementation has a much lighter
footprint, since it limits allocations per advertising chain to the bare
minimum and only uses one ticker

config BT_CTLR_SCAN_AUX_SET
int "LE Extended Scanning Auxiliary Sets"
depends on BT_OBSERVER && BT_CTLR_ADV_EXT && !BT_CTLR_SCAN_AUX_USE_CHAINS
range 1 64
default 1
help
Maximum supported auxiliary channel scan sets.

config BT_CTLR_SCAN_AUX_CHAIN_COUNT
int "LE Extended Scanning Auxiliary Chains"
depends on BT_OBSERVER && BT_CTLR_ADV_EXT && BT_CTLR_SCAN_AUX_USE_CHAINS
Expand All @@ -538,6 +531,21 @@ config BT_CTLR_SCAN_AUX_CHAIN_COUNT
Maximum number of extended/periodic advertising chains that can be
followed simultaneously

config BT_CTLR_SCAN_AUX_SET
int "LE Extended Scanning Auxiliary Sets [DEPRECATED]"
depends on BT_OBSERVER && BT_CTLR_ADV_EXT && !BT_CTLR_SCAN_AUX_USE_CHAINS
range 1 64
default 1
help
Maximum supported auxiliary channel scan sets.

config BT_CTLR_SCAN_AUX_SET_DEPRECATED
# Hidden Kconfig to select DEPRECATED if BT_CTLR_SCAN_AUX_SET is used
bool
depends on BT_OBSERVER && BT_CTLR_ADV_EXT && !BT_CTLR_SCAN_AUX_USE_CHAINS
select DEPRECATED
default y

config BT_CTLR_SCAN_AUX_SYNC_RESERVE_MIN
bool "Use minimal Scan Auxiliary and Periodic Sync PDU time reservation"
depends on (BT_OBSERVER && BT_CTLR_ADV_EXT) || BT_CTLR_SYNC_PERIODIC
Expand Down
6 changes: 3 additions & 3 deletions tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6

# Increase the below to receive interleaved advertising chains
CONFIG_BT_CTLR_SCAN_AUX_SET=1
# CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
# CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=1
# CONFIG_BT_CTLR_SCAN_AUX_SET=1 # DEPRECATED
CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3

CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
CONFIG_BT_CTLR_ADV_ISO_RESERVE_MAX=y
Expand Down
4 changes: 3 additions & 1 deletion ...s/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
CONFIG_BT_CTLR_ADV_DATA_BUF_MAX=6

# Increase the below to receive interleaved advertising chains
CONFIG_BT_CTLR_SCAN_AUX_SET=1
# CONFIG_BT_CTLR_SCAN_AUX_SET=1 # DEPRECATED
CONFIG_BT_CTLR_SCAN_AUX_USE_CHAINS=y
CONFIG_BT_CTLR_SCAN_AUX_CHAIN_COUNT=3

CONFIG_BT_CTLR_ADV_RESERVE_MAX=n
CONFIG_BT_CTLR_CENTRAL_RESERVE_MAX=n
Expand Down
Loading