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

[stable-v2.10] Revert "soc: intel_adsp: only implement FW_STATUS boot protocol for c… #78

Merged

Conversation

kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented Jun 19, 2024

…avs"

This reverts commit fa798ce.

Link: thesofproject/sof#9243

@kv2019i
Copy link
Collaborator Author

kv2019i commented Jun 19, 2024

Backport to sof/stable-v2.10 branch.

@kv2019i kv2019i changed the title Revert "soc: intel_adsp: only implement FW_STATUS boot protocol for c… [stable-v2.10] Revert "soc: intel_adsp: only implement FW_STATUS boot protocol for c… Jun 19, 2024
@kv2019i
Copy link
Collaborator Author

kv2019i commented Jun 19, 2024

E.g. needed for SOF 2.10 release to boot with linux-6.8 kernel.

@marc-hb marc-hb requested a review from andyross June 19, 2024 20:03
Copy link

@andyross andyross left a comment

Choose a reason for hiding this comment

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

Sure, but what's the process for getting a commit here upstreamed? Seems like it should merge in Zephyr first and be backported, no? Should I close the one I did so it doesn't get merged in the release rush and conflict?

@kv2019i
Copy link
Collaborator Author

kv2019i commented Jun 20, 2024

@andyross Let's have the patch go upstream normally in zephyrproject-rtos#74552 and then picked up to SOF main as usual.

This stable-v2.10 is a special case as we are not (yet) aligned with release cadences of SOF and Zephyr, and e.g. now we are really close for final 2.10 release, so we have to do this as a hotfix (SOF2.10 has branched from SOF main a long time ago already, see thesofproject/sof#9037 ). Here too normal policy is get to patches merged first upstream (and majority are), then backported, but exceptions are possible. Given this is a clean revert, this seems to be a prime candidate for an exception.

@kv2019i kv2019i merged commit 8f9384c into thesofproject:sof/stable-v2.10 Jun 20, 2024
11 of 12 checks passed
@marc-hb
Copy link

marc-hb commented Jun 20, 2024

(SOF2.10 has branched from SOF main a long time ago already, see thesofproject/sof#9037 ).

That's only 2 weeks ago, it's not a "long time" ago. Has Zephyr become incompatible with SOF stable-2.10 already? Zephyr is hardening it's 3.7 LTS release right now, it would be real pity not to use that for 2.10.

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.

4 participants