From 8571f6125571714ca0a889a32914eeb7a880aa39 Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk Date: Fri, 17 Jan 2025 13:52:00 +0100 Subject: [PATCH 1/2] samples: matter: Added nullptr checks after memory allocation In few places there are missing nullptr checks, what can lead to using not allocated memory. Signed-off-by: Kamil Kasperczyk --- .../common/src/binding/binding_handler.cpp | 1 + .../light_switch/src/shell_commands.cpp | 114 ++++++++++-------- .../src/temperature_measurement/sensor.cpp | 10 +- 3 files changed, 73 insertions(+), 52 deletions(-) diff --git a/samples/matter/common/src/binding/binding_handler.cpp b/samples/matter/common/src/binding/binding_handler.cpp index 319c37aa4666..0804da0a625e 100644 --- a/samples/matter/common/src/binding/binding_handler.cpp +++ b/samples/matter/common/src/binding/binding_handler.cpp @@ -31,6 +31,7 @@ namespace Nrf::Matter void BindingHandler::OnInvokeCommandSucces(BindingData *bindingData) { + VerifyOrReturn(bindingData != nullptr, LOG_ERR("Invalid binding data")); LOG_DBG("Binding command applied successfully!"); /* If session was recovered and communication works, reset flag to the initial state. */ diff --git a/samples/matter/light_switch/src/shell_commands.cpp b/samples/matter/light_switch/src/shell_commands.cpp index 43639e596fe9..af31e1991caf 100644 --- a/samples/matter/light_switch/src/shell_commands.cpp +++ b/samples/matter/light_switch/src/shell_commands.cpp @@ -67,42 +67,51 @@ namespace Unicast { Nrf::Matter::BindingHandler::BindingData *data = Platform::New(); - data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); - data->CommandId = Clusters::OnOff::Commands::On::Id; - data->ClusterId = Clusters::OnOff::Id; - data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; - data->IsGroup.SetValue(false); - - Nrf::Matter::BindingHandler::RunBoundClusterAction(data); - return CHIP_NO_ERROR; + if (data) { + data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); + data->CommandId = Clusters::OnOff::Commands::On::Id; + data->ClusterId = Clusters::OnOff::Id; + data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; + data->IsGroup.SetValue(false); + + Nrf::Matter::BindingHandler::RunBoundClusterAction(data); + return CHIP_NO_ERROR; + } + return CHIP_ERROR_NO_MEMORY; } static CHIP_ERROR OffCommandHandler(int argc, char **argv) { Nrf::Matter::BindingHandler::BindingData *data = Platform::New(); - data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); - data->CommandId = Clusters::OnOff::Commands::Off::Id; - data->ClusterId = Clusters::OnOff::Id; - data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; - data->IsGroup.SetValue(false); - - Nrf::Matter::BindingHandler::RunBoundClusterAction(data); - return CHIP_NO_ERROR; + if (data) { + data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); + data->CommandId = Clusters::OnOff::Commands::Off::Id; + data->ClusterId = Clusters::OnOff::Id; + data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; + data->IsGroup.SetValue(false); + + Nrf::Matter::BindingHandler::RunBoundClusterAction(data); + return CHIP_NO_ERROR; + } + return CHIP_ERROR_NO_MEMORY; } static CHIP_ERROR ToggleCommandHandler(int argc, char **argv) { Nrf::Matter::BindingHandler::BindingData *data = Platform::New(); - data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); - data->CommandId = Clusters::OnOff::Commands::Toggle::Id; - data->ClusterId = Clusters::OnOff::Id; - data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; - data->IsGroup.SetValue(false); - - Nrf::Matter::BindingHandler::RunBoundClusterAction(data); - return CHIP_NO_ERROR; + if (data) { + data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); + data->CommandId = Clusters::OnOff::Commands::Toggle::Id; + data->ClusterId = Clusters::OnOff::Id; + data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; + data->IsGroup.SetValue(false); + + Nrf::Matter::BindingHandler::RunBoundClusterAction(data); + return CHIP_NO_ERROR; + } + return CHIP_ERROR_NO_MEMORY; } } /* namespace Unicast */ @@ -142,42 +151,51 @@ namespace Group { Nrf::Matter::BindingHandler::BindingData *data = Platform::New(); - data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); - data->CommandId = Clusters::OnOff::Commands::On::Id; - data->ClusterId = Clusters::OnOff::Id; - data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; - data->IsGroup.SetValue(true); - - Nrf::Matter::BindingHandler::RunBoundClusterAction(data); - return CHIP_NO_ERROR; + if (data) { + data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); + data->CommandId = Clusters::OnOff::Commands::On::Id; + data->ClusterId = Clusters::OnOff::Id; + data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; + data->IsGroup.SetValue(true); + + Nrf::Matter::BindingHandler::RunBoundClusterAction(data); + return CHIP_NO_ERROR; + } + return CHIP_ERROR_NO_MEMORY; } CHIP_ERROR OffCommandHandler(int argc, char **argv) { Nrf::Matter::BindingHandler::BindingData *data = Platform::New(); - data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); - data->CommandId = Clusters::OnOff::Commands::Off::Id; - data->ClusterId = Clusters::OnOff::Id; - data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; - data->IsGroup.SetValue(true); - - Nrf::Matter::BindingHandler::RunBoundClusterAction(data); - return CHIP_NO_ERROR; + if (data) { + data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); + data->CommandId = Clusters::OnOff::Commands::Off::Id; + data->ClusterId = Clusters::OnOff::Id; + data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; + data->IsGroup.SetValue(true); + + Nrf::Matter::BindingHandler::RunBoundClusterAction(data); + return CHIP_NO_ERROR; + } + return CHIP_ERROR_NO_MEMORY; } CHIP_ERROR ToggleCommandHandler(int argc, char **argv) { Nrf::Matter::BindingHandler::BindingData *data = Platform::New(); - data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); - data->CommandId = Clusters::OnOff::Commands::Toggle::Id; - data->ClusterId = Clusters::OnOff::Id; - data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; - data->IsGroup.SetValue(true); - - Nrf::Matter::BindingHandler::RunBoundClusterAction(data); - return CHIP_NO_ERROR; + if (data) { + data->EndpointId = LightSwitch::GetInstance().GetLightSwitchEndpointId(); + data->CommandId = Clusters::OnOff::Commands::Toggle::Id; + data->ClusterId = Clusters::OnOff::Id; + data->InvokeCommandFunc = LightSwitch::SwitchChangedHandler; + data->IsGroup.SetValue(true); + + Nrf::Matter::BindingHandler::RunBoundClusterAction(data); + return CHIP_NO_ERROR; + } + return CHIP_ERROR_NO_MEMORY; } } /* namespace Group */ diff --git a/samples/matter/thermostat/src/temperature_measurement/sensor.cpp b/samples/matter/thermostat/src/temperature_measurement/sensor.cpp index 49b7214409e4..e365a122c9a9 100644 --- a/samples/matter/thermostat/src/temperature_measurement/sensor.cpp +++ b/samples/matter/thermostat/src/temperature_measurement/sensor.cpp @@ -85,10 +85,12 @@ void TemperatureSensor::InternalMeasurement() void TemperatureSensor::ExternalMeasurement() { Nrf::Matter::BindingHandler::BindingData *data = Platform::New(); - data->ClusterId = Clusters::TemperatureMeasurement::Id; - data->EndpointId = mTemperatureMeasurementEndpointId; - data->InvokeCommandFunc = ExternalTemperatureMeasurementReadHandler; - BindingHandler::RunBoundClusterAction(data); + if (data) { + data->ClusterId = Clusters::TemperatureMeasurement::Id; + data->EndpointId = mTemperatureMeasurementEndpointId; + data->InvokeCommandFunc = ExternalTemperatureMeasurementReadHandler; + BindingHandler::RunBoundClusterAction(data); + } } void TemperatureSensor::ExternalTemperatureMeasurementReadHandler(const EmberBindingTableEntry &binding, From fa1888eae4547b710c9d1ee364fe4d7bff8c51d2 Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk Date: Mon, 20 Jan 2025 11:42:49 +0100 Subject: [PATCH 2/2] samples: matter: Moved the common configs to the defauls Removed the common mpsl stack size config to the Kconfig.defaults. Additionally removed some configuration leftover for the 54L10. Signed-off-by: Kamil Kasperczyk --- .../matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 3 --- .../light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 3 --- samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 3 --- .../smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 ---- .../smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 ---- .../matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf | 3 --- .../matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 3 --- .../matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 3 --- .../window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 3 --- west.yml | 2 +- 17 files changed, 1 insertion(+), 51 deletions(-) diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 5f9d536d95ca..56ffa14520e2 100644 --- a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 4a3879d67217..48281dc5eea4 100644 --- a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -13,9 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build. CONFIG_CHIP_NFC_COMMISSIONING=n -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 327b20cd47ae..95a4004aca0b 100644 --- a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 4a3879d67217..48281dc5eea4 100644 --- a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -13,9 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build. CONFIG_CHIP_NFC_COMMISSIONING=n -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 327b20cd47ae..95a4004aca0b 100644 --- a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 4a3879d67217..48281dc5eea4 100644 --- a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -13,9 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build. CONFIG_CHIP_NFC_COMMISSIONING=n -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 892132f2383c..95a4004aca0b 100644 --- a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -7,10 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240 -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 327b20cd47ae..95a4004aca0b 100644 --- a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 86a6b3286ef1..56ffa14520e2 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -7,10 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240 -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 5f9d536d95ca..56ffa14520e2 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf index 548e2e575b29..f21fcacadd6e 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index ab61a76852e6..9fc3e5f5d76a 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -10,9 +10,6 @@ CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y # TODO: Workaround to be removed once Zephyr's CONFIG_FPROTECT is supported on nRF54L_ns CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 5f9d536d95ca..56ffa14520e2 100644 --- a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 4a3879d67217..48281dc5eea4 100644 --- a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -13,9 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build. CONFIG_CHIP_NFC_COMMISSIONING=n -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 327b20cd47ae..95a4004aca0b 100644 --- a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 4a3879d67217..48281dc5eea4 100644 --- a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -13,9 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build. CONFIG_CHIP_NFC_COMMISSIONING=n -# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families -CONFIG_MPSL_WORK_STACK_SIZE=2048 - # Set the ZMS sector count to match the settings partition size that is 40 kB for this application. CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # Workaround required as Zephyr L2 implies usage of NVS backend for settings. diff --git a/west.yml b/west.yml index 6c9522301ecb..2fea78a7c3bd 100644 --- a/west.yml +++ b/west.yml @@ -159,7 +159,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: 36d3ddf55de6cb700e859af8a519253fa7dd7712 + revision: 7e94f1c336ed437c32d0dec80c72fa9f4f2ce3ee west-commands: scripts/west/west-commands.yml submodules: - name: nlio