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 <[email protected]>
nrfconnect · Jan 22, 2025 · 93a80d0 · 93a80d0
1 parent 1e301e4
commit 93a80d0
Show file tree

Hide file tree

Showing 19 changed files with 73 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf b/.../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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -159,7 +159,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: 7e94f1c336ed437c32d0dec80c72fa9f4f2ce3ee
+      revision: 3fca89a5c90ac1c88f6a94a21451cb7ff6b7b21b
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio