modules: trusted-firmware-m: add MRAMC service

modules/trusted-firmware-m/CMakeLists.txt

@@ -107,6 +107,7 @@ set_property(TARGET zephyr_property_target
   $<$<BOOL:${CONFIG_IDENTITY_KEY_TFM}>:-DCONFIG_IDENTITY_KEY_TFM=ON>
   $<$<BOOL:${CONFIG_TFM_PS_SUPPORT_FORMAT_TRANSITION}>:-DPS_SUPPORT_FORMAT_TRANSITION=ON>
   $<$<BOOL:${CONFIG_TFM_NRF_SYSTEM_OFF_SERVICE}>:-DTFM_NRF_SYSTEM_OFF_SERVICE=ON>
+  $<$<BOOL:${CONFIG_TFM_NRF_MRAMC_SERVICE}>:-DTFM_NRF_MRAMC_SERVICE=ON>
   $<$<BOOL:${CONFIG_NRF91_ANOMALY_36_WORKAROUND}>:-DCONFIG_NRF91_ANOMALY_36_WORKAROUND=ON>
   -DTFM_MCUBOOT_OFFSET=${CONFIG_TFM_MCUBOOT_HEADER_SIZE}
 )

modules/trusted-firmware-m/Kconfig

@@ -562,4 +562,13 @@ config TFM_HAS_B0N
 	bool "Network core bootloader present (informative only, do not change)"
 	depends on SOC_SERIES_NRF53
 
+config TFM_NRF_MRAMC_SERVICE
+	bool "TF-M MRAMC service"
+	default y if SOC_FLASH_NRF_MRAMC && BUILD_WITH_TFM
+	depends on SOC_NRF7120
+	help
+	  Provide a MRAMC service for the nRF7120 SoC.
+	  This service allows the non-secure application to request
+	  the system to configure MRAMC using a secure service call.
+
 endif # BUILD_WITH_TFM

modules/trusted-firmware-m/tfm_boards/src/tfm_platform_system.c

@@ -151,6 +151,12 @@ enum tfm_platform_err_t tfm_platform_hal_ioctl(tfm_platform_ioctl_req_t request,
 	case TFM_PLATFORM_IOCTL_GPIO_SERVICE:
 		return tfm_platform_hal_gpio_service(in_vec, out_vec);
 #endif /* defined(GPIO_PIN_CNF_MCUSEL_Msk) */
+#if TFM_NRF_MRAMC_SERVICE
+	case TFM_PLATFORM_IOCTL_MRAMC_INIT_SERVICE:
+		return tfm_platform_hal_mramc_init_service();
+	case TFM_PLATFORM_IOCTL_MRAMC_SET_WEN_SERVICE:
+		return tfm_platform_hal_mramc_set_wen_service(in_vec);
+#endif
 
 		/* Board specific IOCTL services */
 #if CONFIG_FW_INFO

west.yml

@@ -148,7 +148,7 @@ manifest:
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m
-      revision: 7c7180bd5ac51bea384adfb6bd98979f948b692c
+      revision: e45f5f8c5b4f12843be48e136e6bcf143fa1cc5e
     - name: psa-arch-tests
       repo-path: sdk-psa-arch-tests
       path: modules/tee/tf-m/psa-arch-tests