[nrf noup] Fix issue with stack sizes

The stack sizes are too low when Oberon and CC3XX driver are enabled.
nrfconnect · Mar 11, 2024 · 7653e6c · 7653e6c
1 parent 33ec94f
commit 7653e6c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -229,6 +229,7 @@ config IEEE802154_NRF5_RX_STACK_SIZE
     default 1024
 
 config OPENTHREAD_THREAD_STACK_SIZE
+    default 6144 if PSA_CRYPTO_DRIVER_CC3XX && PSA_CRYPTO_DRIVER_OBERON
     default 4096
 
 config OPENTHREAD_DEFAULT_TX_POWER
@@ -318,6 +319,14 @@ config PSA_WANT_ALG_SHA_224
 config MBEDTLS_PSA_KEY_SLOT_COUNT
     default 64
 
+if PSA_CRYPTO_DRIVER_CC3XX && PSA_CRYPTO_DRIVER_OBERON
+
+# Do not use CC3XX hash driver when both Oberon and CC3xx are enabled.
+config PSA_USE_CC3XX_HASH_DRIVER
+    default n
+
+endif
+
 endif
 
 if !CHIP_CRYPTO_PSA

diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
@@ -215,7 +215,7 @@
 #endif // CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY
 
 #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE
-#ifdef CONFIG_LTO
+#if defined(CONFIG_LTO) || (defined(CONFIG_PSA_CRYPTO_DRIVER_CC3XX) && defined(CONFIG_PSA_CRYPTO_DRIVER_OBERON))
 #define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 8192
 #else
 #define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE 6144