From aec3bfdb77f4deb0f75d826ba8dda701911e7470 Mon Sep 17 00:00:00 2001
From: Yong Zhi <yong.zhi@intel.com>
Date: Wed, 9 Aug 2023 04:25:09 -0500
Subject: [PATCH] topology2: add core id macros for echo ref & EC pipelines

Add macros in preparation to run RTC AEC on secondary core

Signed-off-by: Yong Zhi <yong.zhi@intel.com>
---
 tools/topology/topology2/cavs-rt5682.conf             |  2 ++
 .../platform/intel/google-rtc-aec-reference.conf      | 11 +++++++++++
 .../topology2/platform/intel/speaker-echo-ref.conf    | 10 ++++++++++
 3 files changed, 23 insertions(+)

diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
index 165b22ea7..8c13b2131 100644
--- a/tools/topology/topology2/cavs-rt5682.conf
+++ b/tools/topology/topology2/cavs-rt5682.conf
@@ -89,6 +89,7 @@ Define {
 	ECHO_REF_DAI_PIPELINE_ID	8
 	ECHO_REF_COPIER_MODULE		'module-copier.8.2'
 	ECHO_REF_PCM_ID			29
+	ECHO_REF_CORE_ID		0
 	# override BT default definitions
 	BT_PB_HOST_PIPELINE_ID		9
 	BT_PB_DAI_PIPELINE_ID		10
@@ -96,6 +97,7 @@ Define {
 	BT_PB_PIPELINE_STREAM_NAME "dai-copier.SSP.10.1"
 	GOOGLE_RTC_AEC_SUPPORT		0
 	GOOGLE_RTC_AEC_REF_SOURCE	'module-copier.8.2'
+	GOOGLE_AEC_CORE_ID		0
 	HEADSET_PCM_NAME		"Headset"
 	SPEAKER_PCM_NAME		"Speakers"
 	INCLUDE_BT_OFFLOAD		true
diff --git a/tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf b/tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf
index 430d16373..b2e9a88ec 100644
--- a/tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf
+++ b/tools/topology/topology2/platform/intel/google-rtc-aec-reference.conf
@@ -1,8 +1,11 @@
 Object.Pipeline.google-rtc-aec-capture [
 	{
 		index		18
+		core_id $GOOGLE_AEC_CORE_ID
+
 		Object.Widget.pipeline.1 {
 			stream_name "DMIC0 RTC AEC"
+			core $GOOGLE_AEC_CORE_ID
 		}
 
 		Object.Widget.google-rtc-aec.1 {
@@ -20,17 +23,22 @@ Object.Pipeline.google-rtc-aec-capture [
 Object.Pipeline.host-gateway-capture[
         {
                 index   19
+                core_id $GOOGLE_AEC_CORE_ID
 
                 Object.Widget.host-copier.1 {
                         stream_name "DMIC0 AEC"
                         pcm_id	27
                 }
+                Object.Widget.pipeline."1" {
+			core $GOOGLE_AEC_CORE_ID
+		}
         }
 ]
 
 Object.Pipeline.gain-capture [
 	{
 		index	20
+		core_id $GOOGLE_AEC_CORE_ID
 
 		Object.Widget.host-copier.1 {
 			stream_name "DMIC0 AN"
@@ -42,6 +50,9 @@ Object.Pipeline.gain-capture [
                                 name 'AN Volume'
                         }
                 }
+		Object.Widget.pipeline."1" {
+			core $GOOGLE_AEC_CORE_ID
+		}
 	}
 ]
 
diff --git a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
index 0a2dcdc18..2ff5f3e22 100644
--- a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
+++ b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
@@ -6,20 +6,27 @@ Object.Pipeline {
 	host-gateway-capture [
 		{
 			index	$ECHO_REF_HOST_PIPELINE_ID
+			core_id	$ECHO_REF_CORE_ID
 
 			Object.Widget.host-copier.1 {
+				core_id		$ECHO_REF_CORE_ID
 				stream_name	$ECHO_REF_STREAM_NAME
 				pcm_id		$ECHO_REF_PCM_ID
 			}
+			Object.Widget.pipeline."1" {
+				core	$ECHO_REF_CORE_ID
+			}
 		}
 	]
 
 	dai-copier-be [
 		{
 			index	$ECHO_REF_DAI_PIPELINE_ID
+			core_id	$ECHO_REF_CORE_ID
 			direction	"capture"
 
 			Object.Widget.dai-copier."1" {
+				core_id		$ECHO_REF_CORE_ID
 				dai_index	$SPEAKER_SSP_DAI_INDEX
 				dai_type	"SSP"
 				type		dai_out
@@ -33,6 +40,9 @@ Object.Pipeline {
 					out_valid_bit_depth	32
 				}
 			}
+			Object.Widget.pipeline."1" {
+				core	$ECHO_REF_CORE_ID
+			}
 		}
 	]
 }