ext_manifest: Add UUID dictionary

Such a dictionary will be used in kernel code to translate UUID value
to memory address used in DSP in runtime.
Translation will be used for the process component creation and
runtime trace filtering.

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>

Author: ktrzcinx

src/include/kernel/ext_manifest.h

@@ -53,4 +53,16 @@ struct ext_man_probe_support {
 	struct sof_ipc_probe_support probe;
 } __packed;
 
+/* UUID dictionary */
+struct ext_man_uuid_dict_elem {
+	uint32_t addr;
+	uint8_t uuid[16];
+} __packed;
+
+struct ext_man_uuid_dict {
+	struct ext_man_elem_header hdr;
+	/* filled in rimage by uuid_section content */
+	struct ext_man_uuid_dict_elem entries[];
+} __packed;
+
 #endif /* __KERNEL_EXT_MANIFEST_H__ */

src/include/sof/lib/uuid.h

@@ -9,6 +9,7 @@
 #define __SOF_LIB_UUID_H__
 
 #include <sof/common.h>
+#include <kernel/ext_manifest.h>
 
 /** \addtogroup uuid_api UUID API
  *  UUID API specification.
@@ -78,6 +79,17 @@ struct sof_uuid {
 		 .d = {vd0, vd1, vd2, vd3, vd4, vd5, vd6, vd7}},	\
 		sizeof(entity_name),					\
 		entity_name						\
+	};								\
+	__section(".fw_metadata_uuid_dict")				\
+	static const struct ext_man_uuid_dict_elem			\
+	ext_man_uuid_ ## uuid_name = {					\
+		.addr = (uint32_t)&uuid_name,				\
+		.uuid = { (va) & 0xFF, ((va) >> 8) & 0xFF,		\
+			  ((va) >> 16) & 0xFF, ((va) >> 24) & 0xFF,	\
+			  (vb) & 0xFF, ((vb) >> 8) & 0xFF,		\
+			  (vc) & 0xFF, ((vc) >> 8) & 0xFF,		\
+			  (vd0), (vd1), (vd2), (vd3),			\
+			  (vd4), (vd5), (vd6), (vd7) }			\
 	}
 
 /** \brief Creates local unique 32-bit representation of UUID structure.

src/init/ext_manifest.c

@@ -70,3 +70,14 @@ const struct ext_man_probe_support ext_man_probe
 #endif
 	},
 };
+
+/*
+ * this element size will be updated by rimage,
+ * so size shouldn't be aligned yet.
+ * List of entries will be fetched from `fw_metadata_uuid_dict` section.
+ */
+const struct ext_man_uuid_dict ext_man_uuid_header
+	__aligned(EXT_MAN_ALIGN) __section(".fw_metadata") = {
+	.hdr.type = EXT_MAN_ELEM_UUID_DICT,
+	.hdr.elem_size = sizeof(struct ext_man_uuid_dict),
+};

src/platform/cannonlake/cannonlake.x.in

@@ -568,4 +568,9 @@ SECTIONS
     KEEP (*(.fw_metadata))
     . = ALIGN(_EXT_MAN_ALIGN_);
   } >fw_metadata_seg :metadata_entries_phdr
+
+  .fw_metadata_uuid_dict (COPY) : ALIGN(1024)
+  {
+    KEEP (*(.fw_metadata_uuid_dict))
+  } >fw_metadata_seg :metadata_entries_phdr
 }