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

[DNM] west.yml: Zephyr update Feb14 #8864

Closed
wants to merge 2 commits into from
Closed

[DNM] west.yml: Zephyr update Feb14 #8864

wants to merge 2 commits into from

Conversation

kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented Feb 14, 2024 •
edited
Loading

Retry updating Zephyr baseline using following elements.

  • latest Zephyr main as of today Jan 31th
  • SMP interface changes on SOF side
  • a set of not-yet-merged fixes to Intel MTL that might help to pass the CI with newer Zephyr

Link: #8818

@dcpleung @kv2019i
zephyr: use k_smp_cpu_start/_resume for secondary core power up
06e7b42 
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]>
(cherry picked from commit 83392c4)
@kv2019i kv2019i force-pushed the 202404-zephyr-update-feb14 branch from 32fe8e0 to 8e83094 Compare February 14, 2024 17:38
@kv2019i kv2019i changed the title [DNM] west.yml: Zephyr update Feb12 [DNM] west.yml: Zephyr update Feb14 Feb 14, 2024
@kv2019i
[DNM] west.yml: update Zephyr to kv2019i branch e3c069be
7000e39 
Use custom Zephyr with unmerged patches.

Signed-off-by: Kai Vehmanen <[email protected]>
@kv2019i kv2019i force-pushed the 202404-zephyr-update-feb14 branch from 8e83094 to 7000e39 Compare February 14, 2024 17:58
@marc-hb
Copy link
Collaborator

marc-hb commented Feb 14, 2024

Unfortunately, neither ACE results in https://sof-ci.01.org/sofpr/PR8855/build2720/devicetest/index.html nor CAVS results in https://sof-ci.01.org/sofpr/PR8855/build2721/devicetest/index.html are looking good with a similarly looking ASSERTION FAIL in both:

[  546.262043] <inf> ll_schedule: zephyr_ll_task_schedule_common: task add 0xa01167c0 0x20210U priority 0 flags 0x0
[  546.262073] <inf> ll_schedule: zephyr_domain_register: zephyr_domain_register domain->type 1 domain->clk 3 domain->ticks_per_ms 38400 period 1000
[  546.262263] <inf> dma_intel_adsp_gpdma: intel_adsp_gpdma_power_on: intel_adsp_gpdma_power_on: dma dma@7c000 initialized
[  546.262448] <inf> pipe: pipeline_trigger: pipe:0 0x0 pipe trigger cmd 7
[  546.262458] <inf> ll_schedule: zephyr_ll_task_schedule_common: task add 0xa0117440 0x20210U priority 0 flags 0x0
[  546.263228] <inf> host_comp: host_get_copy_bytes_normal: comp:0 0x4 no bytes to copy, available samples: 0, free_samples: 192
[  547.285151] <inf> ll_schedule: zephyr_domain_thread_fn: ll core 0 timer avg 1418, max 3871, overruns 0
[  548.309151] <inf> ll_schedule: zephyr_domain_thread_fn: ll core 0 timer avg 1401, max 1827, overruns 0
[  549.333150] <inf> ll_schedule: zephyr_domain_thread_fn: ll core 0 timer avg 1401, max 1830, overruns 0
[  550.357151] <inf> ll_schedule: zephyr_domain_thread_fn: ll core 0 timer avg 1402, max 1825, overruns 0
[  551.381151] <inf> ll_schedule: zephyr_domain_thread_fn: ll core 0 timer avg 1401, max 1827, overruns 0
[  551.475780] <inf> ipc: ipc_cmd: rx	: 0x48000000|0x12
ASSERTION FAIL [!z_smp_cpu_mobile()] @ ZEPHYR_BASE/subsys/pm/pm.c:133
[  552.215233] <err> os: print_fatal_exception:  ** FATAL EXCEPTION
[  552.215241] <err> os: print_fatal_exception:  ** CPU 0 EXCCAUSE 63 (zephyr exception)
[  552.215248] <err> os: print_fatal_exception:  **  PC 0xa0065dfb VADDR (nil)
[  552.215253] <err> os: print_fatal_exception:  **  PS 0x60020
[  552.215270] <err> os: print_fatal_exception:  **    (INTLEVEL:0 EXCM: 0 UM:1 RING:0 WOE:1 OWB:0 CALLINC:2)
[  552.215276] <err> os: xtensa_dump_stack:  **  A0 0xa0064418  SP 0xa010b310  A2 0x4  A3 0xa010b320
[  552.215281] <err> os: xtensa_dump_stack:  **  A4 0xa010b300  A5 0x4  A6 0xfffbfff0  A7 0x4
[  552.215288] <err> os: xtensa_dump_stack:  **  A8 0xa0064362  A9 0xa010b2a0 A10 0xa00d9467 A11 0xa010b320
[  552.215293] <err> os: xtensa_dump_stack:  ** A12 0xa010b300 A13 0x4 A14 (nil) A15 0xffffffff
[  552.215298] <err> os: xtensa_dump_stack:  ** LBEG 0xa006344b LEND 0xa0063458 LCOUNT 0xa003669e
[  552.215305] <err> os: xtensa_dump_stack:  ** SAR 0xc

@marc-hb marc-hb mentioned this pull request Feb 14, 2024
Merged
@kv2019i kv2019i mentioned this pull request Feb 14, 2024
Closed
@kv2019i
Copy link
Collaborator Author

kv2019i commented Feb 14, 2024

Ack, it looks there's quite a bit of work ahead to get SOF working on latest Zephyr again. Added new PR at #8865 that takes less ambitious route.

@kv2019i kv2019i closed this Feb 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmleman tmleman Awaiting requested review from tmleman tmleman will be requested when the pull request is marked ready for review tmleman is a code owner

@lgirdwood lgirdwood Awaiting requested review from lgirdwood lgirdwood will be requested when the pull request is marked ready for review lgirdwood is a code owner

@plbossart plbossart Awaiting requested review from plbossart plbossart will be requested when the pull request is marked ready for review plbossart is a code owner

@mmaka1 mmaka1 Awaiting requested review from mmaka1 mmaka1 will be requested when the pull request is marked ready for review mmaka1 is a code owner

@lbetlej lbetlej Awaiting requested review from lbetlej lbetlej will be requested when the pull request is marked ready for review lbetlej is a code owner

@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta will be requested when the pull request is marked ready for review dbaluta is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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