topology2: cavs-sdw: add SDW_ECHO_REF_DAI flag

Currently, the "Loopback_Virtual" copier DAI is created in both
sdw-amp-generic.conf and sdw-jack-generic.conf. It works fine in the
monolithic topology because with the SDW_SPK_ECHO_REF flag, it will
be created either by sdw-amp-generic.conf or sdw-jack-generic.conf.
However, it doesn't work in the function topology case. The jack
function topology will be loaded first and the "Loopback_Virtual"
copier DAI is not created in the jack function topology if the amp
function topology is also loaded.
The commit suggests to use a SDW_ECHO_REF_DAI flag to indicate whether
the "Loopback_Virtual" copier DAI is required or not. So that we can set
the flag in the cmake file and create the "Loopback_Virtual" copier DAI
in the jack function topology even when the amp function topology is
loaded, too.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Author: bardliao

tools/topology/topology2/cavs-sdw.conf

@@ -110,6 +110,7 @@ Define {
 	SDW_AMP_XOVER_EQFIR_PARAMS default
 	DOLBY_DAX_CORE_ID 0
 	USE_DAX "false"
+	SDW_ECHO_REF_DAI "false"
 }
 
 # override defaults with platform-specific config
@@ -138,6 +139,37 @@ IncludeByKey.NUM_HDMIS {
 "[3-4]" "platform/intel/hdmi-generic.conf"
 }
 
+IncludeByKey.SDW_ECHO_REF_DAI {
+	"true" {
+		Object.Widget.alh-copier [
+			{
+				stream_name	"Loopback_Virtual"
+				direction	"capture"
+				type		"dai_out"
+				index		12
+				dai_index	25
+				node_type $ALH_LINK_INPUT_CLASS
+				num_input_audio_formats 1
+				num_output_audio_formats 1
+				Object.Base.input_audio_format [
+					{
+						in_rate			$JACK_RATE
+						in_bit_depth		32
+						in_valid_bit_depth	$SDW_LINK_VALID_BITS
+					}
+				]
+				Object.Base.output_audio_format [
+					{
+						out_rate		$JACK_RATE
+						out_bit_depth		32
+						out_valid_bit_depth	32
+					}
+				]
+			}
+		]
+	}
+}
+
 IncludeByKey.SDW_AMP_XOVER {
 	"false" {
 			IncludeByKey.NUM_SDW_AMP_LINKS {

tools/topology/topology2/development/tplg-targets.cmake

@@ -439,7 +439,7 @@ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-
 SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
 PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt721-4ch-echoref.bin,DMIC0_ENHANCED_CAPTURE=true,\
 EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default,\
-DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true"
+DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true,SDW_ECHO_REF_DAI=true"
 
 # RT721 eval board with PCH-DMIC, sof_sdw_quirk_table with SOC_SDW_PCH_DMIC
 # Enable echo reference capture from jack and speaker output
@@ -451,7 +451,7 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
 PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt721-4ch-echoref.bin,DMIC0_ENHANCED_CAPTURE=true,\
 EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default,\
 BT_NAME=SSP2-BT,BT_PCM_ID=20,BT_ID=10,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
-DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true"
+DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true,SDW_ECHO_REF_DAI=true"
 
 # RT722 with PCH-DMIC and echo reference capture from jack and speaker output
 "cavs-sdw\;sof-ptl-rt722-4ch-echoref\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=1,NUM_DMICS=4,\
@@ -460,5 +460,5 @@ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-
 SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
 PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt722-4ch-echoref.bin,DMIC0_ENHANCED_CAPTURE=true,\
 EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default,\
-SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true"
+SDW_JACK_ECHO_REF=true,SDW_SPK_ECHO_REF=true,SDW_ECHO_REF_DAI=true"
 )

tools/topology/topology2/platform/intel/sdw-amp-generic.conf

@@ -1048,33 +1048,6 @@ IncludeByKey.SDW_AMP_FEEDBACK {
 
 IncludeByKey.SDW_SPK_ECHO_REF {
 	"true" {
-		Object.Widget.alh-copier [
-			{
-				stream_name	"Loopback_Virtual"
-				direction	"capture"
-				type		"dai_out"
-				index		22
-				dai_index	25
-				node_type $ALH_LINK_INPUT_CLASS
-				num_input_audio_formats 1
-				num_output_audio_formats 1
-				Object.Base.input_audio_format [
-					{
-						in_bit_depth		32
-						in_valid_bit_depth	$SDW_LINK_VALID_BITS
-						in_sample_type		$SAMPLE_TYPE_MSB_INTEGER
-						in_fmt_cfg		"$[($in_channels | ($in_valid_bit_depth * 256))]"
-					}
-				]
-				Object.Base.output_audio_format [
-					{
-						out_bit_depth		32
-						out_valid_bit_depth	32
-					}
-				]
-			}
-		]
-
 		Object.Widget.module-copier."22" {
 			index 21
 			num_input_pins 1

tools/topology/topology2/platform/intel/sdw-jack-generic.conf

@@ -741,39 +741,6 @@ IncludeByKey.PASSTHROUGH {
 
 IncludeByKey.SDW_JACK_ECHO_REF {
 	"true" {
-		IncludeByKey.SDW_SPK_ECHO_REF {
-			"false" {
-				# The virtual DAi is common with speaker. Normally this would be
-				# provided speaker tplg. If not present instantiate it here.
-				Object.Widget.alh-copier [
-					{
-						stream_name	"Loopback_Virtual"
-						direction	"capture"
-						type		"dai_out"
-						index		12
-						dai_index	25
-						node_type $ALH_LINK_INPUT_CLASS
-						num_input_audio_formats 1
-						num_output_audio_formats 1
-						Object.Base.input_audio_format [
-							{
-								in_rate			$JACK_RATE
-								in_bit_depth		32
-								in_valid_bit_depth	$SDW_LINK_VALID_BITS
-							}
-						]
-						Object.Base.output_audio_format [
-							{
-								out_rate		$JACK_RATE
-								out_bit_depth		32
-								out_valid_bit_depth	32
-							}
-						]
-					}
-				]
-			} # SDW_SPK_ECHO_REF false
-		}
-
 		Object.Widget.module-copier."12" {
 			index 1
 			num_input_pins 1