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

ipc/cmake: use the new add_local_sources() indirection layer #8549

Merged
merged 1 commit into from
Dec 7, 2023

Conversation

marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Nov 29, 2023

In the review of commit 1bd9e0d ("cmake/zephyr: decentralize src/ipc/"), Andy recommended "maybe work around this by adding yet another layer of indirection". I rejected the idea at the time because the level of duplication in the ipc/ directory was small. Then I looked at the bigger math/ subdirectory and I realized in #8548 that such an indirection layer is actually required for bigger and/or more complex cases. So I added that layer of indirection in commit 330d73e ("cmake: a few new add_local_sources_ifdef compatibility macros")

Now that we have it, we might as well use it and perform small simplifications in ipc/cmake.

@keqiaozhang
Copy link
Collaborator

SOFCI TEST

@marc-hb
Copy link
Collaborator Author

marc-hb commented Nov 30, 2023

There's apparently a new MTL firmware needed:
https://sof-ci.01.org/sofpr/PR8549/build580/devicetest/index.html

[    6.087209] kernel: i915 0000:00:02.0: [drm] *ERROR* GT1: GSC firmware i915/mtl_gsc_1.bin: fetch failed -ENOENT

Does not seem to impact other test results, everything else is green.

https://sof-ci.01.org/sofpr/PR8549/build581/devicetest/index.html and https://sof-ci.01.org/sof-pr-viewer/#/build/PR8549/build13196789 is all green too.

cc: @kv2019i , @keqiaozhang

https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/i915?id=81caac98eda16944446fa057191ee969c377154a

@keqiaozhang
Copy link
Collaborator

There's apparently a new MTL firmware needed:

It runs to a new error after downloading the missing i915 firmware.

[    6.316817] kernel: i915 0000:00:02.0: [drm] *ERROR* GT1: GSC proxy handler failed to init

https://anduin.linuxfromscratch.org/sources/linux-firmware/i915/mtl_gsc_1.bin

@kv2019i
Copy link
Collaborator

kv2019i commented Dec 5, 2023

Ready to be merged except for mandatory CI. "Internal Intel CI System/merge/codecheck" seems to be stuck.

In the review of commit 1bd9e0d ("cmake/zephyr: decentralize
src/ipc/"), Andy recommended "maybe work around this by adding yet
another layer of indirection". I rejected the idea at the time because
the level of duplication in the ipc/ directory was small. Then I looked
at the bigger math/ subdirectory and I realized in thesofproject#8548 that such an
indirection layer is actually required for bigger and/or more complex
cases. So I added that layer of indirection in commit
330d73e ("cmake: a few new add_local_sources[_ifdef]()
compatibility macros")

Now that we have it, we might as well use it and perform small
simplifications in ipc/cmake.

Signed-off-by: Marc Herbert <[email protected]>
@marc-hb
Copy link
Collaborator Author

marc-hb commented Dec 5, 2023

"Internal Intel CI System/merge/codecheck" seems to be stuck.

Re-run thanks to an empty git commit --amend -C HEAD + force-push. Passed this time.

Well known MTL GSC firmware issue in https://sof-ci.01.org/sofpr/PR8549/build735/devicetest/index.html, everything else passed (even suspend/resume!)

Only one suspend/resume failure in
https://sof-ci.01.org/sofpr/PR8549/build736/devicetest/index.html

@lgirdwood lgirdwood merged commit ced949e into thesofproject:main Dec 7, 2023
42 of 44 checks passed
@marc-hb marc-hb deleted the cmake-ipc-indirection branch December 27, 2023 00:27
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.

6 participants