rimage: count modules and files

When building libraries we know how many input files we use, but we
also need to count how many modules each file contains. Add
respective calculations.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

tools/rimage/src/include/rimage/module.h

@@ -76,6 +76,9 @@ struct module_sections_info {
 struct module {
 	struct elf_file elf;
 
+	unsigned short first_module_idx;
+	unsigned short n_modules;
+
 	/* Array of valid sections */
 	struct module_section *sections;
 

tools/rimage/src/include/rimage/rimage.h

@@ -104,6 +104,7 @@ struct fw_image_manifest_module {
 	struct sof_man_mod_config *mod_cfg;
 	uint32_t mod_man_count;
 	struct sof_man_module *mod_man;
+	unsigned int output_mod_cfg_count;
 };
 
 /*

tools/rimage/src/manifest.c

@@ -520,6 +520,11 @@ static int man_module_create_reloc(struct image *image, struct manifest_module *
 		return err;
 	}
 
+	/*
+	 * number of manifests in .module, one module can contain several manifests
+	 * e.g. when a module defines multiple Module Adapter interfaces like
+	 * volume for PEAKVOL and GAIN, mixin_mixout for MIXIN and MIXOUT etc.
+	 */
 	unsigned int n_mod = section.header.data.size / sizeof(*sof_mod);
 
 	if (!n_mod || n_mod * sizeof(*sof_mod) != section.header.data.size) {
@@ -548,6 +553,9 @@ static int man_module_create_reloc(struct image *image, struct manifest_module *
 		man_module_fill_reloc(module, *man_module);
 	}
 
+	module->file.n_modules = n_mod;
+	modules->output_mod_cfg_count += n_mod;
+
 	elf_section_free(&section);
 
 	module_print_zones(&module->file);
@@ -651,6 +659,7 @@ static int man_create_modules(struct image *image, struct sof_man_fw_desc *desc,
 	}
 
 	image->image_end = 0;
+	unsigned int n_mod = 0;
 
 	for (man_module = (struct sof_man_module *)((uint8_t *)desc + SOF_MAN_MODULE_OFFSET(i - offset));
 	     i < image->num_modules;
@@ -663,7 +672,9 @@ static int man_create_modules(struct image *image, struct sof_man_fw_desc *desc,
 			module->foffset = image->image_end;
 
 		if (image->reloc) {
+			module->file.first_module_idx = n_mod;
 			err = man_module_create_reloc(image, module, &man_module);
+			n_mod += module->file.n_modules;
 		} else {
 			/* Some platforms don't have modules configuration in toml file */
 			if (image->adsp->modules) {