rimage: library: copy module configurations individually

Files on rimage command line don't have to follow in the same order
as modules in TOML. Moreover, the TOML configuration is global, it
contains all modules, enabled for this platform, whereas when
building libraries we need to select only configurations for used
modules. This patch finds and copies each such configuration
individually.

Signed-off-by: Guennadi Liakhovetski <[email protected]>

tools/rimage/src/manifest.c

@@ -694,32 +694,72 @@ static int man_create_modules(struct image *image, struct sof_man_fw_desc *desc,
 	return 0;
 }
 
-static void man_create_modules_in_config(struct image *image, struct sof_man_fw_desc *desc)
+/* Copy module "mod_cfg" entries from TOML to manifest */
+static int man_create_modules_in_config(struct image *image, struct sof_man_fw_desc *desc)
 {
 	struct fw_image_manifest_module *modules;
 	struct sof_man_module *man_module;
-	void *cfg_start;
+	uint8_t *cfg_start;
 	int i;
 
 	modules = image->adsp->modules;
 	if (!modules)
-		return;
+		return 0;
 
-	if (!image->loadable_module)
+	if (image->loadable_module) {
+		/* Number of struct sof_man_mod_config entries for the current module */
+		unsigned int offset = 0;
+
+		cfg_start = (uint8_t *)desc + SOF_MAN_MODULE_OFFSET(modules->output_mod_cfg_count);
+
+		/*
+		 * Modules in the output file don't have to follow in the same order
+		 * as in TOML. Moreover, the TOML configuration is global, it contains
+		 * all the modules, enabled for this platform, whereas when building
+		 * libraries we need to select only configurations for included modules.
+		 * This loop finds and copies each such configuration individually.
+		 */
+		for (i = 0, man_module = (struct sof_man_module *)((uint8_t *)desc +
+								   SOF_MAN_MODULE_OFFSET(0));
+		     i < modules->output_mod_cfg_count;
+		     i++, man_module++) {
+			int j = man_module_find_cfg(modules, man_module);
+
+			if (j < 0)
+				return j;
+
+			man_module->cfg_offset = offset;
+
+			/* Copy configuration for the module */
+			size_t size = modules->mod_man[j].cfg_count *
+				sizeof(struct sof_man_mod_config);
+
+			memcpy(cfg_start, modules->mod_cfg + modules->mod_man[j].cfg_offset, size);
+
+			cfg_start += size;
+			offset += modules->mod_man[j].cfg_count;
+		}
+
+		/* Update module count */
+		desc->header.num_module_entries = modules->output_mod_cfg_count;
+	} else {
 		/* skip modules passed as parameters. Their manifests have
 		 * already been copied by the man_create_modules function. */
 		for (i = image->num_modules; i < modules->mod_man_count; i++) {
 			man_module = (void *)desc + SOF_MAN_MODULE_OFFSET(i);
 			memcpy(man_module, &modules->mod_man[i], sizeof(*man_module));
 		}
-	else
-		i = modules->mod_man_count;
 
-	/* We need to copy the configurations for all modules. */
-	cfg_start = (void *)desc + SOF_MAN_MODULE_OFFSET(i);
-	memcpy(cfg_start, modules->mod_cfg, modules->mod_cfg_count * sizeof(struct sof_man_mod_config));
+		/* We need to copy the configurations for all modules. */
+		cfg_start = (uint8_t *)desc + SOF_MAN_MODULE_OFFSET(i);
+		memcpy(cfg_start, modules->mod_cfg,
+		       modules->mod_cfg_count * sizeof(struct sof_man_mod_config));
+
+		/* Update module count */
+		desc->header.num_module_entries = modules->mod_man_count;
+	}
 
-	desc->header.num_module_entries = modules->mod_man_count;
+	return 0;
 }
 
 static int man_hash_modules(struct image *image, struct sof_man_fw_desc *desc)
@@ -1474,7 +1514,9 @@ int man_write_fw_ace_v1_5(struct image *image)
 		goto err;
 
 	/* platform config defines some modules except bringup & base modules */
-	man_create_modules_in_config(image, desc);
+	ret = man_create_modules_in_config(image, desc);
+	if (ret)
+		goto err;
 
 	fprintf(stdout, "Firmware completing manifest v2.5\n");