-
Notifications
You must be signed in to change notification settings - Fork 349
west.yml: update zephyr to 7c67dea76a9 #10444
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 7c67dea76a9 #10444
Conversation
There was a problem hiding this 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 updates the Zephyr revision in west.yml to incorporate 1003 upstream commits. The update includes significant changes to Intel ADSP architecture support, Xtensa MMU improvements, cache subsystem refactoring, and DAI driver enhancements.
Key changes:
- Enhanced Intel ADSP debug capabilities with debug slot manager and improved memory window configuration
- Refactored cache subsystem with new SOC-specific cache support and deprecated legacy configurations
- Improved Xtensa MMU with SoC-overridable mappings and better page frame handling
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
@ujfalusi @lyakh gdb or debug slot related issue? https://github.com/thesofproject/sof/actions/runs/20233871395/job/58083293966?pr=10444 |
Oh, I did not saw this in my testing, let me check. All should be ifdef protected |
|
I merged #10413 now in first. |
|
Fix PR updated for gdb, I have no idea when it got broken, initially I did tested and I ended up testing it with complete revert of the slot manager as gdb just crashed the fw on TGL, but it was crashing it on top of vanilla SOF+Zephyr, so it is a feature I concluded. |
|
@tmleman conflict here now, I guess we still want the newest west commit. |
|
@lgirdwood we need to wait for this one: zephyrproject-rtos/zephyr#101069 |
328452e to
c47bc94
Compare
Now merged, so waiting on CI. |
|
I was about to write that CI looks good, but apparently not entirely: https://sof-ci.01.org/sofpr/PR10444/build18161/devicetest/index.html [ 2826.826691] kernel: snd_sof:sof_ipc4_log_header: sof-audio-pci-intel-ptl 0000:00:1f.3: ipc tx reply: 0x60000068|0x20d0074: MOD_INIT_INSTANCE
[ 2826.826696] kernel: sof-audio-pci-intel-ptl 0000:00:1f.3: FW reported error: 104 - Other failure of module instance initialization request
[ 2826.826718] kernel: sof-audio-pci-intel-ptl 0000:00:1f.3: ipc error for msg 0x40100003|0x20d0074
[ 2826.826729] kernel: sof-audio-pci-intel-ptl 0000:00:1f.3: failed to create module dai-copier.SSP.NoCodec-2.capture
[ 2826.826736] kernel: snd_sof:sof_ipc4_log_header: sof-audio-pci-intel-ptl 0000:00:1f.3: ipc tx : 0x120d0000|0x0: GLB_DELETE_PIPELINE
[ 2826.827692] kernel: snd_sof:sof_ipc4_log_header: sof-audio-pci-intel-ptl 0000:00:1f.3: ipc tx reply: 0x32000000|0x0: GLB_DELETE_PIPELINE
[ 2826.827712] kernel: snd_sof:sof_ipc4_log_header: sof-audio-pci-intel-ptl 0000:00:1f.3: ipc tx done : 0x120d0000|0x0: GLB_DELETE_PIPELINE
[ 2826.827720] kernel: snd_sof:sof_widget_free_unlocked: sof-audio-pci-intel-ptl 0000:00:1f.3: widget pipeline.12 freed
[ 2826.827723] kernel: sof-audio-pci-intel-ptl 0000:00:1f.3: Failed to set up connected widgets
[ 2826.827729] kernel: sof-audio-pci-intel-ptl 0000:00:1f.3: failed widget list set up for pcm 2 dir 1
[ 2826.827733] kernel: sof-audio-pci-intel-ptl 0000:00:1f.3: ASoC error (-22): at snd_soc_pcm_component_prepare() on 0000:00:1f.3
[ 2826.827758] kernel: snd_sof:sof_pcm_prepare: sof-audio-pci-intel-ptl 0000:00:1f.3: pcm12 (Port0 2nd Capture), dir 1: Entry: prepare[ 2826.824996] <inf> ipc: ipc_cmd: rx : 0x40100003|0x20d0074
[ 2826.825315] <err> module_adapter: container_get: comp:13 0x100003 allocating more containers failed
[ 2826.825496] <err> module_adapter: module_init: comp:13 0x100003 error -12: module specific init failed
[ 2826.825563] <err> module_adapter: module_adapter_new_ext: comp:13 0x100003 -12: module initialization failed
[ 2826.825655] <err> ipc: ipc4_init_module_instance: error: failed to init module 3 : 10
[ 2826.825711] <err> ipc: ipc_cmd: ipc4: MODULE_MSG failed with err 104
[ 2826.825733] <wrn> host_comp: host_get_copy_bytes_normal: comp:12 0xf0003 Skipped 2 no-bytes events in last 3 ms, bytes 768
[ 2826.826311] <inf> ipc: ipc_cmd: rx : 0x120d0000|0x0
[ 2826.827800] <inf> ipc: ipc_cmd: rx : 0x110d0006|0x0
[ 2826.827933] <inf> pipe: pipeline_new: pipeline new pipe_id 13 priority 0
[ 2826.828173] <inf> ipc: ipc_cmd: rx : 0x40100003|0xd0015
[ 2826.829003] <err> module_adapter: container_get: comp:13 0x100003 allocating more containers failed
[ 2826.829108] <err> module_adapter: module_init: comp:13 0x100003 error -12: module specific init failed
[ 2826.829185] <err> module_adapter: module_adapter_new_ext: comp:13 0x100003 -12: module initialization failed
[ 2826.829310] <err> ipc: ipc4_init_module_instance: error: failed to init module 3 : 10
[ 2826.829843] <err> ipc: ipc_cmd: ipc4: MODULE_MSG failed with err 104
[ 2826.830220] <inf> ipc: ipc_cmd: rx : 0x120d0000|0x0
[ 2826.831313] <inf> ipc: ipc_cmd: rx : 0x110d0004|0x0
[ 2826.831896] <inf> pipe: pipeline_new: pipeline new pipe_id 13 priority 0
[ 2826.832178] <inf> ipc: ipc_cmd: rx : 0x400c1013|0xd0010
[ 2826.833045] <err> module_adapter: container_get: comp:13 0xc1013 allocating more containers failed
[ 2826.833128] <err> module_adapter: module_init: comp:13 0xc1013 error -12: module specific init failed
[ 2826.833203] <err> module_adapter: module_adapter_new_ext: comp:13 0xc1013 -12: module initialization failed
[ 2826.833313] <err> ipc: ipc4_init_module_instance: error: failed to init module 1013 : c
[ 2826.833853] <err> ipc: ipc_cmd: ipc4: MODULE_MSG failed with err 104@kv2019i @lgirdwood , can you take a look and help me determine what went wrong? |
c47bc94 to
0109c9a
Compare
Total of 759 commits.
Changes include:
7c67dea76a9 intel_adsp: common: gdbstub: Fix compilation
DEBUG_SLOT_MANAGER=n
ebb5625bee8 intel_adsp: Add debug slot manager
2ce9d5f5e3c soc: intel_adsp: tools: cavstool.py: Look up the shell slot
by type
8cb287a411e intel_adsp: debug_window: Describe the partial slot in page0
c7dd9d79bdf intel_adsp: kconfig: Increase the default size of
MEMORY_WIN_2_SIZE
81666a32757 intel_adsp: common: gdbstub: Correct z_gdb_backend_init()
return type
3b7b2aef96c drivers: dai: intel: ssp: add get_properties_copy support
05069845d4d drivers: dai: make user-space support build-time selectable
fa2c904266a drivers: dai: add get_properties_copy() method
81e37ad4e85 drivers: dai: add ability to use dai.h from user threads
701cbfbc235 xtensa: mmu: may need to copy entries during L2 table dup
8d0103b4ad8 xtensa: mmu: spin lock for counter manipulation
3e339780782 cache: deprecate CONFIG_DOUBLEMAP
0540d274c0d xtensa: remove CONFIG_XTENSA_RPO_CACHE
a82a09a3148 soc: intel_adsp: SoC specific cached/uncached regions
support
5fefc8b8b82 xtensa: cache: guard kconfig
CONFIG_XTENSA_{UN,}CACHED_REGION
a8c1df6b807 cache: adds CONFIG_SOC_CACHE
169304813a1 cache: move arch_mem_coherent() into cache subsys
a0a529aecc2 soc: intel_adsp: move ARCH_XTENSA_SET_RPO_TLB inside
06b462bdf69 soc: intel_adsp: add CONFIG_INTEL_ADSP_MEMORY_IS_MIRRORED
b90b396e647 soc: intel_adsp/ace: move included linker script to include
dir
301abd86309 xtensa: imply CONFIG_ARCH_HAS_RESERVED_PAGE_FRAMES if MMU
48537aeb1f0 xtensa: CONFIG_ARCH_HAS_USERSPACE should be in arch layer
c11b666ab47 soc: intel_adsp/ace: remove secondary boot flow kconfig
27b1c3138f4 xtensa: mmu: remove CONFIG_XTENSA_MMU_DOUBLE_MAP
2e1b4de6d77 soc: intel_adsp/ace: rework MMU mapping array
fdc2e884358 soc: intel_adsp/ace: don't use default MMU mappings
1bc72e68c6c xtensa: mmu: allow SoC to override default mappings
31428237dc3 soc: intel_adsp/ace: move Xtensa HiFi kconfigs to each SoC
04dd427bf1a xtensa: cleanup crt1.S
Signed-off-by: Tomasz Leman <tomasz.m.leman@intel.com>
Total of 759 commits.
Changes include:
7c67dea76a9 intel_adsp: common: gdbstub: Fix compilation DEBUG_SLOT_MANAGER=n
ebb5625bee8 intel_adsp: Add debug slot manager
2ce9d5f5e3c soc: intel_adsp: tools: cavstool.py: Look up the shell slot by type
8cb287a411e intel_adsp: debug_window: Describe the partial slot in page0
c7dd9d79bdf intel_adsp: kconfig: Increase the default size of MEMORY_WIN_2_SIZE
81666a32757 intel_adsp: common: gdbstub: Correct z_gdb_backend_init() return type
3b7b2aef96c drivers: dai: intel: ssp: add get_properties_copy support
05069845d4d drivers: dai: make user-space support build-time selectable
fa2c904266a drivers: dai: add get_properties_copy() method
81e37ad4e85 drivers: dai: add ability to use dai.h from user threads
701cbfbc235 xtensa: mmu: may need to copy entries during L2 table dup
8d0103b4ad8 xtensa: mmu: spin lock for counter manipulation
3e339780782 cache: deprecate CONFIG_DOUBLEMAP
0540d274c0d xtensa: remove CONFIG_XTENSA_RPO_CACHE
a82a09a3148 soc: intel_adsp: SoC specific cached/uncached regions support
5fefc8b8b82 xtensa: cache: guard kconfig CONFIG_XTENSA_{UN,}CACHED_REGION
a8c1df6b807 cache: adds CONFIG_SOC_CACHE
169304813a1 cache: move arch_mem_coherent() into cache subsys
a0a529aecc2 soc: intel_adsp: move ARCH_XTENSA_SET_RPO_TLB inside
06b462bdf69 soc: intel_adsp: add CONFIG_INTEL_ADSP_MEMORY_IS_MIRRORED
b90b396e647 soc: intel_adsp/ace: move included linker script to include dir
301abd86309 xtensa: imply CONFIG_ARCH_HAS_RESERVED_PAGE_FRAMES if MMU
48537aeb1f0 xtensa: CONFIG_ARCH_HAS_USERSPACE should be in arch layer
c11b666ab47 soc: intel_adsp/ace: remove secondary boot flow kconfig
27b1c3138f4 xtensa: mmu: remove CONFIG_XTENSA_MMU_DOUBLE_MAP
2e1b4de6d77 soc: intel_adsp/ace: rework MMU mapping array
fdc2e884358 soc: intel_adsp/ace: don't use default MMU mappings
1bc72e68c6c xtensa: mmu: allow SoC to override default mappings
31428237dc3 soc: intel_adsp/ace: move Xtensa HiFi kconfigs to each SoC
04dd427bf1a xtensa: cleanup crt1.S