Skip to content

Zephyr: fix log filtering - #5066

Merged
lgirdwood merged 2 commits into
thesofproject:mainfrom
marc-hb:zephyr-log-filter
Dec 25, 2021
Merged

Zephyr: fix log filtering#5066
lgirdwood merged 2 commits into
thesofproject:mainfrom
marc-hb:zephyr-log-filter

Conversation

@marc-hb

Copy link
Copy Markdown
Collaborator

Fixes#5032.

Hard-dependency on zephyrproject-rtos/zephyr/pull/40975, Zephyr will fail to build until then.

This reverts commit 206df54.
Part of the fix for thesofproject#5032
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This reverts commit b31d19b.
Part of the fix for thesofproject#5032
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb

marc-hb commented Dec 17, 2021

Copy link
Copy Markdown
CollaboratorAuthor

https://github.com/thesofproject/sof/runs/4466614835?check_suite_focus=true before Zephyr 40975 was merged failed as expected:

xtensa-zephyr-elf/bin/ld.bfd: modules/sof/libmodules_sof.a(trace.c.obj):(.literal.trace_filter_update+0x0): undefined reference to `_trace_ctx_start'
xtensa-zephyr-elf/bin/ld.bfd: modules/sof/libmodules_sof.a(trace.c.obj):(.literal.trace_filter_update+0x4): undefined reference to `_trace_ctx_end'

https://sof-ci.01.org/sofpr/PR5066/build11340/build/

[246/257] Linking C executable zephyr/zephyr_pre0.elf
FAILED: zephyr/zephyr_pre0.elf zephyr/zephyr_pre0.map /srv/home/jenkins/workspace/sof_generic_build/zephyrproject/build-tgl-h/zephyr/zephyr_pre0.map : && ccache /srv/home/jenkins/xcc/install/tools/RG-2017.8-linux/XtensaTools/bin/xt-xcc zephyr/CMakeFiles/zephyr_pre0.dir/misc/empty_file.c.obj -o zephyr/zephyr_pre0.elf zephyr/CMakeFiles/offsets.dir/./arch/xtensa/core/offsets/offsets.c.obj -Wl,-T zephyr/linker_zephyr_pre0.cmd -Wl,-Map=/srv/home/jenkins/workspace/sof_generic_build/zephyrproject/build-tgl-h/zephyr/zephyr_pre0.map -Wl,--whole-archive app/libapp.a zephyr/libzephyr.a zephyr/arch/common/libarch__common.a zephyr/arch/arch/xtensa/core/libarch__xtensa__core.a zephyr/arch/arch/xtensa/core/startup/libarch__xtensa__core__startup.a zephyr/lib/libc/minimal/liblib__libc__minimal.a zephyr/lib/posix/liblib__posix.a zephyr/soc/xtensa/intel_adsp/common/libintel_adsp_common.a zephyr/drivers/interrupt_controller/libdrivers__interrupt_controller.a zephyr/drivers/timer/libdrivers__timer.a modules/sof/libmodules_sof.a -Wl,--no-whole-archive zephyr/kernel/libkernel.a -L/srv/home/jenkins/workspace/sof_generic_build/zephyrproject/build-tgl-h/zephyr -lgcc -lhal zephyr/arch/common/libisr_tables.a zephyr/soc/xtensa/intel_adsp/common/libintel_adsp_common.a -Wl,--gc-sections -Wl,--build-id=none -Wl,--sort-common=descending -Wl,--sort-section=alignment -Wl,-u,_OffsetAbsSyms -Wl,-u,_ConfigAbsSyms -nostdlib -static -Wl,-X -Wl,-N && cd /srv/home/jenkins/workspace/sof_generic_build/zephyrproject/build-tgl-h/zephyr && /usr/bin/cmake -E echo
/srv/home/jenkins/xcc/install/tools/RG-2017.8-linux/XtensaTools/bin/xt-ld:modules/sof/libmodules_sof.a(hda-dma.c.obj): error: no memory region specified for loadable section .trace_ctx

@marc-hb

marc-hb commented Dec 17, 2021

Copy link
Copy Markdown
CollaboratorAuthor

SOFCI TEST

https://sof-ci.01.org/sofpr/PR5066/build11393/build/ failed because it used Zephyr commit f8cd20fa3e74 which is not recent enough and missing intel/cavs.ld fix 9a1c5ec78eac from zephyrproject-rtos/zephyr/pull/40975

https://github.com/thesofproject/sof/runs/4555932363 builds successfully until it tries an IMX platform and then it fails.

Additional IMX fix needed, submitted in zephyrproject-rtos/zephyr/pull/41282

@lgirdwood

Copy link
Copy Markdown
Member

Ok, lets rerun CI after Zephyr fix is merged.

@marc-hb

marc-hb commented Dec 24, 2021

Copy link
Copy Markdown
CollaboratorAuthor

@marc-hb
marc-hb marked this pull request as ready for review December 24, 2021 01:54
@lgirdwood
lgirdwood merged commit ecd2d46 into thesofproject:mainDec 25, 2021
@marc-hb
marc-hb deleted the zephyr-log-filter branch January 4, 2022 02:40
Sign up for freeto 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.

[BUG][Zephyr] IPC error for FILTER_UPDATE when kmod unload after playback on Zephyr platforms

2 participants

@marc-hb@lgirdwood