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

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

Closed

Conversation

kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented Feb 14, 2024

Like #8864 but we take absolute minimum new stuff from Zephyr.

cc:

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)
Use custom Zephyr with unmerged patches.

Signed-off-by: Kai Vehmanen <[email protected]>
@kv2019i kv2019i force-pushed the 202404-zephyr-update-feb14b branch from 7000e39 to fe5ddca Compare February 14, 2024 19:50
@kv2019i
Copy link
Collaborator Author

kv2019i commented Feb 14, 2024

Wrong Zephyr commit, reuploading.

@marc-hb
Copy link
Collaborator

marc-hb commented Feb 14, 2024

@marc-hb
Copy link
Collaborator

marc-hb commented Feb 15, 2024

@dbaluta , @LaurentiuM1234 there is an IMX compilation failure in
https://github.com/thesofproject/sof/actions/runs/7906600378/job/21581809437?pr=8865

/opt/toolchains/zephyr-sdk-0.16.4/xtensa-nxp_imx_adsp_zephyr-elf/bin/../lib/gcc/xtensa-nxp_imx_adsp_zephyr-elf/12.2.0/../../../../xtensa-nxp_imx_adsp_zephyr-elf/bin/ld.bfd: zephyr/zephyr_pre0.elf section `.DoubleExceptionVector.literal' will not fit in region `vector_double_lit'
/opt/toolchains/zephyr-sdk-0.16.4/xtensa-nxp_imx_adsp_zephyr-elf/bin/../lib/gcc/xtensa-nxp_imx_adsp_zephyr-elf/12.2.0/../../../../xtensa-nxp_imx_adsp_zephyr-elf/bin/ld.bfd: section .DoubleExceptionVector.text LMA [00000000596f863c,00000000596f8655] overlaps section .DoubleExceptionVector.literal LMA [00000000596f8638,00000000596f863f]
/opt/toolchains/zephyr-sdk-0.16.4/xtensa-nxp_imx_adsp_zephyr-elf/bin/../lib/gcc/xtensa-nxp_imx_adsp_zephyr-elf/12.2.0/../../../../xtensa-nxp_imx_adsp_zephyr-elf/bin/ld.bfd: region `vector_double_lit' overflowed by 4 bytes
zephyr/arch/arch/xtensa/core/libarch__xtensa__core.a(xtensa_asm2_util.S.obj): in function `_DoubleExceptionVector':
/zep_workspace/zephyr/arch/xtensa/core/xtensa_asm2_util.S:485:(.DoubleExceptionVector.text+0xe): dangerous relocation: windowed longcall crosses 1GB boundary; return may fail: xtensa_fatal_log
collect2: error: ld returned 1 exit status

@dbaluta
Copy link
Collaborator

dbaluta commented Feb 15, 2024

@marc-hb this is interesting at least. I will have a look on tomorrow I'm just leaving for the day now.

@iuliana-prodan
Copy link
Contributor

@dbaluta , @LaurentiuM1234 there is an IMX compilation failure in https://github.com/thesofproject/sof/actions/runs/7906600378/job/21581809437?pr=8865

/opt/toolchains/zephyr-sdk-0.16.4/xtensa-nxp_imx_adsp_zephyr-elf/bin/../lib/gcc/xtensa-nxp_imx_adsp_zephyr-elf/12.2.0/../../../../xtensa-nxp_imx_adsp_zephyr-elf/bin/ld.bfd: zephyr/zephyr_pre0.elf section `.DoubleExceptionVector.literal' will not fit in region `vector_double_lit'
/opt/toolchains/zephyr-sdk-0.16.4/xtensa-nxp_imx_adsp_zephyr-elf/bin/../lib/gcc/xtensa-nxp_imx_adsp_zephyr-elf/12.2.0/../../../../xtensa-nxp_imx_adsp_zephyr-elf/bin/ld.bfd: section .DoubleExceptionVector.text LMA [00000000596f863c,00000000596f8655] overlaps section .DoubleExceptionVector.literal LMA [00000000596f8638,00000000596f863f]
/opt/toolchains/zephyr-sdk-0.16.4/xtensa-nxp_imx_adsp_zephyr-elf/bin/../lib/gcc/xtensa-nxp_imx_adsp_zephyr-elf/12.2.0/../../../../xtensa-nxp_imx_adsp_zephyr-elf/bin/ld.bfd: region `vector_double_lit' overflowed by 4 bytes
zephyr/arch/arch/xtensa/core/libarch__xtensa__core.a(xtensa_asm2_util.S.obj): in function `_DoubleExceptionVector':
/zep_workspace/zephyr/arch/xtensa/core/xtensa_asm2_util.S:485:(.DoubleExceptionVector.text+0xe): dangerous relocation: windowed longcall crosses 1GB boundary; return may fail: xtensa_fatal_log
collect2: error: ld returned 1 exit status

I just tested locally, with SOF/main, just:

$ git diff
diff --git a/west.yml b/west.yml
index 37418754d..24459c89a 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 9852e8e15bc8536aa1a49cc2697c1e8f802e331f
+      revision: 2f04a8c91edc41d25d52a1d0f72c20ebd2c068a1
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision

which is zephyr/main and is all good.

I see in this PR:

      revision: 40fa69d5778c3b6f57dde62104644847aa8299fc
      remote: zephyrprojectkv2019i

are there any other changes on top of zephyr/main?
Probably I should also take the cpu.c changes from his PR.

@kv2019i
Copy link
Collaborator Author

kv2019i commented Feb 15, 2024

@iuliana-prodan @dbaluta This has a lot of not-yet-upstream patches. The branch used is at https://github.com/kv2019i/zephyr/commits/202402-sof-main-backports-feb14b/ and I think the build warning comes from this one:
kv2019i/zephyr@4af665a

... so we hit a problem where we have a exception while executing interrupt handler code. This causes a double-exception that is not really handled in Zephyr upstream (unless you compile with GDBSTUB). This patch adds a more explicit error logging for this case.

@marc-hb
Copy link
Collaborator

marc-hb commented Feb 15, 2024

Sorry for the noise @dbaluta and @iuliana-prodan , I didn't expect that Kai's work in progress could interfere with IMX but now I see that it definitely can.

Thanks for giving it a try - Zephyr is at the RC2 stage right now so it's good timing.

@kv2019i
Copy link
Collaborator Author

kv2019i commented Mar 6, 2024

Stale, closing

@kv2019i kv2019i closed this Mar 6, 2024
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.

5 participants