rimage: mtl/lnl: fix key slot setup based on imr type #8421
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Clean cherry-picks of two commits from separate rimage repo https://github.com/thesofproject/rimage/commits/stable-v2.7 This will properly setup partition_usage field and remove fixed 0x23 value from MTL toml Signed-off-by: Adrian Bonislawski <adrian.bonislawski@intel.com> (cherry picked from commit fbea59358d06ffa86645cdf4ce0996e352742eb5) Second, squashed LNL commit: config/lnl.toml: drop now invalid signed_pkg.partition_usage Fixes commit fbea59358d06 ("rimage: mtl: fix key slot setup based on imr type") which broke LNL compilation like this: ``` error: 1 unparsed keys left in 'signed_pkg' error: key 'signed_pkg' parsing error ``` This commit does not change the final image (compared to before rimage commit fbea59358d06) because the default value is now 0x20 + IMR type. Fixes are normally submitted to the main branch first and then cherry picked to stable branches. However MTL fbea59358d06 has been made in stable-v2.7 first so the LNL change was also in stable-v2.7 first for consistency. Signed-off-by: Marc Herbert <marc.herbert@intel.com> (cherry picked from commit 469102a8f6052ce6a374b870ea945a84d04c3b1a)
Collaborator
Author
|
2 unrelated failures in https://sof-ci.01.org/sofpr/PR8421/build14366/devicetest/index.html. Everything else including https://sof-ci.01.org/sofpr/PR8421/build14367/devicetest and https://sof-ci.01.org/sof-pr-viewer/#/build/PR8421/build13032780 is green. |
marc-hb
requested review from
dbaluta,
kv2019i,
lbetlej,
lgirdwood,
mmaka1 and
plbossart
as code owners
marc-hb
requested review from
RanderWang,
abonislawski,
aiChaoSONG,
lyakh,
marcinszkudlinski and
softwarecki
RanderWang
approved these changes
Oct 31, 2023
abonislawski
approved these changes
Oct 31, 2023
lgirdwood
approved these changes
Oct 31, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Clean cherry-picks of two commits from separate rimage repo https://github.com/thesofproject/rimage/commits/stable-v2.7
This will properly setup partition_usage field
and remove fixed 0x23 value from MTL toml
Signed-off-by: Adrian Bonislawski adrian.bonislawski@intel.com
(cherry picked from commit fbea59358d06ffa86645cdf4ce0996e352742eb5)
Second, squashed LNL commit:
config/lnl.toml: drop now invalid signed_pkg.partition_usage
Fixes commit fbea59358d06 ("rimage: mtl: fix key slot setup based on imr type") which broke LNL compilation like this:
This commit does not change the final image (compared to before rimage commit fbea59358d06) because the default value is now 0x20 + IMR type.
Fixes are normally submitted to the main branch first and then cherry picked to stable branches. However MTL fbea59358d06 has been made in stable-v2.7 first so the LNL change was also in stable-v2.7 first for consistency.
Signed-off-by: Marc Herbert marc.herbert@intel.com
(cherry picked from commit 469102a8f6052ce6a374b870ea945a84d04c3b1a)