Skip to content

west.yml: update zephyr to a805a054fe1f#10765

Open
tmleman wants to merge 2 commits into
thesofproject:mainfrom
tmleman:topic/upstream/pr/zephyr/upgrade/26ww20
Open

west.yml: update zephyr to a805a054fe1f#10765
tmleman wants to merge 2 commits into
thesofproject:mainfrom
tmleman:topic/upstream/pr/zephyr/upgrade/26ww20

Conversation

@tmleman
Copy link
Copy Markdown
Contributor

@tmleman tmleman commented May 11, 2026

Total of 935 commits.

Changes include:

a13fd968e132 soc: intel: Add support for dts RAM configuration
1d935da70029 kernel: Add support for dts RAM configuration
96d1142210e3 arch: Add support for dts RAM configuration
8509270a0e34 kernel: poll timeout: Fix race condition
1b8c7a3038d9 kernel: thread timeout: Fix race condition
667c3184d6e8 logging: log_output: Fix formatting of function prefix
e1434e141ecf logging: fix immediate clean output locking on SMP
1296dc85e332 kernel: timer: make k_timer_start duration match documented semantics
2e2202af616c kernel: timeout: make z_add_timeout round-up conditional on announce
d157b3da193d kernel: timeout: keep announce_remaining stable across same-tick group
827ce93035bc soc: kernel: use configdefault for CONFIG_SMP
603fa4818e8f drivers: timer: assert sys_clock lock held where required
1dc47344d0a2 kernel: use arch_cpu_irqs_are_enabled() for IRQ-state probes
01b3821fd933 kernel: spinlock: provide z_spin_is_locked() for UP builds
c91e5e1390f3 kernel: move atomic_c.c to lib/os
cc6136628341 kernel: move errno from kernel to lib/libc/common
81ccaca788db kernel: ensure kheap.c is linked for static heap initialization
39b23fa582d8 kernel: bypass k_heap_free() in k_free() to avoid scheduler locking
db7a5e80a47b kernel: move bootargs out of kernel into lib/os.
9fe4cc20a2b5 kernel: move boot banner into lib/os
f7c6f1d92110 soc: intel_adsp: ace30: extend hwreg0 MMU range
814cfb41191a soc: intel_adsp: ace40: extend hwreg0 MMU range
1bc5f0543c4d drivers: counter: introduce counter capture api
e81266be2bfe arch: add arch_cpu_irqs_are_enabled() primitive

Copilot AI review requested due to automatic review settings May 11, 2026 14:04
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR bumps the Zephyr project revision pinned in SOF’s west.yml manifest to a805a054fe1f59a21259d0975dced68169974954, pulling in the upstream Zephyr changes enumerated in the PR description (935 commits) for the SOF Zephyr-based build/workflow.

Changes:

  • Update the zephyr project revision in west.yml from c162980efd9a... to a805a054fe1f....

@kv2019i
Copy link
Copy Markdown
Collaborator

kv2019i commented May 11, 2026

@thesofproject/nxp there's a imx95 fail with recent Zephyr main:

/__w/sof/sof/zephyr/include/zephyr/sys/clock.h:223:2: error: #error "SYS_CLOCK_HW_CYCLES_PER_SEC must be non-zero!"
  223 | #error "SYS_CLOCK_HW_CYCLES_PER_SEC must be non-zero!"
      |  ^~~~~

Copy link
Copy Markdown
Member

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

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

@dbaluta can you fix this incrementally in a followup ?

@tmleman
Copy link
Copy Markdown
Contributor Author

tmleman commented May 13, 2026

@lgirdwood There's also a regression in SOF's build system on Windows caused by changes in Zephyr. We should also address this somehow. Currently investigating, initially it looks like changes in LLEXT.

@tmleman
Copy link
Copy Markdown
Contributor Author

tmleman commented May 13, 2026

@pillo79
Copy link
Copy Markdown
Contributor

pillo79 commented May 13, 2026

Thanks for the investigation and pinpointing the issue.
Is it possible for you to try replacing ${CMAKE_COMMAND} below with '${CMAKE_COMMAND}'?

https://github.com/zephyrproject-rtos/zephyr/blob/a97b5f221bf178c3427d3031e8f2a2d5ca922644/misc/llext_edk/CMakeLists.txt#L24-L26

@tmleman
Copy link
Copy Markdown
Contributor Author

tmleman commented May 14, 2026

Thanks for the investigation and pinpointing the issue. Is it possible for you to try replacing ${CMAKE_COMMAND} below with '${CMAKE_COMMAND}'?

https://github.com/zephyrproject-rtos/zephyr/blob/a97b5f221bf178c3427d3031e8f2a2d5ca922644/misc/llext_edk/CMakeLists.txt#L24-L26

@pillo79 , thanks for taking interest. I tested the proposed solution but unfortunately it didn't solve the problem. I asked AI for help and it was able to prepare two solutions but only one works. Below you'll find links to drafts in Zephyr and to pull requests in SOF that point to them to confirm the effectiveness of the solution. If you find time, please take a look at them and comment. If the working solution suits you, I'll file an issue and prepare a PR.

  1. cmake: llext-edk: quote CMAKE_COMMAND to fix MSYS2 path mangling zephyrproject-rtos/zephyr#109134
  2. cmake: llext-edk: fix build portability on Windows zephyrproject-rtos/zephyr#109129
  3. (working) llext: edk: fix Windows build failure due to ccache and path quoting zephyrproject-rtos/zephyr#109146

@pillo79
Copy link
Copy Markdown
Contributor

pillo79 commented May 15, 2026

The working solution looks good to me and has no side effects AFAICS, so +1 on that!

Note that my objective with that PR was to fix missing compile flags (especially module ones) that were not exported previously by the EDK. It should improve the match between the Zephyr build and any EDK-built binaries, but this may have unexpected side effects on SOF builds (I hope not!).

@tmleman tmleman force-pushed the topic/upstream/pr/zephyr/upgrade/26ww20 branch from 306aa1a to 20b36ae Compare May 15, 2026 15:03
@tmleman tmleman added the DNM Do Not Merge tag label May 15, 2026
@lyakh
Copy link
Copy Markdown
Collaborator

lyakh commented May 18, 2026

The working solution looks good to me and has no side effects AFAICS, so +1 on that!

Note that my objective with that PR was to fix missing compile flags (especially module ones) that were not exported previously by the EDK. It should improve the match between the Zephyr build and any EDK-built binaries, but this may have unexpected side effects on SOF builds (I hope not!).

@pillo79 I'm not aware of any SOF builds using the Zephyr LLEXT EDK. Does that PR affect non-EDK builds too?

@pillo79
Copy link
Copy Markdown
Contributor

pillo79 commented May 18, 2026

Note that my objective with that PR was to fix missing compile flags (especially module ones) that were not exported previously by the EDK. It should improve the match between the Zephyr build and any EDK-built binaries, but this may have unexpected side effects on SOF builds (I hope not!).

@pillo79 I'm not aware of any SOF builds using the Zephyr LLEXT EDK. Does that PR affect non-EDK builds too?

No, zephyrproject-rtos/zephyr#98348 only affects the llext-edk target*. But then I don't understand why the issue discussed here is happening in SOF CI, if not by running a west build -t llext-edk somewhere? Maybe the Zephyr test suite?

(EDIT: (*) for context, the issue is in misc/llext_edk/CMakeLists.txt and that is only called by cmake/llext-edk.cmake which is only ever included when -t llext-edk is run).

@dbaluta
Copy link
Copy Markdown
Collaborator

dbaluta commented May 18, 2026

@dbaluta can you fix this incrementally in a followup ?

@lgirdwood Addressing this today.

@tmleman
Copy link
Copy Markdown
Contributor Author

tmleman commented May 18, 2026

@pillo79 @lyakh I read your comments and came to the conclusion that something here must not add up because our workflows are failing so this change must affect us.

I reviewed the code a bit in terms of dependencies and these are my conclusions:

only affects the llext-edk target*

True

the issue is in misc/llext_edk/CMakeLists.txt and that is only called by cmake/llext-edk.cmake which is only ever included
when -t llext-edk is run

False

I'm not aware of any SOF builds using the Zephyr LLEXT EDK.

False

On every platform where we enabled CONFIG_LLEXT in SOF, CONFIG_LLEXT_EDK is automatically enabled.

@pillo79
Copy link
Copy Markdown
Contributor

pillo79 commented May 18, 2026

💡 Thanks again for the investigation. `

the issue is in misc/llext_edk/CMakeLists.txt and that is only called by cmake/llext-edk.cmake which is only ever included when -t llext-edk is run

False

Right, my mistake; it is in fact called at every build if LLEXT_EDK config is enabled. The -t llext-edk bit only collects the output files.

CONFIG_LLEXT_EDK is independent of LLEXT, but that default y if LLEXT was added to keep backwards compatibility (originally they were intertwined). It is perfectly fine to disable CONFIG_LLEXT_EDK in SOF if you don't need it (and it makes the build slightly faster).

tmleman added 2 commits May 18, 2026 13:23
SOF does not use the Zephyr LLEXT Extension Development Kit. The EDK
target is automatically enabled by Kconfig (default y if LLEXT) but
serves no purpose for SOF builds and adds unnecessary build steps.

Additionally, the EDK build infrastructure has a known bug on Windows
with ccache enabled (zephyrproject-rtos/zephyr#109146) that causes CI
failures due to path quoting issues in misc/llext_edk/CMakeLists.txt.

Explicitly disable CONFIG_LLEXT_EDK on all LLEXT-enabled boards to avoid
the broken code path and reduce build time.

Signed-off-by: Tomasz Leman <tomasz.m.leman@intel.com>
Total of 935 commits.

Changes include:

a13fd968e132 soc: intel: Add support for dts RAM configuration
1d935da70029 kernel: Add support for dts RAM configuration
96d1142210e3 arch: Add support for dts RAM configuration
8509270a0e34 kernel: poll timeout: Fix race condition
1b8c7a3038d9 kernel: thread timeout: Fix race condition
667c3184d6e8 logging: log_output: Fix formatting of function prefix
e1434e141ecf logging: fix immediate clean output locking on SMP
1296dc85e332 kernel: timer: make k_timer_start duration match documented
             semantics
2e2202af616c kernel: timeout: make z_add_timeout round-up conditional on
             announce
d157b3da193d kernel: timeout: keep announce_remaining stable across
             same-tick group
827ce93035bc soc: kernel: use configdefault for CONFIG_SMP
603fa4818e8f drivers: timer: assert sys_clock lock held where required
1dc47344d0a2 kernel: use arch_cpu_irqs_are_enabled() for IRQ-state
             probes
01b3821fd933 kernel: spinlock: provide z_spin_is_locked() for UP builds
c91e5e1390f3 kernel: move atomic_c.c to lib/os
cc6136628341 kernel: move errno from kernel to lib/libc/common
81ccaca788db kernel: ensure kheap.c is linked for static heap
             initialization
39b23fa582d8 kernel: bypass k_heap_free() in k_free() to avoid scheduler
             locking
db7a5e80a47b kernel: move bootargs out of kernel into lib/os.
9fe4cc20a2b5 kernel: move boot banner into lib/os
f7c6f1d92110 soc: intel_adsp: ace30: extend hwreg0 MMU range
814cfb41191a soc: intel_adsp: ace40: extend hwreg0 MMU range
1bc5f0543c4d drivers: counter: introduce counter capture api
e81266be2bfe arch: add arch_cpu_irqs_are_enabled() primitive

Signed-off-by: Tomasz Leman <tomasz.m.leman@intel.com>
@tmleman tmleman force-pushed the topic/upstream/pr/zephyr/upgrade/26ww20 branch from 20b36ae to c6a051b Compare May 18, 2026 11:24
@tmleman tmleman removed the DNM Do Not Merge tag label May 18, 2026
@tmleman
Copy link
Copy Markdown
Contributor Author

tmleman commented May 19, 2026

@lgirdwood, after explicitly disabling LLEXT_EDK in all ACE platforms we no longer need to wait for the fix to be merged. Question: do we wait for fix for IMX95?

@lyakh
Copy link
Copy Markdown
Collaborator

lyakh commented May 19, 2026

I'm not aware of any SOF builds using the Zephyr LLEXT EDK.

False

@tmleman I didn't say that we never enable the Kconfig option, I said that AFAIK we never use it. Which is also confirmed by the fact that disabling it doesn't break SOF. So, yes, please, let's disable it.

Copy link
Copy Markdown
Collaborator

@lyakh lyakh left a comment

Choose a reason for hiding this comment

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

a good change, but can we do it in prj.conf? On "main" we only support Zephyr builds.

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.

7 participants