suit: Pass manifest component ID to set size

tomchy · tomchy · commit e065a2aa6b75 · 2025-02-10T09:39:39.000+01:00
Pass manifest component ID while setting component size parameter, so
the IPUC can be declared with the corresponding manifest role.

Ref: NCSDK-31343

Signed-off-by: Tomasz Chyrowicz &lt;tomasz.chyrowicz@nordicsemi.no&gt;
diff --git a/subsys/suit/platform/CMakeLists.txt b/subsys/suit/platform/CMakeLists.txt
@@ -37,6 +37,7 @@ zephyr_library_link_libraries_ifdef(CONFIG_SUIT_SINK_SELECTOR suit_sink_selector
 zephyr_library_link_libraries_ifdef(CONFIG_SUIT_STREAM_FILTER_DECRYPT suit_stream_filters_interface)
 zephyr_library_link_libraries_ifdef(CONFIG_SUIT_MANIFEST_VARIABLES suit_manifest_variables)
 zephyr_library_link_libraries_ifdef(CONFIG_SUIT_IPUC suit_ipuc)
+zephyr_library_link_libraries_ifdef(CONFIG_SUIT_STORAGE suit_storage_interface)
 
 if(CONFIG_SUIT_PLATFORM_VARIANT_APP)
 	add_subdirectory(app)
diff --git a/subsys/suit/platform/src/suit_plat_components.c b/subsys/suit/platform/src/suit_plat_components.c
@@ -12,6 +12,7 @@
 
 #if defined(CONFIG_SUIT_IPUC) && defined(CONFIG_SUIT_PLATFORM_VARIANT_SDFW)
 #include <suit_ipuc_sdfw.h>
+#include <suit_storage_mpi.h>
 #endif
 
 LOG_MODULE_REGISTER(plat_components, CONFIG_SUIT_LOG_LEVEL);
@@ -215,7 +216,8 @@ int suit_plat_component_id_get(suit_component_t handle, struct zcbor_string **co
 	return SUIT_SUCCESS;
 }
 
-int suit_plat_override_image_size(suit_component_t handle, size_t size)
+int suit_plat_override_image_size(suit_component_t handle, size_t size,
+				  struct zcbor_string *manifest_component_id)
 {
 	struct zcbor_string *component_id = NULL;
 
@@ -233,6 +235,21 @@ int suit_plat_override_image_size(suit_component_t handle, size_t size)
 		return SUIT_ERR_DECODING;
 	}
 
+#if defined(CONFIG_SUIT_IPUC) && defined(CONFIG_SUIT_PLATFORM_VARIANT_SDFW)
+	suit_manifest_class_id_t *class_id = NULL;
+	suit_manifest_role_t role = SUIT_MANIFEST_UNKNOWN;
+
+	if (suit_plat_decode_manifest_class_id(manifest_component_id, &class_id) !=
+	    SUIT_PLAT_SUCCESS) {
+		LOG_ERR("Component ID is not a manifest class");
+		return SUIT_ERR_UNSUPPORTED_COMPONENT_ID;
+	}
+
+	if (suit_storage_mpi_role_get(class_id, &role) != SUIT_PLAT_SUCCESS) {
+		return SUIT_ERR_UNSUPPORTED_COMPONENT_ID;
+	}
+#endif
+
 	/* Size override is done only for MEM type component */
 	if (component_type == SUIT_COMPONENT_TYPE_MEM) {
 		intptr_t run_address;
@@ -277,8 +294,6 @@ int suit_plat_override_image_size(suit_component_t handle, size_t size)
 
 #if defined(CONFIG_SUIT_IPUC) && defined(CONFIG_SUIT_PLATFORM_VARIANT_SDFW)
 		if (size == 0) {
-			suit_manifest_role_t role = SUIT_MANIFEST_UNKNOWN;
-
 			suit_ipuc_sdfw_declare(handle, role);
 		} else {
 			suit_ipuc_sdfw_revoke(handle);
diff --git a/tests/subsys/suit/fetch/Kconfig b/tests/subsys/suit/fetch/Kconfig
@@ -6,5 +6,6 @@
 
 # Include and define MOCK_* Kconfigs
 rsource "../mocks/Kconfig"
+rsource "../tests/Kconfig"
 
 source "Kconfig.zephyr"
diff --git a/tests/subsys/suit/fetch/boards/native_sim.conf b/tests/subsys/suit/fetch/boards/native_sim.conf
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_FLASH_SIMULATOR=y
+CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y
diff --git a/tests/subsys/suit/fetch/boards/native_sim.overlay b/tests/subsys/suit/fetch/boards/native_sim.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Use the last 48KB of NVM as suit storage. */
+		suit_storage: partition@f4000 {
+			reg = <0xf4000 DT_SIZE_K(48)>;
+		};
+	};
+};
diff --git a/tests/subsys/suit/fetch/boards/native_sim_64.conf b/tests/subsys/suit/fetch/boards/native_sim_64.conf
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_FLASH_SIMULATOR=y
+CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y
diff --git a/tests/subsys/suit/fetch/boards/native_sim_64.overlay b/tests/subsys/suit/fetch/boards/native_sim_64.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Use the last 48KB of NVM as suit storage. */
+		suit_storage: partition@f4000 {
+			reg = <0xf4000 DT_SIZE_K(48)>;
+		};
+	};
+};
diff --git a/tests/subsys/suit/fetch/boards/nrf52840dk_nrf52840.overlay b/tests/subsys/suit/fetch/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Use the last 48KB of NVM as suit storage. */
+		suit_storage: partition@f4000 {
+			reg = <0xf4000 DT_SIZE_K(48)>;
+		};
+	};
+};
diff --git a/tests/subsys/suit/fetch/prj.conf b/tests/subsys/suit/fetch/prj.conf
@@ -30,6 +30,7 @@ CONFIG_FLASH_MAP=y
 
 CONFIG_SUIT_IPUC=y
 CONFIG_MOCK_SDFW_ARBITER=y
+CONFIG_SUIT_STORAGE=y
 
 CONFIG_SUIT_EXECUTION_MODE=y
 CONFIG_SUIT_MCI=y
diff --git a/tests/subsys/suit/ipuc/Kconfig b/tests/subsys/suit/ipuc/Kconfig
@@ -6,5 +6,6 @@
 
 # Include and define MOCK_* Kconfigs
 rsource "../mocks/Kconfig"
+rsource "../tests/Kconfig"
 
 source "Kconfig.zephyr"
diff --git a/tests/subsys/suit/ipuc/boards/native_sim.overlay b/tests/subsys/suit/ipuc/boards/native_sim.overlay
@@ -10,9 +10,14 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		/* Use the last 8KB of NVM as dfu_partition. */
-		dfu_partition: partition@fe000 {
-			reg = <0xfe000 DT_SIZE_K(8)>;
+		/* Use 8KB of NVM as dfu_partition. */
+		dfu_partition: partition@f0000 {
+			reg = <0xf0000 DT_SIZE_K(8)>;
+		};
+
+		/* Use the last 48KB of NVM as suit storage. */
+		suit_storage: partition@f4000 {
+			reg = <0xf4000 DT_SIZE_K(48)>;
 		};
 	};
 };
diff --git a/tests/subsys/suit/ipuc/prj.conf b/tests/subsys/suit/ipuc/prj.conf
@@ -32,3 +32,4 @@ CONFIG_FLASH_MAP=y
 
 CONFIG_SUIT_IPUC=y
 CONFIG_MOCK_SDFW_ARBITER=y
+CONFIG_SUIT_STORAGE=y
diff --git a/tests/subsys/suit/unit/mocks/include/mock_suit_platform.h b/tests/subsys/suit/unit/mocks/include/mock_suit_platform.h
@@ -50,7 +50,8 @@ FAKE_VALUE_FUNC(int, suit_plat_report, unsigned int, struct suit_report *);
 FAKE_VALUE_FUNC(int, suit_plat_sequence_completed, enum suit_command_sequence,
 		struct zcbor_string *, const uint8_t *, size_t);
 FAKE_VALUE_FUNC(int, suit_plat_retrieve_manifest, suit_component_t, const uint8_t **, size_t *);
-FAKE_VALUE_FUNC(int, suit_plat_override_image_size, suit_component_t, size_t);
+FAKE_VALUE_FUNC(int, suit_plat_override_image_size, suit_component_t, size_t,
+		struct zcbor_string *);
 
 #ifdef CONFIG_SUIT_PLATFORM_DRY_RUN_SUPPORT
 FAKE_VALUE_FUNC(int, suit_plat_check_fetch, suit_component_t, struct zcbor_string *,
diff --git a/tests/subsys/suit/unit/suit_plat_override_image_size/prj.conf b/tests/subsys/suit/unit/suit_plat_override_image_size/prj.conf
@@ -10,3 +10,5 @@ CONFIG_MOCK_SUIT_MEMPTR_STORAGE=y
 CONFIG_MOCK_SUIT_PLAT_DECODE_UTIL=y
 CONFIG_MOCK_SUIT_LOG=y
 CONFIG_MOCK_SUIT_IPUC=y
+CONFIG_MOCK_SUIT_MCI=y
+CONFIG_MOCK_SUIT_STORAGE=y
diff --git a/tests/subsys/suit/unit/suit_plat_override_image_size/src/main.c b/tests/subsys/suit/unit/suit_plat_override_image_size/src/main.c
diff --git a/west.yml b/west.yml
