From 4e0113da30536994ae6d093f28bf22ab9390025f Mon Sep 17 00:00:00 2001 From: Tomasz Lauda Date: Tue, 15 Oct 2019 13:40:26 +0200 Subject: [PATCH] topology: cavs: switch all pipelines to timer scheduling Switches all pipelines for cAVS platforms to timer scheduling. This way we limit the number of interrupt levels processed in the system. Timer, IPC and IDC are already on level 2 and DMAs are on level 5. Signed-off-by: Tomasz Lauda --- tools/topology/sof-apl-da7219.m4 | 8 ++--- tools/topology/sof-apl-demux-pcm512x.m4 | 5 ++-- tools/topology/sof-apl-dmic-a2ch-b2ch.m4 | 4 +-- tools/topology/sof-apl-dmic-a2ch-b4ch.m4 | 4 +-- tools/topology/sof-apl-dmic-a2ch.m4 | 2 +- tools/topology/sof-apl-dmic-a4ch-b2ch.m4 | 4 +-- tools/topology/sof-apl-dmic-b2ch.m4 | 2 +- tools/topology/sof-apl-dmic.m4 | 4 +-- tools/topology/sof-apl-eq-dmic.m4 | 2 +- tools/topology/sof-apl-eq-pcm512x.m4 | 2 +- tools/topology/sof-apl-keyword-detect.m4 | 5 ++-- tools/topology/sof-apl-nocodec.m4 | 29 ++++++++++--------- tools/topology/sof-apl-pcm512x-nohdmi.m4 | 2 +- tools/topology/sof-apl-pcm512x.m4 | 5 ++-- tools/topology/sof-apl-rt298.m4 | 2 +- tools/topology/sof-apl-src-50khz-pcm512x.m4 | 2 +- tools/topology/sof-apl-src-pcm512x.m4 | 2 +- tools/topology/sof-apl-tdf8532.m4 | 20 ++++++------- tools/topology/sof-apl-wm8804.m4 | 2 +- .../sof-cml-demux-rt5682-max98357a.m4 | 4 +-- tools/topology/sof-cml-demux-rt5682.m4 | 9 +++--- tools/topology/sof-cml-rt1011-rt5682.m4 | 2 +- tools/topology/sof-cml-rt5682-kwd.m4 | 11 +++---- tools/topology/sof-cml-rt5682-max98357a.m4 | 4 +-- tools/topology/sof-cml-rt5682.m4 | 8 ++--- tools/topology/sof-cml-rt700.m4 | 8 ++--- tools/topology/sof-cml-src-rt5682.m4 | 6 ++-- tools/topology/sof-cnl-nocodec.m4 | 14 ++++----- tools/topology/sof-cnl-rt274.m4 | 4 +-- tools/topology/sof-glk-da7219-kwd.m4 | 13 +++++---- tools/topology/sof-glk-da7219.m4 | 8 ++--- tools/topology/sof-glk-rt5682.m4 | 8 ++--- tools/topology/sof-icl-dmic-4ch.m4 | 2 +- tools/topology/sof-icl-nocodec.m4 | 4 +-- tools/topology/sof-icl-rt700.m4 | 8 ++--- .../sof-icl-rt711-rt1308-rt715-hdmi.m4 | 10 +++---- tools/topology/sof-icl-rt711-rt1308-rt715.m4 | 10 +++---- tools/topology/sof-tgl-nocodec.m4 | 14 ++++----- tools/topology/sof-tgl-rt1308-nohdmi.m4 | 4 +-- tools/topology/sof-tgl-rt1308.m4 | 4 +-- 40 files changed, 134 insertions(+), 127 deletions(-) diff --git a/tools/topology/sof-apl-da7219.m4 b/tools/topology/sof-apl-da7219.m4 index 35fcb7e9a3b3..ee4591eda820 100644 --- a/tools/topology/sof-apl-da7219.m4 +++ b/tools/topology/sof-apl-da7219.m4 @@ -108,28 +108,28 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_1, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 2, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_2, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, SSP, 1, SSP1-Codec, PIPELINE_SINK_3, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC0 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, DMIC, 0, dmic01, PIPELINE_SINK_4, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 diff --git a/tools/topology/sof-apl-demux-pcm512x.m4 b/tools/topology/sof-apl-demux-pcm512x.m4 index eb28dcb48d52..596871e5dd49 100644 --- a/tools/topology/sof-apl-demux-pcm512x.m4 +++ b/tools/topology/sof-apl-demux-pcm512x.m4 @@ -84,7 +84,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # currently this dai is here as "virtual" capture backend W_DAI_IN(SSP, 5, SSP5-Codec, s24le, 3, 0) @@ -94,7 +94,8 @@ PIPELINE_PCM_ADD(sof/pipe-passthrough-capture-sched.m4, 5, 4, 2, s32le, 1000, 0, 0, 48000, 48000, 48000, - 0, PIPELINE_PLAYBACK_SCHED_COMP_1) + SCHEDULE_TIME_DOMAIN_TIMER, + PIPELINE_PLAYBACK_SCHED_COMP_1) # Connect demux to capture SectionGraph."PIPE_CAP" { diff --git a/tools/topology/sof-apl-dmic-a2ch-b2ch.m4 b/tools/topology/sof-apl-dmic-a2ch-b2ch.m4 index 5247d7b28c73..dc1f08fe0815 100644 --- a/tools/topology/sof-apl-dmic-a2ch-b2ch.m4 +++ b/tools/topology/sof-apl-dmic-a2ch-b2ch.m4 @@ -63,14 +63,14 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, 6, DMIC, 0, NoCodec-6, PIPELINE_SINK_6, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC 1 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 7, DMIC, 1, NoCodec-7, PIPELINE_SINK_7, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) diff --git a/tools/topology/sof-apl-dmic-a2ch-b4ch.m4 b/tools/topology/sof-apl-dmic-a2ch-b4ch.m4 index 88ef8a4c7a05..1bc278ae9a77 100644 --- a/tools/topology/sof-apl-dmic-a2ch-b4ch.m4 +++ b/tools/topology/sof-apl-dmic-a2ch-b4ch.m4 @@ -63,14 +63,14 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, 6, DMIC, 0, NoCodec-6, PIPELINE_SINK_6, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC 1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 7, DMIC, 1, NoCodec-7, PIPELINE_SINK_7, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) diff --git a/tools/topology/sof-apl-dmic-a2ch.m4 b/tools/topology/sof-apl-dmic-a2ch.m4 index e019eefd2eeb..3fa591ec6d3e 100644 --- a/tools/topology/sof-apl-dmic-a2ch.m4 +++ b/tools/topology/sof-apl-dmic-a2ch.m4 @@ -55,7 +55,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, 6, DMIC, 0, NoCodec-6, PIPELINE_SINK_6, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) dnl PCM_CAPTURE_ADD(name, pipeline, capture) diff --git a/tools/topology/sof-apl-dmic-a4ch-b2ch.m4 b/tools/topology/sof-apl-dmic-a4ch-b2ch.m4 index a3dd8540ca65..cfd1dab1eb56 100644 --- a/tools/topology/sof-apl-dmic-a4ch-b2ch.m4 +++ b/tools/topology/sof-apl-dmic-a4ch-b2ch.m4 @@ -63,14 +63,14 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, 6, DMIC, 0, NoCodec-6, PIPELINE_SINK_6, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC 1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 7, DMIC, 1, NoCodec-7, PIPELINE_SINK_7, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) dnl PCM_CAPTURE_ADD(name, pipeline, capture) diff --git a/tools/topology/sof-apl-dmic-b2ch.m4 b/tools/topology/sof-apl-dmic-b2ch.m4 index e6198bf5c05b..544fe6d2fdc1 100644 --- a/tools/topology/sof-apl-dmic-b2ch.m4 +++ b/tools/topology/sof-apl-dmic-b2ch.m4 @@ -55,7 +55,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, 7, DMIC, 1, NoCodec-7, PIPELINE_SINK_7, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) diff --git a/tools/topology/sof-apl-dmic.m4 b/tools/topology/sof-apl-dmic.m4 index 5b142c8602c0..a767dbcf19d9 100644 --- a/tools/topology/sof-apl-dmic.m4 +++ b/tools/topology/sof-apl-dmic.m4 @@ -62,14 +62,14 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, 6, DMIC, 0, NoCodec-6, PIPELINE_SINK_6, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC 1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 7, DMIC, 1, NoCodec-7, PIPELINE_SINK_7, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) diff --git a/tools/topology/sof-apl-eq-dmic.m4 b/tools/topology/sof-apl-eq-dmic.m4 index 69eea9efad2a..645890d6c4ff 100644 --- a/tools/topology/sof-apl-eq-dmic.m4 +++ b/tools/topology/sof-apl-eq-dmic.m4 @@ -52,7 +52,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, 1, DMIC, 0, NoCodec-6, PIPELINE_SINK_1, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) diff --git a/tools/topology/sof-apl-eq-pcm512x.m4 b/tools/topology/sof-apl-eq-pcm512x.m4 index d5a0843b3846..4c38715b34be 100644 --- a/tools/topology/sof-apl-eq-pcm512x.m4 +++ b/tools/topology/sof-apl-eq-pcm512x.m4 @@ -51,7 +51,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1) diff --git a/tools/topology/sof-apl-keyword-detect.m4 b/tools/topology/sof-apl-keyword-detect.m4 index 8ec51f5e8fc9..f4fbe99c24a3 100644 --- a/tools/topology/sof-apl-keyword-detect.m4 +++ b/tools/topology/sof-apl-keyword-detect.m4 @@ -57,7 +57,7 @@ DAI_ADD(sof/pipe-dai-capture.m4, 1, DMIC, 1, NoCodec-6, PIPELINE_SINK_1, 3, s16le, KWD_PIPE_SCH_DEADLINE_US, - 0, 0) + 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # keyword detector pipe dnl PIPELINE_ADD(pipeline, @@ -68,7 +68,8 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate) PIPELINE_ADD(sof/pipe-detect.m4, 2, 2, s16le, KWD_PIPE_SCH_DEADLINE_US, 0, 0, - PIPELINE_SCHED_COMP_1, 0, + PIPELINE_SCHED_COMP_1, + SCHEDULE_TIME_DOMAIN_TIMER, 16000, 16000, 16000) # Connect pipelines together diff --git a/tools/topology/sof-apl-nocodec.m4 b/tools/topology/sof-apl-nocodec.m4 index bcfd339c9a8f..8410f032559b 100644 --- a/tools/topology/sof-apl-nocodec.m4 +++ b/tools/topology/sof-apl-nocodec.m4 @@ -146,7 +146,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 0, NoCodec-0, PIPELINE_SOURCE_1, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # Media playback pipeline 14 on PCM 7 using max 2 channels of s16le. # Set 1000us deadline on core 0 with priority 0 @@ -154,7 +154,8 @@ PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 14, 7, 2, s16le, 1000, 0, 0, 48000, 48000, 48000, - 0, PIPELINE_PLAYBACK_SCHED_COMP_1) + SCHEDULE_TIME_DOMAIN_TIMER, + PIPELINE_PLAYBACK_SCHED_COMP_1) # Connect pipelines together SectionGraph."media-pipeline" { @@ -171,84 +172,84 @@ SectionGraph."media-pipeline" { DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, 0, NoCodec-0, PIPELINE_SINK_2, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 3, SSP, 1, NoCodec-1, PIPELINE_SOURCE_3, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, SSP, 1, NoCodec-1, PIPELINE_SINK_4, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP2 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 #DAI_ADD(sof/pipe-dai-playback.m4, # 5, SSP, 2, NoCodec-2, # PIPELINE_SOURCE_5, 3, s16le, -# 1000, 0, 0) +# 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP2 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 #DAI_ADD(sof/pipe-dai-capture.m4, # 6, SSP, 2, NoCodec-2, # PIPELINE_SINK_6, 3, s16le, -# 1000, 0, 0) +# 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP3 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 7, SSP, 3, NoCodec-3, PIPELINE_SOURCE_7, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP3 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 8, SSP, 3, NoCodec-3, PIPELINE_SINK_8, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP4 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 #DAI_ADD(sof/pipe-dai-playback.m4, # 9, SSP, 4, NoCodec-4, # PIPELINE_SOURCE_9, 3, s16le, -# 1000, 0, 0) +# 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP4 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 #DAI_ADD(sof/pipe-dai-capture.m4, # 10, SSP, 4, NoCodec-4, # PIPELINE_SINK_10, 3, s16le, -# 1000, 0, 0) +# 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP5 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 11, SSP, 5, NoCodec-5, PIPELINE_SOURCE_11, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP5 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 12, SSP, 5, NoCodec-5, PIPELINE_SINK_12, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC 0 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 13, DMIC, 0, NoCodec-6, PIPELINE_SINK_13, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) diff --git a/tools/topology/sof-apl-pcm512x-nohdmi.m4 b/tools/topology/sof-apl-pcm512x-nohdmi.m4 index fc3aec631ca2..24f5691a69c6 100644 --- a/tools/topology/sof-apl-pcm512x-nohdmi.m4 +++ b/tools/topology/sof-apl-pcm512x-nohdmi.m4 @@ -53,7 +53,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/sof-apl-pcm512x.m4 b/tools/topology/sof-apl-pcm512x.m4 index 2f516be523a3..8fbc80914073 100644 --- a/tools/topology/sof-apl-pcm512x.m4 +++ b/tools/topology/sof-apl-pcm512x.m4 @@ -83,7 +83,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # Media playback pipeline 5 on PCM 4 using max 2 channels of s16le. # Set 1000us deadline on core 0 with priority 0 @@ -91,7 +91,8 @@ PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 5, 4, 2, s16le, 1000, 0, 0, 8000, 96000, 48000, - 0, PIPELINE_PLAYBACK_SCHED_COMP_1) + SCHEDULE_TIME_DOMAIN_TIMER, + PIPELINE_PLAYBACK_SCHED_COMP_1) # Connect pipelines together SectionGraph."media-pipeline" { diff --git a/tools/topology/sof-apl-rt298.m4 b/tools/topology/sof-apl-rt298.m4 index 95e2587e6b94..43c472cf9881 100644 --- a/tools/topology/sof-apl-rt298.m4 +++ b/tools/topology/sof-apl-rt298.m4 @@ -80,7 +80,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 diff --git a/tools/topology/sof-apl-src-50khz-pcm512x.m4 b/tools/topology/sof-apl-src-50khz-pcm512x.m4 index 4fc851353389..d754d643e4b4 100644 --- a/tools/topology/sof-apl-src-50khz-pcm512x.m4 +++ b/tools/topology/sof-apl-src-50khz-pcm512x.m4 @@ -54,7 +54,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/sof-apl-src-pcm512x.m4 b/tools/topology/sof-apl-src-pcm512x.m4 index 9a202da1d1fd..7a0a689fdd85 100644 --- a/tools/topology/sof-apl-src-pcm512x.m4 +++ b/tools/topology/sof-apl-src-pcm512x.m4 @@ -54,7 +54,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/sof-apl-tdf8532.m4 b/tools/topology/sof-apl-tdf8532.m4 index 8db4732d50a4..0e13d571a0fc 100644 --- a/tools/topology/sof-apl-tdf8532.m4 +++ b/tools/topology/sof-apl-tdf8532.m4 @@ -119,70 +119,70 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 4, SSP, 0, SSP0-Codec, PIPELINE_SOURCE_4, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP0 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 5, SSP, 0, SSP0-Codec, PIPELINE_SINK_5, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 6, SSP, 1, SSP1-Codec, PIPELINE_SINK_6, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP2 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 2, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_2, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP2 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, SSP, 2, SSP2-Codec, PIPELINE_SINK_3, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP3 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 7, SSP, 3, SSP3-Codec, PIPELINE_SOURCE_7, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP3 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 8, SSP, 3, SSP3-Codec, PIPELINE_SINK_8, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP4 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 4, SSP4-Codec, PIPELINE_SOURCE_1, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP5 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 9, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_9, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP5 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 10, SSP, 5, SSP5-Codec, PIPELINE_SINK_10, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 PCM_DUPLEX_ADD(Port0, 2, PIPELINE_PCM_4, PIPELINE_PCM_5) diff --git a/tools/topology/sof-apl-wm8804.m4 b/tools/topology/sof-apl-wm8804.m4 index dbef0697d945..e35f0fc5c97c 100644 --- a/tools/topology/sof-apl-wm8804.m4 +++ b/tools/topology/sof-apl-wm8804.m4 @@ -51,7 +51,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 5, SSP5-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1) diff --git a/tools/topology/sof-cml-demux-rt5682-max98357a.m4 b/tools/topology/sof-cml-demux-rt5682-max98357a.m4 index a4da1270f479..ed4c70d3dc8b 100644 --- a/tools/topology/sof-cml-demux-rt5682-max98357a.m4 +++ b/tools/topology/sof-cml-demux-rt5682-max98357a.m4 @@ -51,11 +51,11 @@ ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1', `DAI_ADD(sof/pipe-dai-playback.m4, 8, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_7, 3, s24le, - 1000, 0, 0)', + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)', `DAI_ADD(sof/pipe-dai-playback.m4, 8, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_7, 3, s16le, - 1000, 0, 0)') + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)') # PCM Low Latency, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/sof-cml-demux-rt5682.m4 b/tools/topology/sof-cml-demux-rt5682.m4 index 75715773e712..9cdafcee7afd 100644 --- a/tools/topology/sof-cml-demux-rt5682.m4 +++ b/tools/topology/sof-cml-demux-rt5682.m4 @@ -108,20 +108,21 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, SSP_INDEX, SSP_NAME, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP(SSP_INDEX) using 3 periods # Buffers use s24le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP,SSP_INDEX, SSP_NAME, PIPELINE_SINK_2, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # Capture pipeline 5 on PCM 5 using max 2 channels of s32le. PIPELINE_PCM_ADD(sof/pipe-passthrough-capture-sched.m4, 5, 5, 2, s32le, 1000, 0, 0, - 48000, 48000, 48000) + 48000, 48000, 48000, + SCHEDULE_TIME_DOMAIN_TIMER) # Connect demux to capture SectionGraph."PIPE_CAP" { @@ -148,7 +149,7 @@ SectionGraph."PIPE_CAP_VIRT" { DAI_ADD(sof/pipe-dai-capture.m4, 3, DMIC, 0, dmic01, PIPELINE_SINK_3, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 diff --git a/tools/topology/sof-cml-rt1011-rt5682.m4 b/tools/topology/sof-cml-rt1011-rt5682.m4 index 01e4e0a39407..4808d7879f45 100644 --- a/tools/topology/sof-cml-rt1011-rt5682.m4 +++ b/tools/topology/sof-cml-rt1011-rt5682.m4 @@ -41,7 +41,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 7, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_7, 3, s24le, - 48, 1000, 0, 0) + 48, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/sof-cml-rt5682-kwd.m4 b/tools/topology/sof-cml-rt5682-kwd.m4 index 93eccffc2757..6f090fd23ac2 100644 --- a/tools/topology/sof-cml-rt5682-kwd.m4 +++ b/tools/topology/sof-cml-rt5682-kwd.m4 @@ -121,21 +121,21 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, SSP_INDEX, SSP_NAME, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP(SSP_INDEX) using 3 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP,SSP_INDEX, SSP_NAME, PIPELINE_SINK_2, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC01 using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, DMIC, 0, dmic01, PIPELINE_SINK_3, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 @@ -174,7 +174,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-kfbm-capture.m4, DAI_ADD(sof/pipe-dai-capture.m4, 8, DMIC, 1, dmic16k, PIPELINE_SINK_8, 3, s32le, - KWD_PIPE_SCH_DEADLINE_US, 0, 0) + KWD_PIPE_SCH_DEADLINE_US, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) @@ -193,7 +193,8 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate) PIPELINE_ADD(sof/pipe-detect.m4, 9, 2, s24le, KWD_PIPE_SCH_DEADLINE_US, 0, 0, - PIPELINE_SCHED_COMP_8, 0, + PIPELINE_SCHED_COMP_8, + SCHEDULE_TIME_DOMAIN_TIMER, 16000, 16000, 16000) # Connect pipelines together diff --git a/tools/topology/sof-cml-rt5682-max98357a.m4 b/tools/topology/sof-cml-rt5682-max98357a.m4 index 85136d1449d3..e6846c48dbbb 100644 --- a/tools/topology/sof-cml-rt5682-max98357a.m4 +++ b/tools/topology/sof-cml-rt5682-max98357a.m4 @@ -54,11 +54,11 @@ ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1', `DAI_ADD(sof/pipe-dai-playback.m4, 7, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_7, 3, s24le, - 1000, 0, 0)', + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)', `DAI_ADD(sof/pipe-dai-playback.m4, 7, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_7, 3, s16le, - 1000, 0, 0)') + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)') # PCM Low Latency, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/sof-cml-rt5682.m4 b/tools/topology/sof-cml-rt5682.m4 index f88c8af5ff46..77ff213377f9 100644 --- a/tools/topology/sof-cml-rt5682.m4 +++ b/tools/topology/sof-cml-rt5682.m4 @@ -124,21 +124,21 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, SSP_INDEX, SSP_NAME, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP(SSP_INDEX) using 3 periods # Buffers use s24le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP,SSP_INDEX, SSP_NAME, PIPELINE_SINK_2, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC01 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, DMIC, 0, dmic01, PIPELINE_SINK_3, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 @@ -166,7 +166,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, DAI_ADD(sof/pipe-dai-capture.m4, 8, DMIC, 1, dmic16k, PIPELINE_SINK_8, 3, s32le, - 16, 1000, 0, 0) + 16, 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 diff --git a/tools/topology/sof-cml-rt700.m4 b/tools/topology/sof-cml-rt700.m4 index 4c006e2e0011..bf50868863ca 100644 --- a/tools/topology/sof-cml-rt700.m4 +++ b/tools/topology/sof-cml-rt700.m4 @@ -107,28 +107,28 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, 0x102, SDW1-Playback, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW1 PIN3) using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, ALH, 0x103, SDW1-Capture, PIPELINE_SINK_2, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC01 using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, DMIC, 0, dmic01, PIPELINE_SINK_3, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC16k using 3 periods # Buffers use s16le format, with 16 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, DMIC, 1, dmic16k, PIPELINE_SINK_4, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 diff --git a/tools/topology/sof-cml-src-rt5682.m4 b/tools/topology/sof-cml-src-rt5682.m4 index de1bdb671af6..9c5b329dc6dd 100644 --- a/tools/topology/sof-cml-src-rt5682.m4 +++ b/tools/topology/sof-cml-src-rt5682.m4 @@ -100,21 +100,21 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 using 3 periods # Buffers use s24le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, 1, SSP1-Codec, PIPELINE_SINK_2, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC01 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, DMIC, 0, dmic01, PIPELINE_SINK_3, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 diff --git a/tools/topology/sof-cnl-nocodec.m4 b/tools/topology/sof-cnl-nocodec.m4 index 06f056e9839a..beb56a80b4e2 100644 --- a/tools/topology/sof-cnl-nocodec.m4 +++ b/tools/topology/sof-cnl-nocodec.m4 @@ -97,49 +97,49 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 0, NoCodec-0, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP0 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, 0, NoCodec-0, PIPELINE_SINK_2, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 3, SSP, 1, NoCodec-1, PIPELINE_SOURCE_3, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, SSP, 1, NoCodec-1, PIPELINE_SINK_4, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP2 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 5, SSP, 2, NoCodec-2, PIPELINE_SOURCE_5, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP2 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 6, SSP, 2, NoCodec-2, PIPELINE_SINK_6, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC 0 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 7, DMIC, 0, NoCodec-3, PIPELINE_SINK_7, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) diff --git a/tools/topology/sof-cnl-rt274.m4 b/tools/topology/sof-cnl-rt274.m4 index 36bf2a952bcc..95a097130ed5 100644 --- a/tools/topology/sof-cnl-rt274.m4 +++ b/tools/topology/sof-cnl-rt274.m4 @@ -61,14 +61,14 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 0, SSP0-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP0 using 3 periods # Buffers use s24le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, 0, SSP0-Codec, PIPELINE_SINK_2, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency PCM_DUPLEX_ADD(Passthrough, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) diff --git a/tools/topology/sof-glk-da7219-kwd.m4 b/tools/topology/sof-glk-da7219-kwd.m4 index f3b2514ec6a1..d0f3373206b8 100644 --- a/tools/topology/sof-glk-da7219-kwd.m4 +++ b/tools/topology/sof-glk-da7219-kwd.m4 @@ -110,28 +110,28 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_1, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP2 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 2, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_2, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP2 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, SSP, 2, SSP2-Codec, PIPELINE_SINK_3, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC0 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, DMIC, 0, dmic01, PIPELINE_SINK_4, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 @@ -170,7 +170,8 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-kfbm-capture.m4, DAI_ADD(sof/pipe-dai-capture.m4, 8, DMIC, 1, dmic16k, PIPELINE_SINK_8, 3, s16le, - KWD_PIPE_SCH_DEADLINE_US, 0, 0) + KWD_PIPE_SCH_DEADLINE_US, 0, 0, + SCHEDULE_TIME_DOMAIN_TIMER) PCM_PLAYBACK_ADD(Speakers, 0, PIPELINE_PCM_1) PCM_DUPLEX_ADD(Headset, 1, PIPELINE_PCM_2, PIPELINE_PCM_3) @@ -188,7 +189,7 @@ dnl pcm_min_rate, pcm_max_rate, pipeline_rate) PIPELINE_ADD(sof/pipe-detect.m4, 9, 2, s16le, KWD_PIPE_SCH_DEADLINE_US, 0, 0, - PIPELINE_SCHED_COMP_8, 0, + PIPELINE_SCHED_COMP_8, SCHEDULE_TIME_DOMAIN_TIMER, 16000, 16000, 16000)) # Connect pipelines together diff --git a/tools/topology/sof-glk-da7219.m4 b/tools/topology/sof-glk-da7219.m4 index fcb83f6a3ac8..079c440478f0 100644 --- a/tools/topology/sof-glk-da7219.m4 +++ b/tools/topology/sof-glk-da7219.m4 @@ -109,28 +109,28 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_1, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP2 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 2, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_2, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP2 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, SSP, 2, SSP2-Codec, PIPELINE_SINK_3, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC0 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, DMIC, 0, dmic01, PIPELINE_SINK_4, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 diff --git a/tools/topology/sof-glk-rt5682.m4 b/tools/topology/sof-glk-rt5682.m4 index a65d10ddbaf7..ebc592ada376 100644 --- a/tools/topology/sof-glk-rt5682.m4 +++ b/tools/topology/sof-glk-rt5682.m4 @@ -112,28 +112,28 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 1, SSP1-Codec, PIPELINE_SOURCE_1, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 2, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_2, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, SSP, 2, SSP2-Codec, PIPELINE_SINK_3, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC0 using 3 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, DMIC, 0, dmic01, PIPELINE_SINK_4, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s16le format, 1000us deadline on core 0 with priority 0 diff --git a/tools/topology/sof-icl-dmic-4ch.m4 b/tools/topology/sof-icl-dmic-4ch.m4 index 5114d9896765..14303a23c999 100644 --- a/tools/topology/sof-icl-dmic-4ch.m4 +++ b/tools/topology/sof-icl-dmic-4ch.m4 @@ -52,7 +52,7 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-capture.m4, 1, DMIC, 0, dmic01, PIPELINE_SINK_1, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) diff --git a/tools/topology/sof-icl-nocodec.m4 b/tools/topology/sof-icl-nocodec.m4 index b78c1fac695a..889d21ac1925 100644 --- a/tools/topology/sof-icl-nocodec.m4 +++ b/tools/topology/sof-icl-nocodec.m4 @@ -60,14 +60,14 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 0, NoCodec-0, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP0 using 3 periods # Buffers use s24le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, 0, NoCodec-0, PIPELINE_SINK_2, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency PCM_DUPLEX_ADD(Passthrough, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) diff --git a/tools/topology/sof-icl-rt700.m4 b/tools/topology/sof-icl-rt700.m4 index 015570fd6983..390d65ba0d35 100644 --- a/tools/topology/sof-icl-rt700.m4 +++ b/tools/topology/sof-icl-rt700.m4 @@ -107,28 +107,28 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, 2, SDW0-Playback, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW0 PIN2) using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, ALH, 3, SDW0-Capture, PIPELINE_SINK_2, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC01 using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, DMIC, 0, dmic01, PIPELINE_SINK_3, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC16k using 3 periods # Buffers use s16le format, with 16 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, DMIC, 1, dmic16k, PIPELINE_SINK_4, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 diff --git a/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 b/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 index af2d4f7c986b..24515b03d9ff 100644 --- a/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 +++ b/tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4 @@ -113,35 +113,35 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, 2, SDW0-Playback, PIPELINE_SOURCE_1, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW0 PIN2) using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, ALH, 3, SDW0-Capture, PIPELINE_SINK_2, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is ALH(SDW1 PIN2) using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 3, ALH, 0x102, SDW1-Playback, PIPELINE_SOURCE_3, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is ALH(SDW2 PIN2) using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 4, ALH, 0x202, SDW2-Playback, PIPELINE_SOURCE_4, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW3 PIN2) using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 5, ALH, 0x302, SDW3-Capture, PIPELINE_SINK_5, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # # Buffers use s32le format, 1000us deadline on core 0 with priority 0 diff --git a/tools/topology/sof-icl-rt711-rt1308-rt715.m4 b/tools/topology/sof-icl-rt711-rt1308-rt715.m4 index 7b8c13668a90..9049f566263b 100644 --- a/tools/topology/sof-icl-rt711-rt1308-rt715.m4 +++ b/tools/topology/sof-icl-rt711-rt1308-rt715.m4 @@ -83,35 +83,35 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, ALH, 2, SDW0-Playback, PIPELINE_SOURCE_1, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW0 PIN2) using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, ALH, 3, SDW0-Capture, PIPELINE_SINK_2, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is ALH(SDW1 PIN2) using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 3, ALH, 0x102, SDW1-Playback, PIPELINE_SOURCE_3, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is ALH(SDW2 PIN2) using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 4, ALH, 0x202, SDW2-Playback, PIPELINE_SOURCE_4, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is ALH(SDW3 PIN2) using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 5, ALH, 0x302, SDW3-Capture, PIPELINE_SINK_5, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 diff --git a/tools/topology/sof-tgl-nocodec.m4 b/tools/topology/sof-tgl-nocodec.m4 index 99c98fb35f63..3ee70bbc761d 100644 --- a/tools/topology/sof-tgl-nocodec.m4 +++ b/tools/topology/sof-tgl-nocodec.m4 @@ -100,49 +100,49 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 0, NoCodec-0, PIPELINE_SOURCE_1, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP0 using 3 periods # Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, SSP, 0, NoCodec-0, PIPELINE_SINK_2, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP1 using 3 periods # Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 3, SSP, 1, NoCodec-1, PIPELINE_SOURCE_3, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP1 using 3 periods # Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 4, SSP, 1, NoCodec-1, PIPELINE_SINK_4, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is SSP2 using 3 periods # Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 5, SSP, 2, NoCodec-2, PIPELINE_SOURCE_5, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is SSP2 using 3 periods # Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 6, SSP, 2, NoCodec-2, PIPELINE_SINK_6, 3, s16le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC 0 using 3 periods # Buffers use s32le format, 1000us deadline on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 13, DMIC, 0, NoCodec-6, PIPELINE_SINK_13, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture) PCM_DUPLEX_ADD(Port0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) diff --git a/tools/topology/sof-tgl-rt1308-nohdmi.m4 b/tools/topology/sof-tgl-rt1308-nohdmi.m4 index 30d0b29f51e1..46197139b5e4 100644 --- a/tools/topology/sof-tgl-rt1308-nohdmi.m4 +++ b/tools/topology/sof-tgl-rt1308-nohdmi.m4 @@ -62,14 +62,14 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC01 using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, DMIC, 0, dmic01, PIPELINE_SINK_2, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # PCM Low Latency, id 0 dnl PCM_PLAYBACK_ADD(name, pcm_id, playback) diff --git a/tools/topology/sof-tgl-rt1308.m4 b/tools/topology/sof-tgl-rt1308.m4 index a94ad9fc927e..0062a92e3998 100644 --- a/tools/topology/sof-tgl-rt1308.m4 +++ b/tools/topology/sof-tgl-rt1308.m4 @@ -100,14 +100,14 @@ dnl deadline, priority, core, time_domain) DAI_ADD(sof/pipe-dai-playback.m4, 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 3, s24le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # capture DAI is DMIC01 using 3 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 2, DMIC, 0, dmic01, PIPELINE_SINK_2, 3, s32le, - 1000, 0, 0) + 1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER) # playback DAI is iDisp1 using 2 periods # Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0