Skip to content

Phase 1 (part 3): cache helpers, component_ext.h and LL scheduler header cleanup #11364

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.

Sign up for GitHub

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

Open
lgirdwood wants to merge 12 commits into
base: main
Choose a base branch
from
+188 −244
Open

Phase 1 (part 3): cache helpers, component_ext.h and LL scheduler header cleanup #11364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8b29cce
rtos: cache: provide the cached/uncached alias helpers
lrgirdwo Oct 26, 2026
cf2a02b
coherent: do not include the platform memory map
lrgirdwo Oct 26, 2026
c98beb0
audio: component: move comp_dai_config() out of component_ext.h
lrgirdwo Oct 26, 2026
f7508bc
platform: make the maximum stream count a Kconfig option
lrgirdwo Oct 26, 2026
6195ee2
audio: drop sof/platform.h from the mixer, mux and module adapter
lrgirdwo Oct 26, 2026
a79560e
schedule: move the LL period and user LL lock API to ll_schedule.h
lrgirdwo Oct 26, 2026
13bd924
audio: do not include the LL scheduling domain header
lrgirdwo Oct 26, 2026
352196d
tlv: include rtos/string.h for memcpy_s()
lrgirdwo Oct 26, 2026
6251bb0
audio: intel_uaol: include the logging header
lrgirdwo Oct 26, 2026
469f1d8
audio: up_down_mixer: include rtos/panic.h for the non-HiFi3 stubs
lrgirdwo Oct 26, 2026
a84cc47
audio: drop unused component_ext.h includes
lrgirdwo Oct 26, 2026
a84a130
audio: copier: include sof/lib/cold.h instead of the memory map
lrgirdwo Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions posix/include/rtos/cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,12 @@
/* invalidate data */
#define CACHE_INVALIDATE 1

/*

@kv2019i kv2019i Oct 29, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

And we really should/could be using just the Zephyr functions. Not sure if there are any actual need for these SOF side macros...

* The host has a single address space, so the cached and uncached aliases
* of an address are the same.
*/
#define uncache_to_cache(address) address
#define cache_to_uncache(address) address
#define is_uncached(address) 1

#endif /* __SOF_LIB_CACHE_H__ */
1 change: 1 addition & 0 deletions posix/include/sof/lib/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#define __SOF_LIB_MEMORY_H__

#include <platform/lib/memory.h>
#include <rtos/cache.h>
#include <sof/lib/cold.h>

#endif /* __SOF_LIB_MEMORY_H__ */
1 change: 0 additions & 1 deletion src/audio/aria/aria.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#ifndef __SOF_AUDIO_ARIA_H__
#define __SOF_AUDIO_ARIA_H__

#include <sof/audio/component_ext.h>
#include <sof/audio/ipc-config.h>
#include <sof/compiler_attributes.h>
#include <rtos/bit.h>
Expand Down
2 changes: 0 additions & 2 deletions src/audio/chain_dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@

#include <sof/audio/buffer.h>
#include <sof/audio/component.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/pipeline.h>
#include <sof/common.h>
#include <sof/ipc/topology.h>
#include <sof/ipc/common.h>
#include <ipc/dai.h>
#include <ipc4/gateway.h>
#include <sof/schedule/ll_schedule.h>
#include <sof/schedule/ll_schedule_domain.h>
#include <sof/schedule/schedule.h>
#include <rtos/alloc.h>
#include <rtos/task.h>
Expand Down
5 changes: 3 additions & 2 deletions src/audio/copier/copier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@
#include <sof/audio/sink_api.h>
#include <sof/audio/source_api.h>
#include <sof/audio/component_ext.h>
#include <sof/lib/dai.h>
#include <sof/audio/format.h>
#include <sof/audio/pipeline.h>
#include <sof/common.h>
#include <rtos/panic.h>
#include <rtos/interrupt.h>
#include <sof/ipc/msg.h>
#include <sof/ipc/topology.h>
#include <sof/schedule/ll_schedule_domain.h>
#include <sof/schedule/ll_schedule.h>
#include <rtos/interrupt.h>
#include <rtos/timer.h>
#include <rtos/cache.h>
#include <rtos/init.h>
#include <rtos/userspace_helper.h>
#include <sof/lib/memory.h>
#include <sof/lib/cold.h>
#include <sof/lib/uuid.h>
#include <sof/list.h>
#include <rtos/string.h>
Expand Down
4 changes: 2 additions & 2 deletions src/audio/copier/copier_dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
//
// Author: Baofeng Tian <baofeng.tian@intel.com>

#include <sof/lib/memory.h>
#include <sof/lib/cold.h>
/* ACE_VERSION, see the ALH case below */
#include <sof/platform.h>
#include <sof/trace/trace.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/component_dai.h>
#include <ipc/dai.h>
#include <sof/audio/module_adapter/module/generic.h>
#include "copier.h"
Expand Down
5 changes: 3 additions & 2 deletions src/audio/copier/copier_gain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
//
// Author: Ievgen Ganakov <ievgen.ganakov@intel.com>

#include <sof/lib/memory.h>
#include <sof/lib/cold.h>
#include <sof/trace/trace.h>
#include <ipc4/base-config.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/component.h>
#include <sof/lib/dai.h>
#include <module/module/base.h>
#include <sof/tlv.h>
#include <ipc4/dmic.h>
Expand Down
3 changes: 1 addition & 2 deletions src/audio/copier/copier_generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
// Author: Andrula Song <xiaoyuan.song@intel.com>

#include <ipc4/base-config.h>
#include <sof/audio/component_ext.h>
#include <sof/lib/memory.h>
#include <sof/lib/cold.h>
#include <module/module/base.h>
#include <sof/common.h>
#include <ipc/dai.h>
Expand Down
3 changes: 1 addition & 2 deletions src/audio/copier/copier_hifi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
#if SOF_USE_HIFI(3, COPIER) || SOF_USE_HIFI(4, COPIER) || SOF_USE_HIFI(5, COPIER)

#include <sof/audio/buffer.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/format.h>
#include <sof/audio/pipeline.h>
#include <sof/audio/component.h>
#include <sof/lib/memory.h>
#include <sof/lib/cold.h>
#include <module/module/base.h>
#include <stddef.h>
#include <errno.h>
Expand Down
3 changes: 1 addition & 2 deletions src/audio/copier/copier_host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
//
// Author: Baofeng Tian <baofeng.tian@intel.com>

#include <sof/audio/component_ext.h>
#include <sof/lib/memory.h>
#include <sof/lib/cold.h>
#include <sof/tlv.h>
#include <sof/trace/trace.h>
#include <sof/audio/module_adapter/module/generic.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/copier/copier_ipcgtw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// Copyright 2023 Intel Corporation. All rights reserved.

#include <sof/audio/module_adapter/module/generic.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/audio_buffer.h>
#include <sof/audio/sink_api.h>
#include <sof/audio/source_api.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/copier/host_copier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#ifndef __SOF_HOST_COPIER_H__
#define __SOF_HOST_COPIER_H__

#include <sof/audio/component_ext.h>
#include <sof/audio/pcm_converter.h>
#include <sof/lib/dma.h>
#include <sof/audio/ipc-config.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/copier/ipcgtw_copier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#ifndef __SOF_IPCGTW_COPIER_H__
#define __SOF_IPCGTW_COPIER_H__

#include <sof/audio/component_ext.h>
#include <ipc4/gateway.h>
#include <sof/list.h>
#include <ipc/stream.h>
Expand Down
2 changes: 1 addition & 1 deletion src/audio/intel_uaol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
*/

#include <zephyr/drivers/uaol.h>
#include <zephyr/logging/log.h>
#include <rtos/string.h>
#include <sof/tlv.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/intel_uaol.h>

LOG_MODULE_REGISTER(uaol, CONFIG_SOF_LOG_LEVEL);
Expand Down
7 changes: 3 additions & 4 deletions src/audio/mixer/mixer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <sof/lib/uuid.h>
#include <sof/list.h>
#include <sof/math/numbers.h>
#include <sof/platform.h>
#include <rtos/string.h>
#include <sof/trace/trace.h>
#include <sof/ut.h>
Expand Down Expand Up @@ -77,8 +76,8 @@ static int mixer_process(struct processing_module *mod,
{
struct mixer_data *md = module_get_private_data(mod);
struct comp_dev *dev = mod->dev;
struct sof_source *active_sources[PLATFORM_MAX_STREAMS];
struct cir_buf_source source_bufs[PLATFORM_MAX_STREAMS];
struct sof_source *active_sources[CONFIG_PLATFORM_MAX_STREAMS];
struct cir_buf_source source_bufs[CONFIG_PLATFORM_MAX_STREAMS];
struct cir_buf_sink sink_buf;
size_t bytes, samples, source_bytes, sink_bytes;
size_t frames = SIZE_MAX;
Expand All @@ -88,7 +87,7 @@ static int mixer_process(struct processing_module *mod,
comp_dbg(dev, "%d", num_of_sources);

/* too many sources ? */
if (num_of_sources >= PLATFORM_MAX_STREAMS)
if (num_of_sources >= CONFIG_PLATFORM_MAX_STREAMS)
return -EINVAL;

/* find active sources and compute frame count */
Expand Down
2 changes: 1 addition & 1 deletion src/audio/module_adapter/module/cadence_ipc4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <sof/audio/cadence/mp3_enc/xa_mp3_enc_api.h>
#include <sof/audio/cadence/aac_dec/xa_aac_dec_api.h>
#include <sof/ipc/msg.h>
#include <sof/schedule/ll_schedule_domain.h>
#include <sof/schedule/ll_schedule.h>
#include <ipc/compress_params.h>
#include <ipc4/notification.h>
#include <rtos/init.h>
Expand Down
7 changes: 3 additions & 4 deletions src/audio/module_adapter/module_adapter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@
#include <sof/audio/pipeline.h>
#include <sof/lib/vregion.h>
#include <sof/schedule/dp_schedule.h>
#include <sof/schedule/ll_schedule_domain.h>
#include <sof/schedule/ll_schedule.h>
#include <sof/common.h>
#include <sof/platform.h>
#include <sof/ut.h>
#include <sof/schedule/schedule.h>
#if CONFIG_IPC_MAJOR_4
Expand Down Expand Up @@ -1118,8 +1117,8 @@ static int module_adapter_audio_stream_copy_1to1(struct comp_dev *dev)

static int module_adapter_audio_stream_type_copy(struct comp_dev *dev)
{
struct comp_buffer *sources[PLATFORM_MAX_STREAMS];
struct comp_buffer *sinks[PLATFORM_MAX_STREAMS];
struct comp_buffer *sources[CONFIG_PLATFORM_MAX_STREAMS];
struct comp_buffer *sinks[CONFIG_PLATFORM_MAX_STREAMS];
struct comp_buffer *sink;
struct comp_buffer *source;
struct processing_module *mod = comp_mod(dev);
Expand Down
3 changes: 1 addition & 2 deletions src/audio/mux/mux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <sof/audio/module_adapter/module/generic.h>
#include <sof/common.h>
#include <sof/platform.h>
#include <sof/trace/trace.h>
#include <sof/ut.h>
#include <sof/lib/uuid.h>
Expand All @@ -41,7 +40,7 @@ struct cir_buf_sink;
#endif
#define BASE_CFG_QUEUED_ID 0
/** guard against invalid amount of streams defined */
STATIC_ASSERT(MUX_MAX_STREAMS < PLATFORM_MAX_STREAMS,
STATIC_ASSERT(MUX_MAX_STREAMS < CONFIG_PLATFORM_MAX_STREAMS,
unsupported_amount_of_streams_for_mux);

struct mux_copy_elem {
Expand Down
2 changes: 1 addition & 1 deletion src/audio/pipeline/pipeline-graph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <sof/audio/module_adapter/module/generic.h>
#include <sof/audio/pipeline.h>
#include <sof/ipc/msg.h>
#include <sof/schedule/ll_schedule_domain.h>
#include <sof/schedule/ll_schedule.h>
#include <sof/lib/vregion.h>
#include <rtos/interrupt.h>
#include <rtos/symbol.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/pipeline/pipeline-schedule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include <sof/lib/agent.h>
#include <sof/list.h>
#include <sof/schedule/ll_schedule.h>
#include <sof/schedule/ll_schedule_domain.h>
#include <sof/schedule/dp_schedule.h>
#include <sof/schedule/schedule.h>
#include <sof/audio/module_adapter/module/generic.h>
Expand Down
2 changes: 1 addition & 1 deletion src/audio/pipeline/pipeline-stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <rtos/kernel.h>
#include <sof/audio/module_adapter/module/generic.h>
#include <sof/lib/cpu-clk-manager.h>
#include <sof/schedule/ll_schedule_domain.h>
#include <sof/schedule/ll_schedule.h>

#ifdef CONFIG_IPC_MAJOR_4
#include <ipc4/notification.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/pipeline/pipeline-xrun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// Keyon Jie <yang.jie@linux.intel.com>

#include <sof/audio/buffer.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/pipeline.h>
#include <sof/ipc/msg.h>
#include <sof/list.h>
Expand Down
1 change: 1 addition & 0 deletions src/audio/pipeline/static_pipeline_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <sof/audio/pipeline.h>
#include <sof/audio/buffer.h>
#include <sof/audio/format.h>
#include <sof/audio/component_dai.h>
#include <sof/lib/dai.h>
#include <ipc/topology.h>
#include <ipc/control.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/pipeline/static_pipeline_modules.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
*/

#include <sof/audio/pipeline/static_pipeline.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/buffer.h>
#include <sof/audio/format.h>
#include <ipc/topology.h>
Expand Down
2 changes: 1 addition & 1 deletion src/audio/src/src_ipc4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <sof/audio/sink_api.h>
#include <sof/audio/source_api.h>
#include <sof/audio/sink_source_utils.h>
#include <sof/schedule/ll_schedule_domain.h>
#include <sof/schedule/ll_schedule.h>
#include <rtos/panic.h>
#include <sof/ipc/msg.h>
#include <rtos/alloc.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/up_down_mixer/up_down_mixer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#ifndef __SOF_AUDIO_UP_DOWN_MIXER_H__
#define __SOF_AUDIO_UP_DOWN_MIXER_H__

#include <sof/audio/component_ext.h>
#include <sof/audio/ipc-config.h>
#include <sof/common.h>
#include <ipc/stream.h>
Expand Down
2 changes: 2 additions & 0 deletions src/audio/up_down_mixer/up_down_mixer_hifi3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1917,6 +1917,8 @@ void upmix32bit_quatro_to_5_1(struct up_down_mixer_data *cd, const uint8_t * con

#else /* !XCHAL_HAVE_HIFI3 */

#include <rtos/panic.h>

/* TODO: replace with generic ANSI C version */

void upmix32bit_1_to_5_1(struct up_down_mixer_data *cd, const uint8_t * const in_data,
Expand Down
1 change: 0 additions & 1 deletion src/audio/volume/volume.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

#include <sof/audio/coefficients/volume/windows_fade.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/component.h>
#include <sof/audio/format.h>
#include <sof/audio/module_adapter/module/generic.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/volume/volume_ipc3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
// Author: Baofeng Tian <baofeng.tian@intel.com>

#include <sof/audio/coefficients/volume/windows_fade.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/component.h>
#include <sof/audio/format.h>
#include <sof/audio/module_adapter/module/generic.h>
Expand Down
1 change: 0 additions & 1 deletion src/audio/volume/volume_ipc4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
// Author: Baofeng Tian <baofeng.tian@intel.com>

#include <sof/audio/coefficients/volume/windows_fade.h>
#include <sof/audio/component_ext.h>
#include <sof/audio/component.h>
#include <sof/audio/format.h>
#include <sof/audio/module_adapter/module/generic.h>
Expand Down
1 change: 1 addition & 0 deletions src/include/sof/audio/component.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <sof/debug/telemetry/telemetry.h>
#include <rtos/mutex.h>
#include <rtos/userspace_data.h>
#include <sof/lib/cold.h>
#include <sof/lib/uuid.h>
#include <ipc/control.h>
#include <sof/ipc/topology.h>
Expand Down
Loading
Loading