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.

Sign up for GitHub

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

Jump to bottom

Update Zephyr to include CONFIG_MODULES support #8732

Closed
wants to merge 3 commits into from
Closed

Update Zephyr to include CONFIG_MODULES support #8732

wants to merge 3 commits into from

Conversation

lyakh
Copy link
Collaborator

@lyakh lyakh commented Jan 12, 2024 •
edited by marc-hb
Loading

Update to a Zephyr version, including CONFIG_MODULES support. This is needed for #8180, but is now also a general long overdue Zephyr upgrade

cc:

@lyakh
Copy link
Collaborator Author

lyakh commented Jan 12, 2024

bisected CI failures on ACE in https://sof-ci.01.org/sofpr/PR8732/build1816/devicetest/index.html?model=MTLP_RVP_NOCODEC&testcase=verify-kernel-boot-log to zephyrproject-rtos/zephyr@e6f35f4

@lyakh lyakh mentioned this pull request Jan 12, 2024
Merged
@marc-hb
Copy link
Collaborator

marc-hb commented Jan 12, 2024

zephyrproject-rtos/zephyr@e6f35f4

Rebased commit?

@marc-hb
Copy link
Collaborator

marc-hb commented Jan 12, 2024 •
edited
Loading

Rebased commit?

Rebased yes, the final one: zephyrproject-rtos/zephyr@c3a6274bf5e4

From zephyrproject-rtos/zephyr#67393

@marc-hb marc-hb mentioned this pull request Jan 12, 2024
Merged
@marc-hb
Copy link
Collaborator

marc-hb commented Jan 17, 2024

Newer attempt that includes @lyakh 's fix for the DSP panics:

@lyakh lyakh changed the title [TEST] Update Zephyr to include CONFIG_MODULES support Update Zephyr to include CONFIG_MODULES support Feb 26, 2024
@lgirdwood
Copy link
Member

@lyakh lot of red on the CI, do you think this is the Zephyr upgrade ?

@lyakh
Copy link
Collaborator Author

lyakh commented Feb 27, 2024

@lyakh lot of red on the CI, do you think this is the Zephyr upgrade ?

@lgirdwood wow... that is... a huge number of failures. And single-core configurations failed even earlier than the multicore nocodec topology. Yes, this must be because of a Zephyr upgrade. There's nothing else in this PR. I suspect HDA DMA changes in Zephyr

dcpleung and others added 2 commits February 27, 2024 14:33
@dcpleung @lyakh
zephyr: use k_smp_cpu_start/_resume for secondary core power up
44be3b9 
This changes the secondary core power up routine to use the newly
introduced k_smp_cpu_start() and k_smp_cpu_resume(). This removes
the need to mirror part of the SMP start up code from Zephyr, and
no longer need to call into Zephyr private kernel code.

West update includes :

eefaeee061c8 kernel: smp: introduce k_smp_cpu_resume
042cb6ac4e00 soc: intel_adsp: enable DfTTS-based time stamping
             on ACE platforms
6a0b1da158a4 soc: intel_adsp: call framework callback function for restore
e7217925c93e ace: use a 'switch' statement in pm_state_set()
c99a604bbf2c ace: remove superfluous variable initialisation
a0ac2faf9bde intel_adsp: ace: enable power domain
4204ca9bcb3f ace: fix DSP panic during startup  (fixes c3a6274bf5e4)
d4b0273ab0c4 cmake: sparse.template: add COMMAND_ERROR_IS_FATAL
ca12fd13c6d3 xtensa: intel_adsp: fix a cache handling error
0ee1e28a2f5f xtensa: polish doxygen and add to missing doc
035c8d8ceb4b xtensa: remove sys_define_gpr_with_alias()
a64eec6aaeec xtensa: remove XTENSA_ERR_NORET

Signed-off-by: Daniel Leung <[email protected]>
Signed-off-by: Rander Wang <[email protected]>
[[email protected]: update Zephyr hversion]
Signed-off-by: Guennadi Liakhovetski <[email protected]>
@lyakh
cache: switch over to the new Zephyr cache API
f117081 
z_soc_uncached_ptr() / z_soc_cached_ptr() have been removed from
Zephyr and replaced with sys_cache_uncached_ptr_get() and
sys_cache_cached_ptr_get() respectively.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
@lyakh
Copy link
Collaborator Author

lyakh commented Feb 27, 2024

"Internal Intel CI" results look good for both cAVS and ACE, but QB caught a DSP panic...

@marc-hb
Copy link
Collaborator

marc-hb commented Feb 27, 2024 •
edited
Loading

Hooray! Some successful Zephyr update at last. I see there are still a couple hacks and the west.yml manifest still points at a personal branch but the latest test results look very promising:

09:33:49,529 ERROR - Step 'master>PUBLISH LOGS>GENERATE build.json' is failed:
java.lang.IllegalArgumentException: The provided File object is not a directory: /localdisk/processteam/qba1/workspace/24733/Logs/dwmix/stdout.log EDIT: this has been fixed.

This was referenced Feb 28, 2024
Closed
Merged
@lyakh lyakh force-pushed the zephyr branch 2 times, most recently from 080d54e to 1dcbd41 Compare February 28, 2024 16:37
@lyakh
Copy link
Collaborator Author

lyakh commented Feb 29, 2024

SOFCI TEST

@kv2019i
Copy link
Collaborator

kv2019i commented Mar 4, 2024

The fails all seem to relate to errors returned by HDA-DMA driver's dma_reload(). I suspect these are now triggered by @lyakh your commit zephyrproject-rtos/zephyr#68945 . That -EIO return is visible in multiple failure case FW logs.

@kv2019i kv2019i mentioned this pull request Mar 4, 2024
Closed
@lyakh
[TEST] test a Zephyr upgrade
0477778 
Test a recent Zephyr version with additional patches to address
multiple multicore issues.

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

kv2019i commented Mar 4, 2024

Excellent, now the mandatory tests are passing! I will mark this with DNM for now, as this points to unmerged Zephyr PRs, and this is not evident in the title. Please remove when ready.

@kv2019i kv2019i added the DNM Do Not Merge tag label Mar 4, 2024
@marc-hb marc-hb marked this pull request as draft March 4, 2024 18:21
@lyakh lyakh mentioned this pull request Mar 5, 2024
Closed
@lyakh lyakh closed this Mar 8, 2024
@lyakh lyakh deleted the zephyr branch March 8, 2024 15:33
@marc-hb
Copy link
Collaborator

marc-hb commented Mar 8, 2024 •
edited
Loading

Superseded by #8903 and others? #8913

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lgirdwood lgirdwood Awaiting requested review from lgirdwood lgirdwood is a code owner

@plbossart plbossart Awaiting requested review from plbossart plbossart is a code owner

@mmaka1 mmaka1 Awaiting requested review from mmaka1 mmaka1 is a code owner

@lbetlej lbetlej Awaiting requested review from lbetlej lbetlej is a code owner

@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta is a code owner

@kv2019i kv2019i Awaiting requested review from kv2019i kv2019i is a code owner

@dabekjakub dabekjakub Awaiting requested review from dabekjakub dabekjakub is a code owner

@tmleman tmleman Awaiting requested review from tmleman tmleman is a code owner

@serhiy-katsyuba-intel serhiy-katsyuba-intel Awaiting requested review from serhiy-katsyuba-intel

Assignees
No one assigned
Labels
DNM Do Not Merge tag
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@lyakh @marc-hb @lgirdwood @kv2019i @dcpleung