Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rimage: module: Fix section order in output image #8401

Merged
merged 1 commit into from
Oct 31, 2023

Conversation

softwarecki
Copy link
Collaborator

Fixed the order in which sections are placed in the output firmware image for platforms using a simple manifest.

Fixes: #8336

@kv2019i
Copy link
Collaborator

kv2019i commented Oct 26, 2023

@saisurya-ch can you verify?

@marc-hb
Copy link
Collaborator

marc-hb commented Oct 26, 2023

@softwarecki can you explain why this didn't affect Intel? Because we don't use a "simple" (?) manifest?

Copy link
Member

@saisurya-ch saisurya-ch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.ri file is written in the correct order as required.

@kv2019i
Copy link
Collaborator

kv2019i commented Oct 27, 2023

This would be ready to go, but we need a clean run of the mandatory CI checks. @softwarecki can you check?

@softwarecki
Copy link
Collaborator Author

softwarecki commented Oct 27, 2023

@softwarecki can you explain why this didn't affect Intel? Because we don't use a "simple" (?) manifest?

It appears that Intel platforms use functions from the manifest.c file to generate a firmware image. They work by copying content of sections to allocated memory block, taking into account the starting address of each section. Then this block is written to a output file. The mentioned amd platforms apparently use functions from file_simple.c. That's why I described it as a "simple" manifest. They take sections from a input file and write their content to a output file. This is actually a simpler approach.

@marc-hb marc-hb requested a review from lyakh October 27, 2023 15:36
@marc-hb
Copy link
Collaborator

marc-hb commented Oct 27, 2023

@kv2019i , @lgirdwood , based on @softwarecki's description of file_simple.c and manifest.c we won't need to backport this to rimage/stable-v2.7, agreed? Or should we do it anyway just to be on the safe side?

@lgirdwood
Copy link
Member

@kv2019i , @lgirdwood , based on @softwarecki's description of file_simple.c and manifest.c we won't need to backport this to rimage/stable-v2.7, agreed? Or should we do it anyway just to be on the safe side?

Not impacting v2.7.1, but can be added to v2.7.2 if we need to.

Fixed the order in which sections are placed in the output firmware image
for platforms using a simple manifest.

Fixes: thesofproject#8336

Signed-off-by: Adrian Warecki <[email protected]>
@kv2019i
Copy link
Collaborator

kv2019i commented Oct 30, 2023

@wszypelt @softwarecki The fails look unrelated to this PR, can you take a lot or give go-ahead to merge as this is urgent for non-Intel configurations.

@wszypelt
Copy link

@wszypelt @softwarecki The fails look unrelated to this PR, can you take a lot or give go-ahead to merge as this is urgent for non-Intel configurations.

all green in Internal Intel CI System :)

@kv2019i kv2019i merged commit 3cb13e7 into thesofproject:main Oct 31, 2023
45 of 46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Writing the sections to .ri file in reversal order in rimage creation process.
8 participants