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

west.yml: update zephyr to v3.5.0-rc1 #8273

Merged

Conversation

tmleman
Copy link
Contributor

@tmleman tmleman commented Sep 28, 2023

Zepych update: total of 853 commits.

Changes include:

i8c4eec7ac6 intel_adsp: boot_complete must be done PRE_KERNEL_1
1fc16e6565 release: Zephyr 3.5.0-rc1
c910dc81a6 sys_clock: header: minor cleanup and doxygenization
b9f8b91692 kernel: sys_clock: remove stray z_enable_sys_clock prototype
cc2a558707 kernel: move more internal smp calls into internal domain
a1c7bfbc63 kernel: remove unused z_init_thread_base from kernel.h
209ff606be kernel: move internal smp calls to a internal header
e19f21cb27 kernel: move z_is_thread_essential out of public kernel header
f0c7fbf0f1 kernel: move sched_priq.h to internal/ folder
e6f1090553 kernel: Integrate object core statistics
1d5d674e0d kernel: Add initial k_obj_core_stats infrastructure
6df8efe354 kernel: Integrate object cores into kernel
55db86e512 kernel: Add initial obj_core infrastructure
eb1e5a161d kernel: FIFO and LIFO have their own sections
9bedfd82a2 kernel: Refactor CPU usage
baea37aeb4 kernel: Re-factor sys_mem_blocks definition
2f003e59e4 kernel: Re-factor k_mem_slab definition
41e0a4a371 llext: Linkable loadable extensions
4289359eb2 modules: mcux: fix HAS_CMSIS_CORE selection
1194a35aa2 xtensa: cast char* to void* during stack dump with %p
fcf22e59b8 xtensa: mark arch_switch ALWAYS_INLINE
b2f7ea0523 soc: xtensa/intel_adsp/ace: fix _end location
e560bd6b8c boards: intel_adsp: fix board compatible
b4998c357e mm_drv: tlb: Fix compile time warning
759e07bebe intel_adsp: move memory window setup to PRE_KERNEL_1

Required changes:

@tmleman
Copy link
Contributor Author

tmleman commented Sep 29, 2023

@iuliana-prodan can you help with this:

warning: HAS_CMSIS_CORE (defined at modules/cmsis/Kconfig:7) has direct dependencies 0 with value n, but is currently being y-selected by the following symbols:
Merged configuration '/zep_workspace/sof/app/prj.conf'
 - HAS_MCUX (defined at modules/Kconfig.mcux:6), with value y, direct dependencies SOC_FAMILY_KINETIS || SOC_FAMILY_IMX || SOC_FAMILY_LPC || SOC_FAMILY_NXP_ADSP || SOC_FAMILY_NXP_S32 (value: y), and select condition SOC_FAMILY_KINETIS || SOC_FAMILY_IMX || SOC_FAMILY_LPC || SOC_FAMILY_NXP_ADSP || SOC_FAMILY_NXP_S32 (value: y)

error: Aborting due to Kconfig warnings

Here is the change that introduced this dependency zephyrproject-rtos/zephyr@8d5ed53

@iuliana-prodan
Copy link
Contributor

@iuliana-prodan can you help with this:

warning: HAS_CMSIS_CORE (defined at modules/cmsis/Kconfig:7) has direct dependencies 0 with value n, but is currently being y-selected by the following symbols:
Merged configuration '/zep_workspace/sof/app/prj.conf'
 - HAS_MCUX (defined at modules/Kconfig.mcux:6), with value y, direct dependencies SOC_FAMILY_KINETIS || SOC_FAMILY_IMX || SOC_FAMILY_LPC || SOC_FAMILY_NXP_ADSP || SOC_FAMILY_NXP_S32 (value: y), and select condition SOC_FAMILY_KINETIS || SOC_FAMILY_IMX || SOC_FAMILY_LPC || SOC_FAMILY_NXP_ADSP || SOC_FAMILY_NXP_S32 (value: y)

error: Aborting due to Kconfig warnings

Here is the change introduced by this dependency zephyrproject-rtos/zephyr@8d5ed53

Already sent a fix zephyrproject-rtos/zephyr#63279

@tmleman tmleman force-pushed the topic/upstream/pr/zephyr/upgrade/23ww39 branch 2 times, most recently from 0eab7d8 to b0eb8d5 Compare September 29, 2023 13:29
@marc-hb
Copy link
Collaborator

marc-hb commented Sep 29, 2023

As already spotted by @kv2019i elsewhere (where?) the MTL firmware does not boot anymore. https://sof-ci.01.org/sofpr/PR8273/build13587/devicetest/index.html is entirely red.

@marc-hb
Copy link
Collaborator

marc-hb commented Sep 29, 2023

https://github.com/thesofproject/sof/actions/runs/6352306775/job/17254929538?pr=8273 with zephyr commit v3.4.0-4708-g2243d7b717e0 still has the warning: HAS_CMSIS_CORE warning

@marc-hb
Copy link
Collaborator

marc-hb commented Sep 29, 2023

I just realized that I was wasting time looking at test results because the current b0eb8d502be02 is actually just a test run for unmerged revert zephyrproject-rtos/zephyr#63181

@tmleman please use a different, draft PR for testing unmerged Zephyr code, it's super confusing otherwise. git branches and draft PRs are free.

@tmleman tmleman force-pushed the topic/upstream/pr/zephyr/upgrade/23ww39 branch from b0eb8d5 to 78aad80 Compare October 2, 2023 07:10
@tmleman
Copy link
Contributor Author

tmleman commented Oct 2, 2023

As already spotted by @kv2019i elsewhere (where?) the MTL firmware does not boot anymore. https://sof-ci.01.org/sofpr/PR8273/build13587/devicetest/index.html is entirely red.

@marc-hb @kv2019i this is a very strange situation because in our internal CI MTL works normally.

@tmleman tmleman force-pushed the topic/upstream/pr/zephyr/upgrade/23ww39 branch from 78aad80 to 22bc069 Compare October 2, 2023 08:58
@tmleman
Copy link
Contributor Author

tmleman commented Oct 2, 2023

Regression occurred with this change zephyrproject-rtos/zephyr@759e07b. I don't think revert is an option.

I tried to change the priority so that MW was initialized earlier, but it did not bring any interesting results.

@tmleman tmleman force-pushed the topic/upstream/pr/zephyr/upgrade/23ww39 branch from 22bc069 to 04cbb1d Compare October 2, 2023 09:40
@tmleman tmleman requested a review from dabekjakub as a code owner October 2, 2023 10:10
@tmleman tmleman changed the title west.yml: update zephyr to c1baa8282d west.yml: update zephyr to v3.5.0-rc1 Oct 2, 2023
Copy link
Member

@dabekjakub dabekjakub left a comment

Choose a reason for hiding this comment

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

@kv2019i has similar commit - please check with him if You do not double each others work

@kv2019i
Copy link
Collaborator

kv2019i commented Oct 2, 2023

We start to be in the clear again. To merge the headline, following SOF side change needs to be incorporated into the west.yml update commit to not break bisect. @tmleman you can pick this up once the dependencies are merged -> #8277

kv2019i and others added 2 commits October 2, 2023 14:48
The_very_long_variable names make it hard to modify
the code and keep to under-100-characters coding
guidelines of the codebase.

Signed-off-by: Kai Vehmanen <[email protected]>
Zepych update: total of 853 commits.

Changes include:

i8c4eec7ac6 intel_adsp: boot_complete must be done PRE_KERNEL_1
1fc16e6565 release: Zephyr 3.5.0-rc1
c910dc81a6 sys_clock: header: minor cleanup and doxygenization
b9f8b91692 kernel: sys_clock: remove stray z_enable_sys_clock prototype
cc2a558707 kernel: move more internal smp calls into internal domain
a1c7bfbc63 kernel: remove unused z_init_thread_base from kernel.h
209ff606be kernel: move internal smp calls to a internal header
e19f21cb27 kernel: move z_is_thread_essential out of public kernel header
f0c7fbf0f1 kernel: move sched_priq.h to internal/ folder
e6f1090553 kernel: Integrate object core statistics
1d5d674e0d kernel: Add initial k_obj_core_stats infrastructure
6df8efe354 kernel: Integrate object cores into kernel
55db86e512 kernel: Add initial obj_core infrastructure
eb1e5a161d kernel: FIFO and LIFO have their own sections
9bedfd82a2 kernel: Refactor CPU usage
baea37aeb4 kernel: Re-factor sys_mem_blocks definition
2f003e59e4 kernel: Re-factor k_mem_slab definition
41e0a4a371 llext: Linkable loadable extensions
4289359eb2 modules: mcux: fix HAS_CMSIS_CORE selection
1194a35aa2 xtensa: cast char* to void* during stack dump with %p
fcf22e59b8 xtensa: mark arch_switch ALWAYS_INLINE
b2f7ea0523 soc: xtensa/intel_adsp/ace: fix _end location
e560bd6b8c boards: intel_adsp: fix board compatible
b4998c357e mm_drv: tlb: Fix compile time warning
759e07bebe intel_adsp: move memory window setup to PRE_KERNEL_1

Signed-off-by: Tomasz Leman <[email protected]>
@tmleman tmleman force-pushed the topic/upstream/pr/zephyr/upgrade/23ww39 branch 2 times, most recently from b07fe48 to bcd0103 Compare October 2, 2023 13:07
@kv2019i
Copy link
Collaborator

kv2019i commented Oct 2, 2023

Ok, getting close. A few system-PM fails in https://sof-ci.01.org/sofpr/PR8273/build13627/devicetest/index.html but these are good. @tmleman The quick CI run reports a fail (build 12890724), but when I looked up the test run data, I don't see any actual test cases failing, so this seems like an infra issue. So potentially a rerun and we should be good to merge. FYI @dbaluta @iuliana-prodan

@kv2019i
Copy link
Collaborator

kv2019i commented Oct 3, 2023

Ok, now we are good to go, proceeding with merge.

@kv2019i kv2019i merged commit 6d2352a into thesofproject:main Oct 3, 2023
36 of 38 checks passed
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