rimage: manifest: Improved handling of empty RODATA segment

If the RODATA segment does not contain any data, its type is marked as empty. Cleared the readonly flag because this segment also contains .data sections. Signed-off-by: Adrian Warecki <[email protected]>
thesofproject · Nov 27, 2023 · 4c361b6 · 4c361b6
1 parent fa41033
commit 4c361b6
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/tools/rimage/src/manifest.c b/tools/rimage/src/manifest.c
@@ -240,20 +240,21 @@ static int man_get_module_manifest(struct image *image, struct manifest_module *
 	segment->flags.r.load = 1;
 	segment->flags.r.readonly = 1;
 	segment->flags.r.code = 1;
+	segment->flags.r.type = SOF_MAN_SEGMENT_TEXT;
 
 	/* data segment */
 	segment = &man_module->segment[SOF_MAN_SEGMENT_RODATA];
 	segment->flags.r.contents = 1;
 	segment->flags.r.alloc = 1;
 	segment->flags.r.load = 1;
-	segment->flags.r.readonly = 1;
+	segment->flags.r.readonly = 0; /* rodata segment contains also writtable data */
 	segment->flags.r.data = 1;
-	segment->flags.r.type = 1;
+	segment->flags.r.type = SOF_MAN_SEGMENT_RODATA;
 
 	/* bss segment */
 	segment = &man_module->segment[SOF_MAN_SEGMENT_BSS];
 	segment->flags.r.alloc = 1;
-	segment->flags.r.type = 2;
+	segment->flags.r.type = SOF_MAN_SEGMENT_BSS;
 
 	fprintf(stdout, " Entry point 0x%8.8x\n", man_module->entry_point);
 
@@ -368,14 +369,26 @@ static int man_module_create(struct image *image, struct manifest_module *module
 
 
 	/* data section */
-	man_module->segment[SOF_MAN_SEGMENT_RODATA].v_base_addr = module->file.data.start;
-	man_module->segment[SOF_MAN_SEGMENT_RODATA].file_offset = module->foffset +
-								  module->text_fixup_size;
 
 	/* file_size is already aligned to MAN_PAGE_SIZE */
 	pages = module->file.data.file_size / MAN_PAGE_SIZE;
 
 	man_module->segment[SOF_MAN_SEGMENT_RODATA].flags.r.length = pages;
+	if (pages) {
+		man_module->segment[SOF_MAN_SEGMENT_RODATA].v_base_addr = module->file.data.start;
+		man_module->segment[SOF_MAN_SEGMENT_RODATA].file_offset = module->foffset +
+									  module->text_fixup_size;
+		/* Copy data sections content */
+		err = man_copy_elf_sections(image, module, &man_module->segment[SOF_MAN_SEGMENT_RODATA],
+					    module->file.data.first_section);
+		if (err)
+			return err;
+	} else {
+		man_module->segment[SOF_MAN_SEGMENT_RODATA].v_base_addr = 0;
+		man_module->segment[SOF_MAN_SEGMENT_RODATA].file_offset = 0;
+		man_module->segment[SOF_MAN_SEGMENT_RODATA].flags.ul = 0;
+		man_module->segment[SOF_MAN_SEGMENT_RODATA].flags.r.type = SOF_MAN_SEGMENT_EMPTY;
+	}
 
 	/* Copy data sections content */
 	err = man_copy_elf_sections(image, module, &man_module->segment[SOF_MAN_SEGMENT_RODATA],