intel-adsp: fix ACE power-off assembly #75706
Merged
Conversation
This file contains 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
A recent commit fb53d2e ("ace: power: replace pseudo-assembly movi") contained a bug: the Xtensa "movi" assembly instruction must be written with the immediate argument already shifted left by 8, the compiler doesn't do that automatically. This still somehow worked on MTL but failed on LNL. Fix both occurrences. Fixes: zephyrproject-rtos#75700 Signed-off-by: Guennadi Liakhovetski <[email protected]>
zephyrbot
requested review from
andyross,
ceolin,
dcpleung,
jxstelter,
kv2019i,
lgirdwood,
marc-hb,
marcinszkudlinski,
nashif,
softwarecki and
tmleman
kv2019i
approved these changes
Jul 10, 2024
There was a problem hiding this comment.
Test in thesofproject/sof#9294 seems good, so this is better than the revert. Thanks @lyakh !
tmleman
approved these changes
Jul 10, 2024
dcpleung
approved these changes
Jul 10, 2024
andyross
approved these changes
Jul 10, 2024
abonislawski
approved these changes
Jul 11, 2024
| @@ -38,7 +38,7 @@ | |||
| movi \az, 0x2f5 | |||
| slli \az, \az, 0xb | |||
| /* 8 * (\segment_index << 5) == (\segment_index << 5) << 3 == \segment_index << 8 */ | |||
| addmi \az, \az, \segment_index | |||
| addmi \az, \az, \segment_index << 8 | |||
There was a problem hiding this comment.
For ACE MAX_MEMORY_SEGMENTS == 1, so segment_index is always 0. And so this shift cannot affect the problem.
There was a problem hiding this comment.
@serhiy-katsyuba-intel Ack, the patch affects via LSPGCTL_HIGH which is also passed to addmi. So this change is to just correct all uses of addmi. @lyakh to confirm, but that's how I understood it
There was a problem hiding this comment.
correct. This is just a correctness fix, the real fix is the LSPGCTL_HIGH part
ceolin
approved these changes
Jul 11, 2024
|
Still not completely fixed? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
A recent commit fb53d2e ("ace: power: replace pseudo-assembly movi") contained a bug: the Xtensa "movi" assembly instruction must be written with the immediate argument already shifted left by 8, the compiler doesn't do that automatically. This still somehow worked on MTL but failed on LNL. Fix both occurrences.
Fixes: #75700
This is an alternative to reverting the offending commit as submitted in #75689