modules: tfm: Add configuration for TF-M log options

Add Kconfig options for configuring TF-M log options.
 - Partition log level
 - SPM log level
 - Exception info dump

Set log level to "info" which is the default in upstream TF-M.

Signed-off-by: Joakim Andersson <[email protected]>

Author: joerchan

modules/trusted-firmware-m/CMakeLists.txt

@@ -79,6 +79,36 @@ if (CONFIG_BUILD_WITH_TFM)
     list(APPEND TFM_CMAKE_ARGS -DMCUBOOT_IMAGE_NUMBER=${CONFIG_TFM_MCUBOOT_IMAGE_NUMBER})
   endif()
 
+  if (CONFIG_TFM_EXCEPTION_INFO_DUMP)
+    list(APPEND TFM_CMAKE_ARGS -DTFM_EXCEPTION_INFO_DUMP=ON)
+  else()
+    list(APPEND TFM_CMAKE_ARGS -DTFM_EXCEPTION_INFO_DUMP=OFF)
+  endif()
+
+  if (CONFIG_TFM_PARTITION_LOG_LEVEL_DEBUG)
+    set(TFM_PARTITION_LOG_LEVEL "TFM_PARTITION_LOG_LEVEL_DEBUG")
+  elseif (CONFIG_TFM_PARTITION_LOG_LEVEL_INFO)
+    set(TFM_PARTITION_LOG_LEVEL "TFM_PARTITION_LOG_LEVEL_INFO")
+  elseif (CONFIG_TFM_PARTITION_LOG_LEVEL_ERROR)
+    set(TFM_PARTITION_LOG_LEVEL "TFM_PARTITION_LOG_LEVEL_ERROR")
+  elseif (CONFIG_TFM_PARTITION_LOG_LEVEL_SILENCE)
+    set(TFM_PARTITION_LOG_LEVEL "TFM_PARTITION_LOG_LEVEL_SILENCE")
+  endif()
+
+  list(APPEND TFM_CMAKE_ARGS -DTFM_PARTITION_LOG_LEVEL=${TFM_PARTITION_LOG_LEVEL})
+
+  if (CONFIG_TFM_SPM_LOG_LEVEL_DEBUG)
+    set(TFM_SPM_LOG_LEVEL "TFM_SPM_LOG_LEVEL_DEBUG")
+  elseif (CONFIG_TFM_SPM_LOG_LEVEL_INFO)
+    set(TFM_SPM_LOG_LEVEL "TFM_SPM_LOG_LEVEL_INFO")
+  elseif (CONFIG_TFM_SPM_LOG_LEVEL_ERROR)
+    set(TFM_SPM_LOG_LEVEL "TFM_SPM_LOG_LEVEL_ERROR")
+  elseif (CONFIG_TFM_SPM_LOG_LEVEL_SILENCE)
+    set(TFM_SPM_LOG_LEVEL "TFM_PARTITION_LOG_LEVEL_SILENCE")
+  endif()
+
+  list(APPEND TFM_CMAKE_ARGS -DTFM_SPM_LOG_LEVEL=${TFM_SPM_LOG_LEVEL})
+
   # Enable TFM partitions as specified in Kconfig
   foreach(partition ${TFM_VALID_PARTITIONS})
     if (CONFIG_${partition})

modules/trusted-firmware-m/Kconfig.tfm

@@ -265,4 +265,23 @@ config TFM_FLASH_MERGED_BINARY
 		(if building with TFM_BL2 is enabled), and the
 		Non-Secure application firmware.
 
+choice TFM_SPM_LOG_LEVEL
+	prompt "TF-M SPM Log Level"
+	default TFM_SPM_LOG_LEVEL_INFO
+config TFM_SPM_LOG_LEVEL_DEBUG
+	bool "Debug"
+config TFM_SPM_LOG_LEVEL_INFO
+	bool "Info"
+config TFM_SPM_LOG_LEVEL_ERROR
+	bool "Error"
+config TFM_SPM_LOG_LEVEL_SILENCE
+	bool "Off"
+endchoice
+
+config TFM_EXCEPTION_INFO_DUMP
+	bool "TF-M exception info dump"
+	help
+	  On fatal errors in the secure firmware, capture info about the exception.
+	  Print the info if the SPM log level is sufficient.
+
 endif # BUILD_WITH_TFM

modules/trusted-firmware-m/Kconfig.tfm.partitions

@@ -74,4 +74,17 @@ config TFM_PARTITION_AUDIT_LOG
 	  Note: the Audit Log service does not implement the IPC model
 	  interface so it may not be enabled together with IPC option.
 
+choice TFM_PARTITION_LOG_LEVEL
+	prompt "TF-M Partition Log Level"
+	default TFM_PARTITION_LOG_LEVEL_INFO
+config TFM_PARTITION_LOG_LEVEL_DEBUG
+	bool "Debug"
+config TFM_PARTITION_LOG_LEVEL_INFO
+	bool "Info"
+config TFM_PARTITION_LOG_LEVEL_ERROR
+	bool "Error"
+config TFM_PARTITION_LOG_LEVEL_SILENCE
+	bool "Off"
+endchoice
+
 endif # BUILD_WITH_TFM