suit: Do not include IPUC cache if it is not used

UCI should not include all possible SUIT cache IPUCs, but only those,
that were initialized.

Ref: NCSDK-NONE

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

Author: tomchy

subsys/suit/cache/include/suit_dfu_cache_rw.h

@@ -114,6 +114,14 @@ suit_plat_err_t suit_dfu_cache_drop_content(void);
 suit_plat_err_t suit_dfu_cache_rw_device_info_get(uint8_t cache_partition_id,
 						  struct suit_nvm_device_info *device_info);
 
+/**
+ * @brief Gets information about characteristics of active cache partition
+ *
+ * @return suit_plat_success on success, error code otherwise.
+ */
+suit_plat_err_t suit_dfu_cache_rw_active_device_info_get(uint8_t cache_partition_id,
+							 struct suit_nvm_device_info *device_info);
+
 #ifdef __cplusplus
 }
 #endif

subsys/suit/cache/src/suit_dfu_cache_rw.c

@@ -571,6 +571,18 @@ suit_plat_err_t suit_dfu_cache_rw_device_info_get(uint8_t cache_partition_id,
 	return SUIT_PLAT_ERR_INVAL;
 }
 
+suit_plat_err_t suit_dfu_cache_rw_active_device_info_get(uint8_t cache_partition_id,
+							 struct suit_nvm_device_info *device_info)
+{
+	suit_plat_err_t ret = suit_dfu_cache_rw_device_info_get(cache_partition_id, device_info);
+
+	if ((ret == SUIT_PLAT_SUCCESS) && (device_info->fdev == NULL)) {
+		return SUIT_PLAT_ERR_NOT_FOUND;
+	}
+
+	return ret;
+}
+
 suit_plat_err_t suit_dfu_cache_rw_slot_create(uint8_t cache_partition_id,
 					      struct suit_cache_slot *slot, const uint8_t *uri,
 					      size_t uri_size)

subsys/suit/orchestrator_app/src/suit_orchestrator_app.c

@@ -240,24 +240,26 @@ int suit_dfu_update_start(void)
 	struct suit_nvm_device_info device_info;
 
 	for (size_t i = 0; i < CONFIG_SUIT_CACHE_MAX_CACHES; i++) {
-		if (suit_dfu_cache_rw_device_info_get(i, &device_info) == SUIT_PLAT_SUCCESS) {
-
+		if (suit_dfu_cache_rw_active_device_info_get(i, &device_info) ==
+		    SUIT_PLAT_SUCCESS) {
 			update_candidate[update_regions_count].mem = device_info.mapped_address;
 			update_candidate[update_regions_count].size = device_info.partition_size;
 			update_regions_count++;
 		}
 	}
 
-#ifdef CONFIG_SUIT_CACHE_SDFW_IPUC_ID
-	if (suit_dfu_cache_rw_device_info_get(CONFIG_SUIT_CACHE_SDFW_IPUC_ID, &device_info) ==
-	    SUIT_PLAT_SUCCESS) {
+#if defined(CONFIG_SUIT_CACHE_SDFW_IPUC_ID) &&                                                     \
+	(CONFIG_SUIT_CACHE_SDFW_IPUC_ID >= CONFIG_SUIT_CACHE_MAX_CACHES)
+	if (suit_dfu_cache_rw_active_device_info_get(CONFIG_SUIT_CACHE_SDFW_IPUC_ID,
+						     &device_info) == SUIT_PLAT_SUCCESS) {
 		update_candidate[update_regions_count].mem = device_info.mapped_address;
 		update_candidate[update_regions_count].size = device_info.partition_size;
 		update_regions_count++;
 	}
 #endif /* CONFIG_SUIT_CACHE_SDFW_IPUC_ID */
-#ifdef CONFIG_SUIT_CACHE_APP_IPUC_ID
-	if (suit_dfu_cache_rw_device_info_get(CONFIG_SUIT_CACHE_APP_IPUC_ID, &device_info) ==
+#if defined(CONFIG_SUIT_CACHE_APP_IPUC_ID) &&                                                      \
+	(CONFIG_SUIT_CACHE_APP_IPUC_ID >= CONFIG_SUIT_CACHE_MAX_CACHES)
+	if (suit_dfu_cache_rw_active_device_info_get(CONFIG_SUIT_CACHE_APP_IPUC_ID, &device_info) ==
 	    SUIT_PLAT_SUCCESS) {
 		update_candidate[update_regions_count].mem = device_info.mapped_address;
 		update_candidate[update_regions_count].size = device_info.partition_size;