suit: Verify usage of SUIT IPUCs in dfu_target

Verify that it is possible to push IPUC_based updates using DFU target
module.

Ref: NCSDK-NONE

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

subsys/dfu/dfu_target/src/dfu_target_suit.c

@@ -15,6 +15,10 @@
 #endif
 #include <dfu/suit_dfu.h>
 
+#ifdef CONFIG_FLASH_IPUC
+#include <drivers/flash/flash_ipuc.h>
+#endif /* CONFIG_FLASH_IPUC */
+
 LOG_MODULE_REGISTER(dfu_target_suit, CONFIG_DFU_TARGET_LOG_LEVEL);
 
 #define IS_ALIGNED_32(POINTER) (((uintptr_t)(const void *)(POINTER)) % 4 == 0)
@@ -59,19 +63,40 @@ int dfu_target_suit_init(size_t file_size, int img_num, dfu_target_callback_t cb
 		return -ENODEV;
 	}
 
+	device_info.fdev = NULL;
 	if (ENVELOPE_IMAGE_NUMBER == img_num) {
 		/* Get info about dfu_partition to store the envelope */
 		err = suit_dfu_partition_device_info_get(&device_info);
 	} else {
+#ifdef CONFIG_FLASH_IPUC
+		device_info.partition_offset = 0;
+		device_info.erase_block_size = 1;
+		device_info.write_block_size = 1;
+		device_info.fdev = flash_image_ipuc_create(img_num, NULL, NULL,
+							   (uintptr_t *)&device_info.mapped_address,
+							   &device_info.partition_size);
+		if (device_info.fdev != NULL) {
+			LOG_INF("Found IPUC for image %d (0x%lx, 0x%x)", img_num,
+				(uintptr_t)device_info.mapped_address, device_info.partition_size);
+		}
+#endif /* CONFIG_FLASH_IPUC */
 #ifdef CONFIG_DFU_TARGET_SUIT_CACHE_PROCESSING
 		/* Cache partitions ids starts from 0, whereas image number 0 is reserved for
 		 * dfu_partition. Decrease img_num value by 1 to reach the correct DFU cache
 		 * partition id.
 		 */
-		err = suit_dfu_cache_rw_device_info_get(img_num - 1, &device_info);
-#else
-		return -ENOTSUP;
-#endif
+		if (device_info.fdev == NULL) {
+			err = suit_dfu_cache_rw_device_info_get(img_num - 1, &device_info);
+			if (device_info.fdev != NULL) {
+				LOG_INF("Found cache pool %d (0x%lx, 0x%x)", img_num - 1,
+					(uintptr_t)device_info.mapped_address,
+					device_info.partition_size);
+			}
+		}
+#endif /* CONFIG_DFU_TARGET_SUIT_CACHE_PROCESSING */
+		if (device_info.fdev == NULL) {
+			return -ENOTSUP;
+		}
 	}
 
 	if (err != SUIT_PLAT_SUCCESS) {
@@ -140,6 +165,9 @@ int dfu_target_suit_write(const void *const buf, size_t len)
 
 int dfu_target_suit_done(bool successful)
 {
+#ifdef CONFIG_FLASH_IPUC
+	struct stream_flash_ctx *stream = dfu_target_stream_get_stream();
+#endif /* CONFIG_FLASH_IPUC */
 	stream_flash_in_use = false;
 
 	int err = dfu_target_stream_done(successful);
@@ -156,6 +184,11 @@ int dfu_target_suit_done(bool successful)
 			LOG_ERR("suit_dfu_candidate_envelope_stored error %d", err);
 			return err;
 		}
+#ifdef CONFIG_FLASH_IPUC
+	} else {
+		flash_image_ipuc_release(image_num);
+		stream->fdev = NULL;
+#endif /* CONFIG_FLASH_IPUC */
 	}
 
 	if (successful) {
@@ -187,6 +220,9 @@ int dfu_target_suit_schedule_update(int img_num)
 
 int dfu_target_suit_reset(void)
 {
+#ifdef CONFIG_FLASH_IPUC
+	struct stream_flash_ctx *stream = dfu_target_stream_get_stream();
+#endif /* CONFIG_FLASH_IPUC */
 	int rc = dfu_target_stream_reset();
 
 	if (rc != 0) {
@@ -196,6 +232,11 @@ int dfu_target_suit_reset(void)
 
 	int err = suit_dfu_cleanup();
 
+#ifdef CONFIG_FLASH_IPUC
+	flash_image_ipuc_release(image_num);
+	stream->fdev = NULL;
+#endif /* CONFIG_FLASH_IPUC */
+
 	stream_flash_in_use = false;
 	stream_buf_bytes = 0;
 	image_num = 0;

tests/subsys/dfu/dfu_target/suit/CMakeLists.txt

@@ -16,5 +16,9 @@ target_sources(app PRIVATE ${app_sources})
 target_include_directories(app
   PRIVATE
   ${ZEPHYR_NRF_MODULE_DIR}/subsys/dfu/include
+  ${ZEPHYR_NRF_MODULE_DIR}/subsys/suit/ipuc/include
+  ${ZEPHYR_NRF_MODULE_DIR}/subsys/suit/memory_layout/include
   "src"
   )
+
+zephyr_compile_definitions(CONFIG_SOC_NRF54H20_CPUAPP)

tests/subsys/dfu/dfu_target/suit/Kconfig

@@ -7,10 +7,16 @@
 menuconfig TESTS_SUIT_DFU_TARGET_SUIT_CACHE_PROCESSING
 	bool "Run tests for processing of SUIT cache partition by the SUIT DFU target"
 	imply DFU_TARGET_SUIT_CACHE_PROCESSING
-	default n
 
 menuconfig TESTS_SUIT_DFU_TARGET_SUIT_SINGLE_PARTITION
 	bool "Run tests for processing of the dfu_partition only by the DFU target"
-	default n
+
+menuconfig TESTS_SUIT_DFU_TARGET_SUIT_CACHE_IPUC_PROCESSING
+	bool "Run tests for processing of SUIT cache IPUC-based partition by the SUIT DFU target"
+	imply DFU_TARGET_SUIT_CACHE_PROCESSING
+
+config SUIT_CACHE_SDFW_IPUC_ID
+	default 10
+	depends on TESTS_SUIT_DFU_TARGET_SUIT_CACHE_IPUC_PROCESSING
 
 source "Kconfig.zephyr"

tests/subsys/dfu/dfu_target/suit/boards/native_sim.overlay

@@ -25,6 +25,14 @@
 		dfu_cache_partition_3: partition@160000 {
 			reg = <0x160000 DT_SIZE_K(128)>;
 		};
+
+		dfu_target_img_31: cpurad_slot_a_partition: partition@80000 {
+			reg = <0x80000 DT_SIZE_K(4)>;
+		};
+
+		dfu_target_img_21: cpuapp_slot_a_partition: partition@190000 {
+			reg = <0x190000 DT_SIZE_K(4)>;
+		};
 	};
 };
 

tests/subsys/dfu/dfu_target/suit/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -43,6 +43,14 @@
 			reg = <0x160000 DT_SIZE_K(128)>;
 		};
 
+		dfu_target_img_31: cpurad_slot_a_partition: partition@80000 {
+			reg = <0x80000 DT_SIZE_K(4)>;
+		};
+
+		dfu_target_img_21: cpuapp_slot_a_partition: partition@190000 {
+			reg = <0x190000 DT_SIZE_K(4)>;
+		};
+
 		storage_partition: partition@1df000 {
 			reg = < 0x1df000 0x6000 >;
 		};

tests/subsys/dfu/dfu_target/suit/cache_ipuc_processing.conf

@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_TESTS_SUIT_DFU_TARGET_SUIT_CACHE_IPUC_PROCESSING=y
+CONFIG_SUIT_DFU_CANDIDATE_PROCESSING_PUSH_TO_CACHE=y
+
+CONFIG_FLASH_IPUC=y
+CONFIG_FLASH_IPUC_COUNT=5
+CONFIG_SUIT_IPUC=y
+CONFIG_SUIT_CACHE_SDFW_IPUC=y
+CONFIG_SUIT_CACHE_APP_IPUC=y