samples: matter: Remove workaround after fixing nrf_security

ArekBalysNordic · rlubos · commit 7c7ae95dd1c2 · 2024-10-25T17:38:22.000+02:00
We can use MBEDTLS_THREADING_C again since nrf_security threading issue has been fixed on nRF54L. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no> (cherry picked from commit d290578)
diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -14,10 +14,6 @@ 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: Disable MBEDTLS threading, as in the Mbed TLS 3.6.x the mutexes were added, what sometimes
-# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
-# This brings back the behavior that was proven to work before.
-CONFIG_MBEDTLS_THREADING_C=n
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.
 # It should be removed once the proper fix will be applied in Zephyr.
 CONFIG_NVS=n
diff --git a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -19,8 +19,3 @@ CONFIG_NVS=n
 
 # Low Power mode
 CONFIG_POWEROFF=y
-
-# Workaround: Disable MBEDTLS threading, as in the Mbed TLS 3.6.x the mutexes were added, what sometimes
-# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
-# This brings back the behavior that was proven to work before.
-CONFIG_MBEDTLS_THREADING_C=n
diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -19,8 +19,3 @@ CONFIG_NVS=n
 
 # Low Power mode
 CONFIG_POWEROFF=y
-
-# Workaround: Disable MBEDTLS threading, as in the Mbed TLS 3.6.x the mutexes were added, what sometimes
-# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
-# This brings back the behavior that was proven to work before.
-CONFIG_MBEDTLS_THREADING_C=n
diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -19,8 +19,3 @@ CONFIG_NVS=n
 
 # Low Power mode
 CONFIG_POWEROFF=y
-
-# Workaround: Disable MBEDTLS threading, as in the Mbed TLS 3.6.x the mutexes were added, what sometimes
-# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
-# This brings back the behavior that was proven to work before.
-CONFIG_MBEDTLS_THREADING_C=n
diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -14,10 +14,6 @@ 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: Disable MBEDTLS threading, as in the Mbed TLS 3.6.x the mutexes were added, what sometimes
-# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
-# This brings back the behavior that was proven to work before.
-CONFIG_MBEDTLS_THREADING_C=n
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.
 # It should be removed once the proper fix will be applied in Zephyr.
 CONFIG_NVS=n
diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf
@@ -52,8 +52,3 @@ CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
 # Enable LTO
 CONFIG_LTO=y
 CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
-
-# Workaround: Disable MBEDTLS threading, as in the Mbed TLS 3.6.x the mutexes were added, what sometimes
-# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
-# This brings back the behavior that was proven to work before.
-CONFIG_MBEDTLS_THREADING_C=n
diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -14,10 +14,6 @@ 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: Disable MBEDTLS threading, as in the Mbed TLS 3.6.x the mutexes were added, what sometimes
-# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
-# This brings back the behavior that was proven to work before.
-CONFIG_MBEDTLS_THREADING_C=n
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.
 # It should be removed once the proper fix will be applied in Zephyr.
 CONFIG_NVS=n
diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -19,8 +19,3 @@ CONFIG_NVS=n
 
 # Low Power mode
 CONFIG_POWEROFF=y
-
-# Workaround: Disable MBEDTLS threading, as in the Mbed TLS 3.6.x the mutexes were added, what sometimes
-# leads to bus faults when OpenThread calls psa_get_and_lock_key_slot on SRP service removal.
-# This brings back the behavior that was proven to work before.
-CONFIG_MBEDTLS_THREADING_C=n
