rimage: Remove ldc generation ability

SMEX is new tool designed to create ldc file content,
so this ability in rimage should be removed to avoid
duplication.

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

Author: ktrzcinx

rimage/elf.c

@@ -74,36 +74,11 @@ static int elf_read_sections(struct image *image, struct module *module,
 
 		module->bss_start = 0;
 		module->bss_end = 0;
-
-		fprintf(stdout, "info: ignore .static_log_entries"
-			" section for bootloader module\n");
-
-		module->logs_index = -EINVAL;
-
-		fprintf(stdout, "info: ignore .static_uuids section for bootloader module\n");
-		module->uids_index = -EINVAL;
-
-		fprintf(stdout, "info: ignore .fw_ready"
-			" section for bootloader module\n");
-
-		module->fw_ready_index = -EINVAL;
 	} else {
 		/* find manifest module data */
 		module->bss_index = elf_find_section(image, module, ".bss");
 		if (module->bss_index < 0)
 			return module->bss_index;
-
-		/* find log entries and fw ready sections */
-		module->logs_index = elf_find_section(image, module,
-						      ".static_log_entries");
-
-		module->uids_index = elf_find_section(image, module,
-						      ".static_uuid_entries");
-
-		module->fw_ready_index = elf_find_section(image, module,
-							  ".fw_ready");
-		if (module->fw_ready_index < 0)
-			return module->fw_ready_index;
 	}
 
 	/* parse each section */
@@ -369,8 +344,7 @@ static void elf_module_limits(struct image *image, struct module *module)
 		section = &module->section[i];
 
 		/* module bss can sometimes be missed */
-		if (i != module->bss_index && i != module->logs_index &&
-		    i != module->fw_ready_index) {
+		if (i != module->bss_index) {
 			/* only check valid sections */
 			if (!(section->flags & valid))
 				continue;

rimage/file_simple.c

@@ -73,73 +73,6 @@ static int get_mem_zone_type(struct image *image, Elf32_Shdr *section)
 	return SOF_FW_BLK_TYPE_INVALID;
 }
 
-static int fw_version_copy(struct snd_sof_logs_header *header,
-			   const struct module *module)
-{
-	Elf32_Shdr *section = NULL;
-	struct sof_ipc_ext_data_hdr *ext_hdr = NULL;
-	void *buffer = NULL;
-
-	if (module->fw_ready_index <= 0)
-		return 0;
-
-	section = &module->section[module->fw_ready_index];
-
-	buffer = calloc(1, section->size);
-	if (!buffer)
-		return -ENOMEM;
-
-	fseek(module->fd, section->off, SEEK_SET);
-	size_t count = fread(buffer, 1,
-		section->size, module->fd);
-
-	if (count != section->size) {
-		fprintf(stderr, "error: can't read ready section %d\n", -errno);
-		free(buffer);
-		return -errno;
-	}
-
-	memcpy(&header->version,
-	       &((struct sof_ipc_fw_ready *)buffer)->version,
-	       sizeof(header->version));
-
-	/* fw_ready structure contains main (primarily kernel)
-	 * ABI version.
-	 */
-
-	fprintf(stdout, "fw abi main version: %d:%d:%d\n",
-		SOF_ABI_VERSION_MAJOR(header->version.abi_version),
-		SOF_ABI_VERSION_MINOR(header->version.abi_version),
-		SOF_ABI_VERSION_PATCH(header->version.abi_version));
-
-	/* let's find dbg abi version, which the log client
-	 * is interested in and override the kernel's one.
-	 *
-	 * skip the base fw-ready record and begin from the first extension.
-	 */
-	ext_hdr = buffer + ((struct sof_ipc_fw_ready *)buffer)->hdr.size;
-	while ((uintptr_t)ext_hdr < (uintptr_t)buffer + section->size) {
-		if (ext_hdr->type == SOF_IPC_EXT_USER_ABI_INFO) {
-			header->version.abi_version =
-				((struct sof_ipc_user_abi_version *)
-						ext_hdr)->abi_dbg_version;
-			break;
-		}
-		//move to the next entry
-		ext_hdr = (struct sof_ipc_ext_data_hdr *)
-				((uint8_t *)ext_hdr + ext_hdr->hdr.size);
-	}
-
-	fprintf(stdout, "fw abi dbg version: %d:%d:%d\n",
-		SOF_ABI_VERSION_MAJOR(header->version.abi_version),
-		SOF_ABI_VERSION_MINOR(header->version.abi_version),
-		SOF_ABI_VERSION_PATCH(header->version.abi_version));
-
-	free(buffer);
-
-	return 0;
-}
-
 static int block_idx;
 
 static int write_block(struct image *image, struct module *module,
@@ -442,135 +375,6 @@ static int simple_write_firmware(struct image *image)
 	return 0;
 }
 
-static int write_logs_dictionary(struct image *image)
-{
-	struct snd_sof_logs_header header;
-	int i, ret = 0;
-	void *buffer = NULL;
-
-	memcpy(header.sig, SND_SOF_LOGS_SIG, SND_SOF_LOGS_SIG_SIZE);
-	header.data_offset = sizeof(struct snd_sof_logs_header);
-
-	for (i = 0; i < image->num_modules; i++) {
-		struct module *module = &image->module[i];
-
-		/* extract fw_version from fw_ready message located
-		 * in .fw_ready section
-		 */
-		ret = fw_version_copy(&header, module);
-		if (ret < 0)
-			goto out;
-
-		if (module->logs_index > 0) {
-			Elf32_Shdr *section =
-				&module->section[module->logs_index];
-
-			header.base_address = section->vaddr;
-			header.data_length = section->size;
-
-			fwrite(&header, sizeof(struct snd_sof_logs_header), 1,
-			       image->ldc_out_fd);
-
-			buffer = calloc(1, section->size);
-			if (!buffer)
-				return -ENOMEM;
-
-			fseek(module->fd, section->off, SEEK_SET);
-			size_t count = fread(buffer, 1, section->size,
-				module->fd);
-			if (count != section->size) {
-				fprintf(stderr,
-					"error: can't read logs section %d\n",
-					-errno);
-				ret = -errno;
-				goto out;
-			}
-			count = fwrite(buffer, 1, section->size,
-				       image->ldc_out_fd);
-			if (count != section->size) {
-				fprintf(stderr,
-					"error: can't write section %d\n",
-					-errno);
-				ret = -errno;
-				goto out;
-			}
-
-			fprintf(stdout, "logs dictionary: size %u\n",
-				header.data_length + header.data_offset);
-			fprintf(stdout, "including fw version of size: %lu\n",
-				(unsigned long)sizeof(header.version));
-		}
-	}
-out:
-	if (buffer)
-		free(buffer);
-
-	return ret;
-}
-
-static int write_uids_dictionary(struct image *image)
-{
-	struct snd_sof_uids_header header;
-	Elf32_Shdr *section;
-	int i, ret = 0;
-	void *buffer = NULL;
-
-	memcpy(header.sig, SND_SOF_UIDS_SIG, SND_SOF_UIDS_SIG_SIZE);
-	header.data_offset = sizeof(struct snd_sof_uids_header);
-
-	for (i = 0; i < image->num_modules; i++) {
-		struct module *module = &image->module[i];
-
-		if (module->uids_index <= 0)
-			continue;
-		section = &module->section[module->uids_index];
-
-		header.base_address = section->vaddr;
-		header.data_length = section->size;
-
-		fwrite(&header, sizeof(struct snd_sof_uids_header), 1,
-		       image->ldc_out_fd);
-
-		buffer = calloc(1, section->size);
-		if (!buffer)
-			return -ENOMEM;
-		fseek(module->fd, section->off, SEEK_SET);
-		if (fread(buffer, 1, section->size, module->fd) !=
-				section->size) {
-			fprintf(stderr, "error: can't read uids section %d\n",
-				-errno);
-			ret = -errno;
-			goto out;
-		}
-		if (fwrite(buffer, 1, section->size, image->ldc_out_fd) !=
-				section->size) {
-			fprintf(stderr, "error: cant't write section %d\n",
-				-errno);
-			ret = -errno;
-			goto out;
-		}
-		fprintf(stdout, "uids dictionary: size %u\n",
-			header.data_length + header.data_offset);
-	}
-out:
-	free(buffer);
-	return ret;
-}
-
-int write_dictionaries(struct image *image)
-{
-	int ret = 0;
-
-	ret = write_logs_dictionary(image);
-	if (ret)
-		goto out;
-
-	ret = write_uids_dictionary(image);
-
-out:
-	return ret;
-}
-
 const struct adsp machine_byt = {
 	.name = "byt",
 	.mem_zones = {

rimage/rimage.c

@@ -38,7 +38,6 @@ static void usage(char *name)
 	fprintf(stdout, "\t -v enable verbose output\n");
 	fprintf(stdout, "\t -r enable relocatable ELF files\n");
 	fprintf(stdout, "\t -s MEU signing offset\n");
-	fprintf(stdout, "\t -p log dictionary outfile\n");
 	fprintf(stdout, "\t -i set IMR type\n");
 	fprintf(stdout, "\t -x set xcc module offset\n");
 	exit(0);
@@ -55,14 +54,11 @@ int main(int argc, char *argv[])
 
 	image.xcc_mod_offset = DEFAULT_XCC_MOD_OFFSET;
 
-	while ((opt = getopt(argc, argv, "ho:p:m:vba:s:k:l:ri:x:")) != -1) {
+	while ((opt = getopt(argc, argv, "ho:m:vba:s:k:l:ri:x:")) != -1) {
 		switch (opt) {
 		case 'o':
 			image.out_file = optarg;
 			break;
-		case 'p':
-			image.ldc_out_file = optarg;
-			break;
 		case 'm':
 			mach = optarg;
 			break;
@@ -101,9 +97,6 @@ int main(int argc, char *argv[])
 	if (!image.out_file || !mach)
 		usage(argv[0]);
 
-	if (!image.ldc_out_file)
-		image.ldc_out_file = "out.ldc";
-
 	/* find machine */
 	for (i = 0; i < ARRAY_SIZE(machine); i++) {
 		if (!strcmp(mach, machine[i]->name)) {
@@ -158,22 +151,10 @@ int main(int argc, char *argv[])
 	else
 		ret = image.adsp->write_firmware(&image);
 
-	unlink(image.ldc_out_file);
-	image.ldc_out_fd = fopen(image.ldc_out_file, "wb");
-	if (!image.ldc_out_fd) {
-		fprintf(stderr, "error: unable to open %s for writing %d\n",
-			image.ldc_out_file, errno);
-		ret = -EINVAL;
-		goto out;
-	}
-	ret = write_dictionaries(&image);
 out:
 	/* close files */
 	if (image.out_fd)
 		fclose(image.out_fd);
 
-	if (image.ldc_out_fd)
-		fclose(image.ldc_out_fd);
-
 	return ret;
 }

rimage/rimage.h

@@ -67,9 +67,6 @@ struct module {
 	int num_bss;
 	int fw_size;
 	int bss_index;
-	int logs_index;
-	int uids_index;
-	int fw_ready_index;
 
 	/* sizes do not include any gaps */
 	int bss_size;
@@ -95,9 +92,7 @@ struct module {
 struct image {
 
 	const char *out_file;
-	const char *ldc_out_file;
 	FILE *out_fd;
-	FILE *ldc_out_fd;
 	void *pos;
 
 	const struct adsp *adsp;