Three build fixes to non-Zephyr builds (testbench and friends)#10409
Merged
lgirdwood merged 3 commits intothesofproject:mainfrom Dec 2, 2025
Merged
Three build fixes to non-Zephyr builds (testbench and friends)#10409lgirdwood merged 3 commits intothesofproject:mainfrom
lgirdwood merged 3 commits intothesofproject:mainfrom
Conversation
A goto label that is not used when built with CONFIG_ZEPHYR_DP_SCHEDULER=n causes build errors. Rework the code to handle the error without a conditional jump label. Fixes: c30f5bc ("ipc4: helper: Fix error handling in ipc_comp_connect") Suggested-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Only use Zephyr heap definitions when building with Zephyr. Fixes: 9ff0a7a ("alloc: sof_heap: Add missing support for shared buffers in sof_heap_alloc") Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
kv2019i
requested review from
dbaluta,
jxstelter,
lbetlej,
lgirdwood,
mmaka1,
plbossart and
ranj063
as code owners
There was a problem hiding this comment.
Pull request overview
This PR fixes build issues for non-Zephyr builds (testbench and similar environments) by addressing two separate problems: an incorrect error handling flow that used a removed label, and improper access to Zephyr-specific struct fields.
- Replaces goto with direct error handling in IPC4 connection code
- Guards Zephyr-specific heap initialization fields with preprocessor directives
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/ipc/ipc4/helper.c | Fixes error handling by removing goto to non-existent label and returning error directly |
| src/audio/module_adapter/module_adapter.c | Guards Zephyr-specific heap struct field accesses with __ZEPHYR__ ifdef |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
ujfalusi
approved these changes
Dec 2, 2025
softwarecki
approved these changes
Dec 2, 2025
is_cached() is not available in posix Zephyr builds (like fuzzer). Use standard Zephyr interface for cache primitives instead. Fixes: 9ff0a7a ("alloc: sof_heap: Add missing support for shared buffers in sof_heap_alloc") Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
kv2019i
changed the title
singalsu
approved these changes
Dec 2, 2025
Collaborator
singalsu
left a comment
singalsu
left a comment
There was a problem hiding this comment.
Thanks, this works for me!
lgirdwood
approved these changes
Dec 2, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.