suit: manifest-controlled variables

Now manifests may declare MFST_VAR components

Ref: NCSDK-30530

Signed-off-by: Sylwester Konczyk <[email protected]>

Author: SylwesterKonczyk

subsys/suit/Kconfig

@@ -83,6 +83,7 @@ config SUIT_DFU_CANDIDATE_PROCESSING_FULL
 	imply SUIT_MEMPTR_STORAGE
 	imply SUIT_PLATFORM
 	imply SUIT_PROCESSOR
+	imply SUIT_MANIFEST_VARIABLES
 	imply SUIT_MPI_GENERATE
 	imply SUIT_SINK_SELECTOR
 

subsys/suit/platform/include/suit_platform_internal.h

@@ -50,6 +50,11 @@ typedef enum {
 	 * be stored, ready for installation.
 	 */
 	SUIT_COMPONENT_TYPE_CACHE_POOL,
+
+	/** Manifest-accessible variables.
+	 */
+	SUIT_COMPONENT_TYPE_MFST_VAR,
+
 } suit_component_type_t;
 
 /** Set the pointer to the implementation-specific data. */

subsys/suit/platform/sdfw/CMakeLists.txt

@@ -45,7 +45,7 @@ zephyr_library_link_libraries_ifdef(CONFIG_SUIT_AUTHENTICATE suit_mci)
 zephyr_library_link_libraries_ifdef(CONFIG_SUIT_PLAT_CHECK_COMPONENT_COMPATIBILITY suit_mci)
 zephyr_library_link_libraries_ifdef(CONFIG_SUIT_STREAM_FILTER_DECRYPT suit_stream_filters_interface)
 zephyr_library_link_libraries_ifdef(CONFIG_SUIT_EVENTS suit_events)
-
+zephyr_library_link_libraries_ifdef(CONFIG_SUIT_MANIFEST_VARIABLES suit_manifest_variables)
 
 zephyr_library_link_libraries(suit_sdfw_platform)
 zephyr_library_link_libraries(suit_utils)

subsys/suit/platform/sdfw/src/suit_plat_component_compatibility.c

@@ -8,10 +8,17 @@
 #include <suit_plat_decode_util.h>
 #include <suit_platform_internal.h>
 #include <suit_storage_mpi.h>
+#include <zephyr/logging/log.h>
+
+#ifdef CONFIG_SUIT_MANIFEST_VARIABLES
+#include <suit_manifest_variables.h>
+#endif /* CONFIG_SUIT_MANIFEST_VARIABLES */
 
 /* -1 indicates no boot capability for given cpu id */
 #define NO_BOOT_CAPABILITY_CPU_ID 255
 
+LOG_MODULE_REGISTER(suit_plat_component_compat, CONFIG_SUIT_LOG_LEVEL);
+
 int suit_plat_component_compatibility_check(const suit_manifest_class_id_t *class_id,
 					    struct zcbor_string *component_id)
 {
@@ -36,6 +43,7 @@ int suit_plat_component_compatibility_check(const suit_manifest_class_id_t *clas
 	}
 
 	if (suit_plat_decode_component_type(component_id, &type) != SUIT_PLAT_SUCCESS) {
+		LOG_ERR("Unrecognized component type");
 		return SUIT_ERR_UNSUPPORTED_COMPONENT_ID;
 	}
 
@@ -123,6 +131,26 @@ int suit_plat_component_compatibility_check(const suit_manifest_class_id_t *clas
 
 		break;
 
+#ifdef CONFIG_SUIT_MANIFEST_VARIABLES
+
+	case SUIT_COMPONENT_TYPE_MFST_VAR:
+
+		uint32_t val;
+
+		if (suit_plat_decode_component_number(component_id, &number) != SUIT_PLAT_SUCCESS) {
+			return SUIT_ERR_UNSUPPORTED_COMPONENT_ID;
+		}
+
+		/* Let's check if given component is supported by reading out its content
+		 */
+		if (suit_mfst_var_get(number, &val) != SUIT_PLAT_SUCCESS) {
+			return SUIT_ERR_UNSUPPORTED_COMPONENT_ID;
+		}
+
+		break;
+
+#endif /* CONFIG_SUIT_MANIFEST_VARIABLES */
+
 	default:
 		return SUIT_ERR_UNSUPPORTED_COMPONENT_ID;
 	}

subsys/suit/utils/src/suit_plat_decode_util.c

@@ -84,6 +84,9 @@ suit_plat_err_t suit_plat_decode_component_type(struct zcbor_string *component_i
 	} else if ((tmp.len == strlen("CACHE_POOL")) &&
 		   (memcmp(tmp.value, "CACHE_POOL", tmp.len) == 0)) {
 		*type = SUIT_COMPONENT_TYPE_CACHE_POOL;
+	} else if ((tmp.len == strlen("MFST_VAR")) &&
+		   (memcmp(tmp.value, "MFST_VAR", tmp.len) == 0)) {
+		*type = SUIT_COMPONENT_TYPE_MFST_VAR;
 	} else {
 		*type = SUIT_COMPONENT_TYPE_UNSUPPORTED;
 		return SUIT_PLAT_ERR_CBOR_DECODING;