ipc4: base_fw: send info about modules IDs

The MODULES_INFO_GET property of LargeConfigGet IPC4 msg has slightly
different format than module info encoded into the binary manifest.
In the binary manifest struct_id has always the same value while
LargeConfigGet message structure requires sending module ID instead.
This change fixes this issue by generating module IDs in a loop while
handling the IPC4 message.

Signed-off-by: Wojciech Jablonski <wojciech.jablonski@intel.com>

Author: wjablon1

src/audio/base_fw_intel.c

@@ -40,7 +40,7 @@ struct ipc4_modules_info {
 
 /* Sanity check because a subtraction of those sizes is performed later on */
 STATIC_ASSERT(sizeof(struct ipc4_modules_info) < SOF_IPC_MSG_MAX_SIZE,
-	invalid_modules_info_struct_size);
+	      invalid_modules_info_struct_size);
 /*
  * TODO: default to value of ACE1.x platforms. This is defined
  *       in multiple places in Zephyr, mm_drv_intel_adsp.h and
@@ -143,6 +143,7 @@ __cold int basefw_vendor_modules_info_get(uint32_t *data_offset, char *data)
 
 	struct ipc4_modules_info *const module_info = (struct ipc4_modules_info *)data;
 	const struct sof_man_fw_desc *desc;
+	struct sof_man_runtime_info *rt_info;
 	uint32_t curr_mod_cnt, curr_cpy_size, total_mod_cnt = 0;
 	uint32_t total_size_left = SOF_IPC_MSG_MAX_SIZE - sizeof(struct ipc4_modules_info);
 	int ret;
@@ -171,6 +172,14 @@ __cold int basefw_vendor_modules_info_get(uint32_t *data_offset, char *data)
 			return IPC4_OUT_OF_MEMORY;
 		}
 
+		/* replace structure id ("$AME" tag) with runtime info */
+		for(uint32_t idx = 0; idx < curr_mod_cnt; ++idx) {
+			rt_info = &module_info->modules[total_mod_cnt + idx].runtime_info;
+			rt_info->module_id = LIB_MANAGER_PACK_MODULE_ID(lib_id, idx);
+			/* TODO: set bit[0] for modules loaded into ADSP memory */
+			rt_info->state_flags = 0x0;
+		}
+
 		total_mod_cnt += curr_mod_cnt;
 		total_size_left -= curr_cpy_size;
 	}

src/include/sof/lib_manager.h

@@ -77,7 +77,9 @@
 
 #define LIB_MANAGER_GET_LIB_ID(module_id) (((module_id) & 0xF000) >> LIB_MANAGER_LIB_ID_SHIFT)
 #define LIB_MANAGER_GET_MODULE_INDEX(module_id) ((module_id) & 0xFFF)
-#define LIB_MANAGER_PACK_LIB_ID(lib_index) (((lib_index) << LIB_MANAGER_LIB_ID_SHIFT) & 0xF000)
+#define LIB_MANAGER_PACK_MODULE_ID(lib_index, module_index) (((module_index) & 0xFFF) | \
+	(((lib_index) << LIB_MANAGER_LIB_ID_SHIFT) & 0xF000))
+#define LIB_MANAGER_PACK_LIB_ID(lib_index) LIB_MANAGER_PACK_MODULE_ID(lib_index, 0x0)
 
 #ifdef CONFIG_LIBRARY_MANAGER
 struct ipc_lib_msg {

tools/rimage/src/include/rimage/sof/user/manifest.h

@@ -103,11 +103,19 @@ struct sof_man_uuid {
 	uint8_t  d[8];
 };
 
+struct sof_man_runtime_info {
+	uint16_t module_id;
+	uint16_t state_flags;
+};
+
 /*
  * Each module has an entry in the FW header. Used by ROM - Immutable.
  */
 struct sof_man_module {
-	uint8_t struct_id[SOF_MAN_MOD_ID_LEN];	/* SOF_MAN_MOD_ID */
+	union {
+		uint8_t struct_id[SOF_MAN_MOD_ID_LEN];	/* SOF_MAN_MOD_ID */
+		struct sof_man_runtime_info runtime_info;
+	};
 	uint8_t name[SOF_MAN_MOD_NAME_LEN];
 	struct sof_man_uuid uuid;
 	struct sof_man_module_type type;