topology: add a "core" parameter to the W_DCBLOCK() macro

This places all SectionWidget.DCBLOCK* topology widgets, created by the W_DCBLOCK() macro on the same core, on which the respective pipeline is scheduled. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
iganakov · Apr 8, 2020 · 6fe1f34 · 6fe1f34
1 parent ce22914
commit 6fe1f34
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/tools/topology/m4/dcblock.m4 b/tools/topology/m4/dcblock.m4
@@ -2,16 +2,17 @@ divert(-1)
 
 dnl Define macro for DC Blocking Filter widget
 
-dnl DCBLOCK name)
+dnl N_DCBLOCK(name)
 define(`N_DCBLOCK', `DCBLOCK'PIPELINE_ID`.'$1)
 
-dnl W_EQ(name, format, periods_sink, periods_source, kcontrols_list)
+dnl W_DCBLOCK(name, format, periods_sink, periods_source, core, kcontrols_list)
 define(`W_DCBLOCK',
 `SectionVendorTuples."'N_DCBLOCK($1)`_tuples_w" {'
 `	tokens "sof_comp_tokens"'
 `	tuples."word" {'
 `		SOF_TKN_COMP_PERIOD_SINK_COUNT'		STR($3)
 `		SOF_TKN_COMP_PERIOD_SOURCE_COUNT'	STR($4)
+`		SOF_TKN_COMP_CORE_ID'			STR($5)
 `	}'
 `}'
 `SectionData."'N_DCBLOCK($1)`_data_w" {'
@@ -45,7 +46,7 @@ define(`W_DCBLOCK',
 `		"'N_DCBLOCK($1)`_data_str_type"'
 `	]'
 `	bytes ['
-		$5
+		$6
 `	]'
 `}')
 

diff --git a/tools/topology/sof/pipe-dcblock-capture.m4 b/tools/topology/sof/pipe-dcblock-capture.m4
@@ -39,7 +39,8 @@ include(`dcblock_coef_default.m4')
       DCBLOCK_priv)
 
 # "DC Block" has 2 sink periods and 2 source periods
-W_DCBLOCK(0, PIPELINE_FORMAT, 2, 2, LIST(`   ', "MY_DCBLOCK_CTRL"))
+W_DCBLOCK(0, PIPELINE_FORMAT, 2, 2, SCHEDULE_CORE,
+	LIST(`   ', "MY_DCBLOCK_CTRL"))
 
 # Capture Buffers
 W_BUFFER(0, COMP_BUFFER_SIZE(3,

diff --git a/tools/topology/sof/pipe-dcblock-playback.m4 b/tools/topology/sof/pipe-dcblock-playback.m4
@@ -47,7 +47,8 @@ include(`dcblock_coef_default.m4')
       DCBLOCK_priv)
 
 # "DC Block" has 2 sink periods and 2 source periods
-W_DCBLOCK(0, PIPELINE_FORMAT, 2, 2, LIST(`   ', "MY_DCBLOCK_CTRL"))
+W_DCBLOCK(0, PIPELINE_FORMAT, 2, 2, SCHEDULE_CORE,
+	LIST(`   ', "MY_DCBLOCK_CTRL"))
 
 # Playback Buffers
 W_BUFFER(0, COMP_BUFFER_SIZE(2,

diff --git a/tools/topology/sof/pipe-dcblock-volume-playback.m4 b/tools/topology/sof/pipe-dcblock-volume-playback.m4
@@ -69,7 +69,8 @@ W_PGA(0, PIPELINE_FORMAT, DAI_PERIODS, 2, MY_PGA_CONF, SCHEDULE_CORE,
 	LIST(`		', "PIPELINE_ID Master Playback Volume"))
 
 # "DC Block" has 2 sink periods and 2 source periods
-W_DCBLOCK(0, PIPELINE_FORMAT, 2, 2, LIST(`   ', "MY_DCBLOCK_CTRL"))
+W_DCBLOCK(0, PIPELINE_FORMAT, 2, 2, SCHEDULE_CORE,
+	LIST(`   ', "MY_DCBLOCK_CTRL"))
 
 # Playback Buffers
 W_BUFFER(0, COMP_BUFFER_SIZE(2,