From 290d0988d22a5590f666d6687697295e8fb53b13 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Thu, 13 Feb 2025 10:19:21 +0100 Subject: [PATCH] Bluetooth: Controller: Default to BT_CTLR_SCAN_AUX_USE_CHAINS BT_CTLR_SCAN_AUX_USE_CHAINS is alternative new design with less RAM usage for supporting Extended Scanning of simultaneous interleaved Extended Advertising chains. Switch Extended Scanning to default to BT_CTLR_SCAN_AUX_USE_CHAINS design in the Controller. Deprecate use of BT_CTLR_SCAN_AUX_SET. Signed-off-by: Vinayak Kariappa Chettimada --- doc/releases/release-notes-4.1.rst | 2 ++ .../nrf5340_cpunet_bis-bt_ll_sw_split.conf | 4 +++- .../nrf5340_cpunet_cis-bt_ll_sw_split.conf | 4 +++- .../nrf5340_cpunet_df-bt_ll_sw_split.conf | 4 +++- .../nrf5340_cpunet_iso-bt_ll_sw_split.conf | 6 ++--- .../hci_uart/overlay-all-bt_ll_sw_split.conf | 6 ++--- .../overlay-all-bt_ll_sw_split.conf | 6 ++--- .../bluetooth/controller/Kconfig.ll_sw_split | 24 ++++++++++++------- .../audio/overlay-bt_ll_sw_split.conf | 6 ++--- ...0_cpunet_iso_acl_group-bt_ll_sw_split.conf | 4 +++- 10 files changed, 42 insertions(+), 24 deletions(-) diff --git a/doc/releases/release-notes-4.1.rst b/doc/releases/release-notes-4.1.rst index 468f89ef21cb..0dc92a9b808a 100644 --- a/doc/releases/release-notes-4.1.rst +++ b/doc/releases/release-notes-4.1.rst @@ -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`). diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf index f58d44035a74..d4f6b3224025 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf @@ -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 diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf index db4705c7b1e2..8a03a34ebd86 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf @@ -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 diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf index 19adc889598c..845e9e2b5076 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf @@ -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 diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf index 6c28a4537e63..91841dae95bd 100644 --- a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf @@ -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 diff --git a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf index a4054de09345..c5815c37a068 100644 --- a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf @@ -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 diff --git a/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf index 8a0f9d3364ac..92f0dc08341d 100644 --- a/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf +++ b/samples/bluetooth/hci_uart_3wire/overlay-all-bt_ll_sw_split.conf @@ -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 diff --git a/subsys/bluetooth/controller/Kconfig.ll_sw_split b/subsys/bluetooth/controller/Kconfig.ll_sw_split index 69db98344602..b7d502849715 100644 --- a/subsys/bluetooth/controller/Kconfig.ll_sw_split +++ b/subsys/bluetooth/controller/Kconfig.ll_sw_split @@ -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 @@ -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 diff --git a/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf b/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf index a8dcadfbca64..6b289beac4d5 100644 --- a/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf +++ b/tests/bsim/bluetooth/audio/overlay-bt_ll_sw_split.conf @@ -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 diff --git a/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf b/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf index c43da5523ff9..a7fdbbdfcaf3 100644 --- a/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf +++ b/tests/bsim/bluetooth/ll/cis/sysbuild/hci_ipc/nrf5340_cpunet_iso_acl_group-bt_ll_sw_split.conf @@ -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