From aa5aa6b89f4708c0f5f4c98e1223c52b45ea8397 Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Wed, 11 Dec 2024 09:55:40 +0100 Subject: [PATCH 1/3] manifest: Update sdk-zephyr revision Update sdk-zephyr revision to pull in https://github.com/nrfconnect/sdk-zephyr/pull/2353 Signed-off-by: Pavel Vasilyev --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index e71c4aaf2d4b..d97c30e76591 100644 --- a/west.yml +++ b/west.yml @@ -69,7 +69,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: ba1d06f7241c1a899b43bdef7b731fa244646a2f + revision: 7f8d857bf1f57b07e832d52263beaa23c91fef24 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 34913ec43d5561d31f3591c8ec80591f622be4f3 Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Wed, 11 Dec 2024 09:56:43 +0100 Subject: [PATCH 2/3] samples: Remove BT_BUF_ACL_RX_COUNT BT_BUF_ACL_RX has been deprecated in https://github.com/zephyrproject-rtos/zephyr/pull/81747 It is now by default equal to BT_MAX_CONN + 1. Signed-off-by: Pavel Vasilyev --- applications/matter_bridge/Kconfig | 4 ---- .../matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.conf | 3 --- .../matter_bridge/overlay-bt_max_connections_app.conf | 3 --- .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 3 --- .../sysbuild/ipc_radio/overlay-bt_max_connections_net.conf | 3 --- applications/matter_bridge/sysbuild/ipc_radio/prj.conf | 3 --- .../bluetooth/peripheral_with_multiple_identities/prj.conf | 1 - samples/bluetooth/scanning_while_connecting/prj.conf | 1 - 8 files changed, 21 deletions(-) diff --git a/applications/matter_bridge/Kconfig b/applications/matter_bridge/Kconfig index 31117458c1c8..9ddeab5d0db3 100644 --- a/applications/matter_bridge/Kconfig +++ b/applications/matter_bridge/Kconfig @@ -82,10 +82,6 @@ config BT_SCAN config BT_MAX_CONN default 10 -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -config BT_BUF_ACL_RX_COUNT - default 11 - config BT_SCAN_FILTER_ENABLE default y diff --git a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.conf b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.conf index 48808c740b35..3cd450ba2ff8 100644 --- a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.conf +++ b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -7,9 +7,6 @@ # Set 10 BLE connections, as it is an upper limit supported caused by RAM usage due to using Thread and BLE at same time. CONFIG_BT_MAX_CONN=10 -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -CONFIG_BT_BUF_ACL_RX_COUNT=11 - # Set buffer sizes in a consistent way with the ones used by the network core. #id if oncomment it there is an error that rx buffer is out of range (minimal value is 69) CONFIG_BT_BUF_ACL_RX_SIZE=69 diff --git a/applications/matter_bridge/overlay-bt_max_connections_app.conf b/applications/matter_bridge/overlay-bt_max_connections_app.conf index a7a28b3b0514..83de533d7cd6 100644 --- a/applications/matter_bridge/overlay-bt_max_connections_app.conf +++ b/applications/matter_bridge/overlay-bt_max_connections_app.conf @@ -7,9 +7,6 @@ # Set 20 BLE connections, as it is an upper limit supported by the Soft Device Controller. CONFIG_BT_MAX_CONN=20 -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -CONFIG_BT_BUF_ACL_RX_COUNT=21 - # Set buffer sizes in a consistent way with the ones used by the network core. CONFIG_BT_BUF_ACL_RX_SIZE=84 CONFIG_BT_BUF_ACL_TX_SIZE=84 diff --git a/applications/matter_bridge/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/applications/matter_bridge/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index f374982e3a69..4b4bc4779acc 100644 --- a/applications/matter_bridge/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/applications/matter_bridge/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -7,9 +7,6 @@ # Set 10 BLE connections, as it is an upper limit supported caused by RAM usage due to using Thread and BLE at same time. CONFIG_BT_MAX_CONN=10 -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -CONFIG_BT_BUF_ACL_RX_COUNT=11 - # Decrease stack and buffer sizes to free some RAM and support 10 BLE connections CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 diff --git a/applications/matter_bridge/sysbuild/ipc_radio/overlay-bt_max_connections_net.conf b/applications/matter_bridge/sysbuild/ipc_radio/overlay-bt_max_connections_net.conf index 52966d80e502..37aecb94e2cc 100644 --- a/applications/matter_bridge/sysbuild/ipc_radio/overlay-bt_max_connections_net.conf +++ b/applications/matter_bridge/sysbuild/ipc_radio/overlay-bt_max_connections_net.conf @@ -7,9 +7,6 @@ # Set 20 BLE connections, as it is an upper limit supported by the Soft Device Controller CONFIG_BT_MAX_CONN=20 -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -CONFIG_BT_BUF_ACL_RX_COUNT=21 - # Decrease stack and buffer sizes to free some RAM and support 20 BLE connections CONFIG_MAIN_STACK_SIZE=512 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 diff --git a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf b/applications/matter_bridge/sysbuild/ipc_radio/prj.conf index 53027640a46b..d2a5c115037a 100644 --- a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf +++ b/applications/matter_bridge/sysbuild/ipc_radio/prj.conf @@ -27,9 +27,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n -# Set ACL RX count to CONFIG_BT_MAX_CONN + 1, as it is expected that CONFIG_BT_BUF_ACL_RX_COUNT > CONFIG_BT_MAX_CONN. -CONFIG_BT_BUF_ACL_RX_COUNT=11 - # Debug and assert configuration CONFIG_ASSERT=y CONFIG_DEBUG_INFO=y diff --git a/samples/bluetooth/peripheral_with_multiple_identities/prj.conf b/samples/bluetooth/peripheral_with_multiple_identities/prj.conf index 67d478632a6e..c2a5bd25b051 100644 --- a/samples/bluetooth/peripheral_with_multiple_identities/prj.conf +++ b/samples/bluetooth/peripheral_with_multiple_identities/prj.conf @@ -14,4 +14,3 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n CONFIG_BT_EXT_ADV_MAX_ADV_SET=20 CONFIG_BT_MAX_CONN=20 CONFIG_BT_ID_MAX=20 -CONFIG_BT_BUF_ACL_RX_COUNT=21 diff --git a/samples/bluetooth/scanning_while_connecting/prj.conf b/samples/bluetooth/scanning_while_connecting/prj.conf index f2f8f481a5fc..a993513bbe08 100644 --- a/samples/bluetooth/scanning_while_connecting/prj.conf +++ b/samples/bluetooth/scanning_while_connecting/prj.conf @@ -20,4 +20,3 @@ CONFIG_BT_CTLR_FAL_SIZE=255 CONFIG_LOG=y CONFIG_BT_MAX_CONN=16 -CONFIG_BT_BUF_ACL_RX_COUNT=17 From dc92ed9c38255e6600f45561e8f6b3966480322c Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Thu, 12 Dec 2024 11:05:33 +0100 Subject: [PATCH 3/3] manifest: Update sidewalk revision Pull in CONFIG_BT_BUF_ACL_RX_COUNT change in sdk-sidewalk. Signed-off-by: Pavel Vasilyev --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index d97c30e76591..1e33bdd2397b 100644 --- a/west.yml +++ b/west.yml @@ -206,7 +206,7 @@ manifest: compare-by-default: false - name: sidewalk repo-path: sdk-sidewalk - revision: 1a811c356150a4ccc58d644d110524c33342e3a1 + revision: f274ce8ab97d1504de4c6b372bb98d4dc41bacc5 groups: - sidewalk - name: find-my