Skip to content

topology2: enable WoV function targets and graph #11114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
naveen-manohar wants to merge 3 commits into
base: main
Choose a base branch
from
Open

topology2: enable WoV function targets and graph #11114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54ea351
topology2: add WoV feature topology targets and graph
naveen-manohar Aug 22, 2026
8ed4a07
rimage: wcl: wire google hotword module manifest
naveen-manohar Aug 22, 2026
ceefed7
topology2: fix WoV DMIC to KPB route source
naveen-manohar Aug 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/audio/google/google_hotword_detect.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef LOAD_TYPE
#define LOAD_TYPE "0"
#endif

[[module.entry]]
name = "HOTWORD"
uuid = UUIDREG_STR_GOOGLE_HOTWORD
affinity_mask = "0x1"
instance_count = "1"
domain_types = "0"
load_type = LOAD_TYPE
module_type = "10"
auto_start = "0"
sched_caps = [1, 0x00008000]

REM # pin = [dir, type, sample rate, size, container, channel-cfg]
pin = [0, 0, 0x8, 0x2, 0x2, 0x3,
1, 0, 0xfeef, 0xf, 0xf, 0x1]

REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
mod_cfg = [0, 0, 0, 0, 0, 4000000, 0, 0, 0, 0, 0]

index = __COUNTER__
4 changes: 4 additions & 0 deletions tools/rimage/config/wcl.toml.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ index = __COUNTER__
#include <audio/google/google_rtc_audio_processing.toml>
#endif

#if defined(CONFIG_COMP_GOOGLE_HOTWORD_DETECT) || defined(LLEXT_FORCE_ALL_MODULAR)
#include <audio/google/google_hotword_detect.toml>
#endif

#if defined(CONFIG_COMP_TDFB) || defined(LLEXT_FORCE_ALL_MODULAR)
#include <audio/tdfb/tdfb.toml>
#endif
Expand Down
31 changes: 31 additions & 0 deletions tools/topology/topology2/dmic-wov-feature.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<searchdir:include>
<searchdir:include/common>
<searchdir:include/components>
<searchdir:include/dais>
<searchdir:include/pipelines>
<searchdir:include/pipelines/cavs>
<searchdir:platform>
<searchdir:platform/intel>

<vendor-token.conf>
<tokens.conf>
<common_definitions.conf>
<dmic-default.conf>
<dai-kpb-be.conf>
<host-gateway-capture.conf>
<wov-detect.conf>
<dai-copier.conf>
<host-copier.conf>
<output_pin_binding.conf>
<input_pin_binding.conf>
<kpb.conf>
<wov.conf>
<data.conf>
<manifest.conf>
<virtual.conf>
<route.conf>
<pcm.conf>
<pcm_caps.conf>
<fe_dai.conf>

<platform/intel/dmic-wov.conf>
7 changes: 0 additions & 7 deletions tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,6 @@ Class.Pipeline."dai-kpb-be" {
}
}

Object.Base {
route."1" {
source "dai-copier.DMIC.$index.1"
sink "kpb.$index.1"
}
}

time_domain "timer"
dynamic_pipeline 1
}
2 changes: 2 additions & 0 deletions tools/topology/topology2/include/pipelines/cavs/wov-detect.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ Class.Pipeline."wov-detect" {
}

micsel."1" {
num_input_audio_formats 1
num_output_audio_formats 1
Object.Base.input_audio_format [
{
in_rate 16000
Expand Down
4 changes: 4 additions & 0 deletions tools/topology/topology2/platform/intel/dmic-wov.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ Object.Pipeline {
}

Object.Base.route [
{
source $DMIC_WOV_DAI_PIPELINE_SRC
sink $DMIC_WOV_DAI_PIPELINE_KPB
Comment on lines +114 to +115

@lgirdwood lgirdwood Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so I have HW that has not PCH DMIC, but SSP - could we drop the DMIC part in the name or is it already in use ?

@naveen-manohar naveen-manohar Aug 27, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review @lgirdwood
DMIC_WOV_DAI_PIPELINE_SRC and DMIC_WOV_DAI_PIPELINE_KPB are already defined in platform/intel/dmic-default.conf on origin/main (lines 29–30) and used in dmic-wov.conf.
https://github.com/thesofproject/sof/blob/main/tools/topology/topology2/platform/intel/dmic-wov.conf#L114

The new route block in line 114–115 follows that existing naming.

@naveen-manohar naveen-manohar Aug 27, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitions are at dmic-default.conf#L29 in origin/main

}
{
source $DMIC_WOV_DAI_PIPELINE_KPB
sink "host-copier.11.capture"
Expand Down
4 changes: 4 additions & 0 deletions tools/topology/topology2/production/tplg-targets-ace3.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt722-4ch.bin,DMIC0_ENHANCED_CAPTURE=true,\
EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default"

# DMIC WoV feature topology; platform-agnostic, shared across PTL/WCL
"dmic-wov-feature\;sof-dmic-4ch-wov\;PLATFORM=none,NUM_DMICS=4,\
DMIC0_ID=5,DMIC1_ID=6,DMIC1_ENABLE=false,DMIC1_RATE=16000,INCLUDE_WOV=true"

"cavs-sdw\;sof-ptl-rt722-2ch\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=1,NUM_DMICS=2,\
PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,DMIC0_ID=5,DMIC1_ID=6,HDMI1_ID=7,HDMI2_ID=8,HDMI3_ID=9,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
Expand Down
Loading