From 64d7e0d1b872d0d63d210330ad4eee290768add2 Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk Date: Wed, 22 Jan 2025 09:04:33 +0100 Subject: [PATCH] samples: matter: Fixed an issue with no available ACL buffers The default ACL RX buffers count changed, what leads to failures due to no available ACL buffers. Added CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 to bring back the same configuration that was used before. Signed-off-by: Kamil Kasperczyk --- .../matter_weather_station/sysbuild/ipc_radio/prj.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 4 ++++ .../boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 4 ++++ .../ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 4 ++++ .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 4 ++++ west.yml | 2 +- 19 files changed, 73 insertions(+), 1 deletion(-) diff --git a/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf b/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf index 2579e3a28fc8..5ccda89ef6aa 100644 --- a/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf +++ b/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf @@ -26,6 +26,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 40030bc700d2..c595604cea21 100644 --- a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index dda7ae100e65..9aa8903ed90d 100644 --- a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 40030bc700d2..c595604cea21 100644 --- a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index dda7ae100e65..9aa8903ed90d 100644 --- a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 40030bc700d2..c595604cea21 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf index d6c17700ccf3..cc6e788f8684 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf index 3945d35d2102..50b27513f643 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index dda7ae100e65..9aa8903ed90d 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf index dda7ae100e65..9aa8903ed90d 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index b7a504f7b887..5df075031318 100644 --- a/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 40030bc700d2..c595604cea21 100644 --- a/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/matter/template/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf index 3945d35d2102..50b27513f643 100644 --- a/samples/matter/template/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf +++ b/samples/matter/template/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index dda7ae100e65..9aa8903ed90d 100644 --- a/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 40030bc700d2..c595604cea21 100644 --- a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index dda7ae100e65..9aa8903ed90d 100644 --- a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 40030bc700d2..c595604cea21 100644 --- a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index dda7ae100e65..9aa8903ed90d 100644 --- a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -23,6 +23,10 @@ CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_BUF_ACL_TX_SIZE=251 + +# It is set based on BT_BUF_ACL_RX_COUNT_EXTRA = 6 - (BT_MAX_CONN + 1) +CONFIG_BT_BUF_ACL_RX_COUNT_EXTRA=4 + CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_PHY_2M=n diff --git a/west.yml b/west.yml index f910b0fd687b..60827f7696b3 100644 --- a/west.yml +++ b/west.yml @@ -159,7 +159,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: 7e94f1c336ed437c32d0dec80c72fa9f4f2ce3ee + revision: pull/537/head west-commands: scripts/west/west-commands.yml submodules: - name: nlio