topology2: tplg-targets-ace3.cmake: Correct the platform for WCL dmic… by ujfalusi · Pull Request #11161 · thesofproject/sof

ujfalusi · 2026-09-03T10:11:50Z

… fragments

There is no platform as wcl defined since it is identical to PTL. For the DMIC blob creation a correct platform is needed and in case of PLATFORM=wcl, this is not going to happen.

Use the correct PLATFORM=wcl to build working DMIC blobs.

… fragments There is no platform as wcl defined since it is identical to PTL. For the DMIC blob creation a correct platform is needed and in case of PLATFORM=wcl, this is not going to happen. Use the correct PLATFORM=wcl to build working DMIC blobs. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

Copilot

🟢 Approval recommended

The change is a straightforward correction to platform key usage with low risk, with only a minor PR-description/comment clarity nit noted.

Pull request overview

This PR adjusts topology2 build target definitions so the WCL DMIC topologies use the PTL platform key, aligning with the existing platform override set (PTL exists; WCL does not appear to have its own platform override file).

Changes:

Update all sof-wcl-dmic-* topology target tuples to use PLATFORM=ptl instead of PLATFORM=wcl.

File summaries

File	Description
tools/topology/topology2/production/tplg-targets-ace3.cmake	Switch WCL DMIC target tuples to `PLATFORM=ptl` to match available platform overrides and enable correct DMIC blob preprocessing.

Review details

Files reviewed: 1/1 changed files
Comments generated: 1
Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

ujfalusi · 2026-09-03T10:23:42Z

@@ -304,42 +304,42 @@ NHLT_BIN=nhlt-sof-ptl-dmic-4ch-id5.bin,DMIC0_ENHANCED_CAPTURE=true,\
 EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default"

 # for WCL


I think I will not update the patch, it is obvious from the code what it does.

ujfalusi · 2026-09-03T10:24:43Z

2.15 candidate

intel-sofci · 2026-09-03T11:37:06Z

PR 11161: test results

Run date: 2026-09-03 11:21 UTC

Tested commit: 172e216911023c172f1a9db294143196c51cfc71

kv2019i

Good catch! Seems to be only place where "PLATFORM=wcl" was used. FYI @lgirdwood , definitely v2.15 material, we have shipped these buggy topologies in sof-bin-2025.12.

kv2019i · 2026-09-04T07:52:23Z

@bardliao @singalsu can one of you double-check?

bardliao · 2026-09-04T12:05:47Z

Or include platform/intel/ptl.conf when PLATFORM="wcl"? Like

IncludeByKey.PLATFORM {
        "mtl"   "platform/intel/mtl.conf"
        "lnl"   "platform/intel/lnl.conf"
        "ptl"   "platform/intel/ptl.conf"
        "wcl"   "platform/intel/ptl.conf"
}

ujfalusi · 2026-09-04T12:17:53Z

Or include platform/intel/ptl.conf when PLATFORM="wcl"? Like

IncludeByKey.PLATFORM {
        "mtl"   "platform/intel/mtl.conf"
        "lnl"   "platform/intel/lnl.conf"
        "ptl"   "platform/intel/ptl.conf"
        "wcl"   "platform/intel/ptl.conf"
}

or that, but:

$ git grep "IncludeByKey.PLATFORM" tools/ | wc -l
15

and some have ptl, some don't, some have ptl+nvl, some only ptl, I'm not sure what should be modified, but a hunch is where ptl and nvl also listed.. PTL and WCL are ACE3, NVL is ACE4.
If you know which IncludeByKey.PLATFORM should be modified, then OK, but I don't want to guess.

bardliao · 2026-09-04T12:34:59Z

For now, only tools/topology/topology2/cavs-sdw.conf. But I would like to add "wcl" "platform/intel/ptl.conf" to all IncludeByKey.PLATFORM {} to suppot wcl.

ujfalusi · 2026-09-04T12:46:38Z

For now, only tools/topology/topology2/cavs-sdw.conf. But I would like to add "wcl" "platform/intel/ptl.conf" to all IncludeByKey.PLATFORM {} to suppot wcl.

and at the same time the nvl as well, no? Do we have nvl-s as well as PLATFORM?

I'm fine with that also, if you do, then ping me and I'll close this PR for that, if that is better, but WCL is just a PTL variant at the end, so it is a PTL platform.

Either way is fine for me. @kv2019i, @lgirdwood , thoughts?

bardliao · 2026-09-07T03:51:51Z

For now, only tools/topology/topology2/cavs-sdw.conf. But I would like to add "wcl" "platform/intel/ptl.conf" to all IncludeByKey.PLATFORM {} to suppot wcl.

and at the same time the nvl as well, no? Do we have nvl-s as well as PLATFORM?

I'm fine with that also, if you do, then ping me and I'll close this PR for that, if that is better, but WCL is just a PTL variant at the end, so it is a PTL platform.

Either way is fine for me. @kv2019i, @lgirdwood , thoughts?

Fair enough. Let's go with this approach.

ujfalusi · 2026-09-07T05:07:15Z

@kv2019i, @lgirdwood, @bardliao, what about not creating these functions, but just use symlinks?
sof-wcl-dmic-2ch-id2 -> sof-ptl-dmic-2ch-id2
sof-wcl-dmic-2ch-id3 -> sof-ptl-dmic-2ch-id3
...
It would save space. I would actually do this for quite many of the topologies, we have several with the same md5sum..

bardliao · 2026-09-07T07:29:56Z

@kv2019i, @lgirdwood, @bardliao, what about not creating these functions, but just use symlinks? sof-wcl-dmic-2ch-id2 -> sof-ptl-dmic-2ch-id2 sof-wcl-dmic-2ch-id3 -> sof-ptl-dmic-2ch-id3 ... It would save space. I would actually do this for quite many of the topologies, we have several with the same md5sum..

I am fine with that. But how do we deploy?

singalsu · 2026-09-07T07:30:18Z


 # for WCL
-"cavs-sdw\;sof-wcl-dmic-2ch-id2\;PLATFORM=wcl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=2,\
+"cavs-sdw\;sof-wcl-dmic-2ch-id2\;PLATFORM=ptl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=2,\


Is this better than duplicating platform/intel/ptl.conf to wcl.conf? It's just few lines.

@singalsu, I don't know where to add the wcl...
#11161 (comment)
and
#11161 (comment)

WCL is PTL, it just got rather unique name, like ADL in TGL family...

Again, of you know where we need to add nvl, nvl-s, ptl, wcl, that can work as well, I just don't feel confident on where to put and if we put wcl, we also should fix the other missing platform 'aliases'

@bardliao, this can create symlinks via cmake, it looks right in production, but after deploy the symlink is gone and the file is created..

diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index 263bc8a4f75f..d75ff70ece47 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -111,6 +111,14 @@ macro(add_alsatplg2_command conf_header conf_target input_name output_name inclu ) endmacro() +macro(symlink_topologies target link) + add_custom_command( + OUTPUT ${link}.tplg + COMMAND ${CMAKE_COMMAND} -E create_symlink ${target}.tplg ${link}.tplg + DEPENDS ${target}.tplg + ) +endmacro() + add_custom_target(topologies ALL) add_dependencies(topologies topologies1) diff --git a/tools/topology/topology2/production/CMakeLists.txt b/tools/topology/topology2/production/CMakeLists.txt index c2cb86400e4b..06584b1918e5 100644 --- a/tools/topology/topology2/production/CMakeLists.txt +++ b/tools/topology/topology2/production/CMakeLists.txt @@ -32,3 +32,17 @@ foreach(tplg ${TPLGS}) add_custom_target(topology2_prod_${output} DEPENDS ${output}.tplg) add_dependencies(topology2_prod topology2_prod_${output}) endforeach() + +foreach(link ${SYMLINKS}) + list(LENGTH link length) + if(NOT length EQUAL 2) + message(FATAL_ERROR "SYMLINKS entry '${link}' must have exactly 2 elements (link_name;link_target), got ${length}") + endif() + list(GET link 0 link_name) + list(GET link 1 link_target) + + symlink_topologies("${link_target}" "${link_name}") + + add_custom_target(topology2_prod_${link_name} DEPENDS ${link_name}.tplg) + add_dependencies(topology2_prod topology2_prod_${link_name}) +endforeach() diff --git a/tools/topology/topology2/production/tplg-targets-ace3.cmake b/tools/topology/topology2/production/tplg-targets-ace3.cmake index 0533fdb275fc..a24ad1a515bd 100644 --- a/tools/topology/topology2/production/tplg-targets-ace3.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace3.cmake @@ -303,47 +303,6 @@ PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS NHLT_BIN=nhlt-sof-ptl-dmic-4ch-id5.bin,DMIC0_ENHANCED_CAPTURE=true,\ EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" -# for WCL -"cavs-sdw\;sof-wcl-dmic-2ch-id2\;PLATFORM=ptl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=2,\ -PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,DMIC0_ID=2,DMIC1_ID=3,PREPROCESS_PLUGINS=nhlt,\ -NHLT_BIN=nhlt-sof-wcl-dmic-2ch-id2.bin,DMIC0_ENHANCED_CAPTURE=true,\ -EFX_DMIC0_TDFB_PARAMS=line2_generic_pm10deg,EFX_DMIC0_DRC_PARAMS=dmic_default" - -"cavs-sdw\;sof-wcl-dmic-2ch-id3\;PLATFORM=ptl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=2,\ -PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,DMIC0_ID=3,DMIC1_ID=4,PREPROCESS_PLUGINS=nhlt,\ -NHLT_BIN=nhlt-sof-wcl-dmic-2ch-id3.bin,DMIC0_ENHANCED_CAPTURE=true,\ -EFX_DMIC0_TDFB_PARAMS=line2_generic_pm10deg,EFX_DMIC0_DRC_PARAMS=dmic_default" - -"cavs-sdw\;sof-wcl-dmic-2ch-id4\;PLATFORM=ptl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=2,\ -PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,DMIC0_ID=4,DMIC1_ID=5,PREPROCESS_PLUGINS=nhlt,\ -NHLT_BIN=nhlt-sof-wcl-dmic-2ch-id4.bin,DMIC0_ENHANCED_CAPTURE=true,\ -EFX_DMIC0_TDFB_PARAMS=line2_generic_pm10deg,EFX_DMIC0_DRC_PARAMS=dmic_default" - -"cavs-sdw\;sof-wcl-dmic-2ch-id5\;PLATFORM=ptl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=2,\ -PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\ -NHLT_BIN=nhlt-sof-wcl-dmic-2ch-id5.bin,DMIC0_ENHANCED_CAPTURE=true,\ -EFX_DMIC0_TDFB_PARAMS=line2_generic_pm10deg,EFX_DMIC0_DRC_PARAMS=dmic_default" - -"cavs-sdw\;sof-wcl-dmic-4ch-id2\;PLATFORM=ptl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=4,\ -PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=2,DMIC1_ID=3,PREPROCESS_PLUGINS=nhlt,\ -NHLT_BIN=nhlt-sof-wcl-dmic-4ch-id2.bin,DMIC0_ENHANCED_CAPTURE=true,\ -EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" - -"cavs-sdw\;sof-wcl-dmic-4ch-id3\;PLATFORM=ptl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=4,\ -PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=3,DMIC1_ID=4,PREPROCESS_PLUGINS=nhlt,\ -NHLT_BIN=nhlt-sof-wcl-dmic-4ch-id3.bin,DMIC0_ENHANCED_CAPTURE=true,\ -EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" - -"cavs-sdw\;sof-wcl-dmic-4ch-id4\;PLATFORM=ptl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=4,\ -PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=4,DMIC1_ID=5,PREPROCESS_PLUGINS=nhlt,\ -NHLT_BIN=nhlt-sof-wcl-dmic-4ch-id4.bin,DMIC0_ENHANCED_CAPTURE=true,\ -EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" - -"cavs-sdw\;sof-wcl-dmic-4ch-id5\;PLATFORM=ptl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=4,\ -PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\ -NHLT_BIN=nhlt-sof-wcl-dmic-4ch-id5.bin,DMIC0_ENHANCED_CAPTURE=true,\ -EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" - "cavs-es83x6\;sof-ptl-ssp1-jack-id0\;PLATFORM=ptl,PREPROCESS_PLUGINS=nhlt,\ NHLT_BIN=nhlt-sof-ptl-ssp1-jack-id0.bin,HEADSET_SSP_DAI_INDEX=1,\ HEADSET_CODEC=true,HEADSET_CODEC_NAME=SSP1-Codec,NUM_HDMIS=0,\ @@ -376,3 +335,14 @@ BT_CP_HOST_PIPELINE_ID=201,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-ssp2-bt HEADSET_CODEC=false,HDMI_IN_CAPTURE=false,BT_ID=10,BT_PCM_ID=20,BT_PCM_NAME=Bluetooth,\ BT_CP_HOST_PIPELINE_ID=201,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-ssp2-bt-id10.bin" ) + +list(APPEND SYMLINKS +"sof-wcl-dmic-2ch-id2\;sof-ptl-dmic-2ch-id2" +"sof-wcl-dmic-2ch-id3\;sof-ptl-dmic-2ch-id3" +"sof-wcl-dmic-2ch-id4\;sof-ptl-dmic-2ch-id4" +"sof-wcl-dmic-2ch-id5\;sof-ptl-dmic-2ch-id5" +"sof-wcl-dmic-4ch-id2\;sof-ptl-dmic-4ch-id2" +"sof-wcl-dmic-4ch-id3\;sof-ptl-dmic-4ch-id3" +"sof-wcl-dmic-4ch-id4\;sof-ptl-dmic-4ch-id4" +"sof-wcl-dmic-4ch-id5\;sof-ptl-dmic-4ch-id5" +)

even if I change the copy_if_different to copy, it still not preserves the symlink, but probably still better for deduping the cmake rules for identical topologies?

diff updated. We could do the deploy by

diff --git a/tools/topology/topology2/CMakeLists.txt b/tools/topology/topology2/CMakeLists.txt index 2a1ee5483e7e..813223c233ff 100644 --- a/tools/topology/topology2/CMakeLists.txt +++ b/tools/topology/topology2/CMakeLists.txt @@ -9,8 +9,9 @@ add_custom_target(topologies2 ALL COMMAND ${CMAKE_COMMAND} -E create_symlink sof-ipc4-tplg ${CMAKE_CURRENT_BINARY_DIR}/target/sof-ace-tplg COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/target/development # copy the topology files only to target - COMMAND ${CMAKE_COMMAND} -E copy_if_different production/*.tplg ${CMAKE_CURRENT_BINARY_DIR}/target/sof-ipc4-tplg/ - COMMAND ${CMAKE_COMMAND} -E copy_if_different development/*.tplg ${CMAKE_CURRENT_BINARY_DIR}/target/development/ + COMMAND sh -c "cp -a production/*.tplg ${CMAKE_CURRENT_BINARY_DIR}/target/sof-ipc4-tplg/" + COMMAND sh -c "cp -a development/*.tplg ${CMAKE_CURRENT_BINARY_DIR}/target/development/" + ) # Check alsatplg version and build topology2 if alsatplg version is

and preserve the symlinks...

ujfalusi · 2026-09-07T11:24:10Z

replaced by: #11174

Copilot AI lite review requested due to automatic review settings September 3, 2026 10:11

ujfalusi requested review from jsarha and ranj063 as code owners September 3, 2026 10:11

Copilot started reviewing on behalf of ujfalusi September 3, 2026 10:13 View session

Copilot AI reviewed Sep 3, 2026

View reviewed changes

ujfalusi requested review from bardliao, kv2019i, lgirdwood and singalsu September 3, 2026 10:25

kv2019i approved these changes Sep 3, 2026

View reviewed changes

kv2019i added this to the v2.15 milestone Sep 3, 2026

bardliao approved these changes Sep 7, 2026

View reviewed changes

singalsu approved these changes Sep 7, 2026

View reviewed changes

ujfalusi closed this Sep 7, 2026

		@@ -304,42 +304,42 @@ NHLT_BIN=nhlt-sof-ptl-dmic-4ch-id5.bin,DMIC0_ENHANCED_CAPTURE=true,\
		EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default"

		# for WCL

Uh oh!

Conversation

ujfalusi commented Sep 3, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟢 Approval recommended

Uh oh!

ujfalusi Sep 3, 2026

Choose a reason for hiding this comment

Uh oh!

ujfalusi commented Sep 3, 2026

Uh oh!

intel-sofci commented Sep 3, 2026

PR 11161: test results

Uh oh!

kv2019i left a comment

Choose a reason for hiding this comment

Uh oh!

kv2019i commented Sep 4, 2026

Uh oh!

bardliao commented Sep 4, 2026

Uh oh!

ujfalusi commented Sep 4, 2026

Uh oh!

bardliao commented Sep 4, 2026 • edited by ujfalusi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ujfalusi commented Sep 4, 2026

Uh oh!

bardliao commented Sep 7, 2026

Uh oh!

ujfalusi commented Sep 7, 2026

Uh oh!

bardliao commented Sep 7, 2026

Uh oh!

singalsu Sep 7, 2026

Choose a reason for hiding this comment

Uh oh!

ujfalusi Sep 7, 2026

Choose a reason for hiding this comment

Uh oh!

ujfalusi Sep 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ujfalusi commented Sep 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

bardliao commented Sep 4, 2026 •

edited by ujfalusi

Loading

ujfalusi Sep 7, 2026 •

edited

Loading