Skip to content

Multi WoV with Micro Wake Word model on TFLM - #11292

Draft
lgirdwood wants to merge 44 commits into
thesofproject:mainfrom
lgirdwood:wov-upstream
Draft

Multi WoV with Micro Wake Word model on TFLM #11292
lgirdwood wants to merge 44 commits into
thesofproject:mainfrom
lgirdwood:wov-upstream

Conversation

@lgirdwood

@lgirdwood lgirdwood commented Oct 10, 2026

Copy link
Copy Markdown
Member

Support running multiple Micro Wake Word models to detect multiple wake key words with a pseudo ECNS/AEC frontend.

Still needs some integration updates so draft. Will update PR message when ready.

@ujfalusi @singalsu @naveen-manohar pls check, I have cleaned up and squash/rebased development tree into upstreamable patches. Pls make sure I have attributed your efforts correctly for each patch, if not I can easily fix before this is non draft.

@lgirdwood
lgirdwood force-pushed the wov-upstream branch 2 times, most recently from dda490c to 97e0b79 Compare October 14, 2026 16:38
lrgirdwo and others added 27 commits October 28, 2026 11:49
@lrgirdwo
audio: pipeline: log component ID when comp_prepare fails
167546c 
When comp_prepare() returns a negative error code in pipeline_comp_prepare(),
emit a pipe_err message including the component ID and error code. This
greatly accelerates diagnosing topology and IPC parameter configuration
failures during pipeline setup.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
audio: copier: guard against NULL pointers in copier_dai_free
5e1e19a 
In copier_dai_free(), guard cd->dd[i] against NULL before accessing
cd->dd[i]->gain_data and calling dai_common_free(). This prevents a NULL
pointer dereference if endpoint allocation failed during initialization
or during teardown of partially configured copier instances. Also reset
pointers to NULL after freeing.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
audio: dai: guard against NULL pointers during pipeline teardown
c954cab 
In dai_common_free() and dai_free(), guard dd, dd->dai, dd->dma, and
dd->dai_spec_config against NULL before dereferencing or releasing
channels, and reset pointers to NULL after freeing. Also add NULL
pointer guards to dai_put() and sof_dma_put().

This prevents NULL pointer dereferences and duplicate frees during
teardown of partially configured or failed DAI pipelines.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@singalsu @lrgirdwo
lib: agent: guard against NULL system agent in sa_set_panic_on_delay
a2071fe 
When pipelines are cancelled via pipeline_schedule_cancel() during
pause or stop triggers, sa_set_panic_on_delay() is called to enable
panic on delay. In host testbench and library builds, the system agent
timer is not initialized, leaving the sa pointer NULL.

Add a NULL check in sa_set_panic_on_delay() before dereferencing the sa
pointer so host testbench runs do not crash with a segmentation fault.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@singalsu @lrgirdwo
audio: host-zephyr: increase minimum no-bytes warning interval
60957b7 
When a capture stream is starved or waiting for detection audio, logging
every 20 ms floods the trace buffer and causes diagnostic log messages
to be dropped.

Increase SOF_MIN_NO_BYTES_INTERVAL_MS from 20 ms to 1000 ms so that
trace transport bandwidth is conserved during idle capture periods.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@lrgirdwo
schedule: edf_schedule: cancel delayed work on task free
456cc83 
When freeing an EDF scheduled task, ensure any pending delayed work
associated with the task is cancelled before marking the task free and
clearing callbacks. This prevents delayed work from triggering on freed
task data during pipeline resets or teardown.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@ujfalusi @lrgirdwo
platform: intel: cavs: initialize the DP scheduler
d7f0ec7 
CONFIG_ZEPHYR_DP_SCHEDULER can be enabled on cAVS, but only the ACE
platform_init() registered the DP scheduler. Creating a DP module on
cAVS then failed with "unable to bind scheduler to task (type 3)" and
module init returned -ENODEV.

Call scheduler_dp_init() after the LL scheduler is set up, as ACE does.

Co-developed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi @lrgirdwo
schedule: zephyr_dp_schedule: use a mutex for the per-core DP lock
3474ed9 
The DP lock is taken by the LL thread on every tick in
scheduler_dp_ll_tick() and by each DP thread after every run. It was
a k_sem, which has no priority inheritance: when a DP thread holding
it was preempted by other DP threads, the cooperative high priority LL
thread blocked until the holder got CPU time again.

With several busy DP modules (3 MFCC + 3 MWW on cAVS 2.5) single LL
ticks took up to ~40 ms, overrunning the DMIC DMAs of unrelated
streams. With a k_mutex the holder inherits the LL priority: LL max
drops from ~1.5M to <30k timer cycles, with no LL overruns or DMA
xruns.

Co-developed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@singalsu @lrgirdwo
lib: notifier: wait for completion of remote core notifications
6974ffa 
notifier_event() sends events to other cores as non-blocking IDC
messages. Each target core has a single notify_data slot and the IDC
work item is reused, so two events sent back to back to the same
core, such as the MWW detection followed by the KPB drain request,
can overwrite the first event's data or resubmit a work item that is
still queued.

Send remote notifications as blocking IDC so the next event to the
same core is not issued before the previous one has been handled.
This adds latency on the notifying core, as it now waits for the
remote callback to complete. Verified on PTL with WoV detection on
core 1 notifying the arbiter and KPB on core 0.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@singalsu @lrgirdwo
math: audio: add PCAN (Per-Channel AGC Normalization) support
98a63e7 
Add PCAN (Per-Channel AGC Normalization) fixed-point math library for
normalizing mel filterbank energies. PCAN estimates per-channel noise
background, applies non-linear wide-dynamic-range AGC compression with
fixed-point LUT gain lookup, and delivers scaled features for streaming
keyword-spotting networks.

Include ztest test suite with MATLAB reference models covering gain
lookup, noise estimation, dynamic shrinking, stream processing, and
corner cases.

Co-developed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@singalsu @lrgirdwo
audio: mfcc: add 8-bit PCAN feature extraction support
c90b34e 
Extend MFCC (Mel-Frequency Cepstral Coefficients) audio component with
8-bit Per-Channel AGC Normalization (PCAN) feature extraction:
- Add CONFIG_COMP_MFCC_PCAN Kconfig option and CMake configuration.
- Implement 8-bit quantized PCAN feature extraction paths alongside
  standard 16-bit cepstral outputs.
- Add Topology2 component definition macros for 40-mel and 80-mel PCAN
  compressed feature extraction.
- Lower high-frequency PCAN tracing to debug level to prevent IPC trace
  buffer saturation during continuous listening.

Co-developed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@lrgirdwo
ipc: notifier: add D0ix power state notifier
5fc1dce 
Add NOTIFIER_ID_D0IX_STATE to notify registered DSP components when the host
changes the DSP D0 substate via SOF_IPC4_MOD_SET_D0IX.

Components such as microWakeWord that keep running while the host sleeps in
S0iX / D0i3 can use this event to adjust telemetry reporting or power
characteristics.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
ipc4: handler: support hostless pipelines and handle COMP_STATE_PREPARE
3b6a224 
Support scheduling and execution for hostless pipelines on IPC4:
- In ipc4/handler-user.c, support pipelines that have no host gateway copier
  (such as DMIC DAI capture feeding ECNS and KPB in hardware listening mode).
- Handle COMP_STATE_PREPARE properly in pipeline triggering and state transitions.
- Guard against NULL module_data in ipc4_comp_connect().
- In ipc-helper.c, reset component before freeing if not in ready state.

Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@singalsu @lrgirdwo
audio: module_adapter: support DP-to-DP binding and virtual detect sinks
53570bf 
Support DP-to-DP component binding and terminal virtual detect sinks:
- Add CONFIG_DP_TO_DP_BIND to gate binding between two Data Processing
  (DP) scheduled components via intermediate secondary ring buffers.
- Allow attaching a single shared secondary ring_buffer on both input
  and output of a comp_buffer when CONFIG_DP_TO_DP_BIND is enabled.
- In audio_buffer_reset(), safely reset distinct secondary source buffers.
- Pass SIZE_MAX to audio_buffer_sync_secondary_buffer() during ring
  buffer synchronization.
- Skip sinks without audio format (zero frame bytes or rate) during DP
  period calculation to prevent divide-by-zero for detection components.
- In module_adapter_prepare(), set buffer params on DP consumers that
  leave them unset at bind, and allow virtual detect sinks without
  downstream consumers.
- Declare sys_comp_ecns_init() and sys_comp_wov_arbiter_init() in component.h.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Co-developed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@lrgirdwo
audio: kpb: add multi-client downstream triggering, 32-bit, and drain…
9b7f669 
… fixes

Enhance the Keyphrase Buffer (KPB) component for multi-slot Wake-on-Voice:
- Add KP_BUF_CFG_BUFF_TIME_MS IPC4 configuration parameter in ipc4/kpb.h
  to dynamically configure ring-buffer duration per pipeline.
- Implement multi-client downstream notification and draining logic.
- Support 32-bit audio sample history formatting alongside 16-bit.
- Optimize pre-roll audio drain paths to prevent buffer starvation on wake.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
audio: wov_arbiter: add multi-slot Wake-on-Voice arbiter component
c7546c1 
Introduce the Wake-on-Voice (WOV) arbiter component for multi-keyword detection:
- Routes between up to 3 concurrent KPB drain client streams and a single
  host capture PCM copier.
- Listens for keyword detection events from downstream MWW/detect components,
  determines the winning slot, routes the buffered KPB audio to the host, and
  notifies other detector slots to pause.
- Exposes 'wov_active_slot' ALSA enum mixer control and automatically resets
  it back to 0 upon stream teardown.
- Sends PHRASE_DETECTED notifications via AMS once per detection event,
  rate-limiting IPC traffic during active copy streaming.
- Supports mixed sample formats (16-bit and 32-bit).

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
audio: ecns: add 20ms DP dual-rate processing component
49709a7 
Introduce the Echo Cancellation and Noise Suppression (ECNS) Data
Processing (DP) component:
- Add src/include/sof/audio/ecns.h defining pin bindings, periods, and
  initialization prototypes.
- Runs in the DP domain with a 20ms period to process 4 DMIC channels
  (2 microphones + 2 echo references).
- Provides dual-rate output streams:
  - Pin 0: Clean downmixed 16 kHz mono to KPB and keyword detectors with
    integrated 100 Hz highpass filter (+20 dB gain).
  - Pin 1: Clean 48 kHz stereo to Host Capture.
- Supports both 16-bit and 32-bit sample formats and single-producer fallback.
- Optimizes inner copy loops using audio_stream_frames_without_wrap() to
  minimize buffer boundary wrapping overhead.
- Includes CONFIG_ECNS_TEST_SIGNAL Kconfig option to gate the monotonic
  counter test signal generator on the KPB mono pin for automated CI
  and continuity validation.

Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>

fixup ecns.c cd declaration
@singalsu @lrgirdwo
submanifests: tflm: add TensorFlow Lite Micro and ML submanifest
5e85e38 
Add west submanifest for TensorFlow Lite Micro (TFLM) to integrate
ML inference directly into the SOF build tree and replace obsolete
out-of-tree tensorflow-clone.sh script.

Co-developed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Co-developed-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@lrgirdwo
zephyr: lib: add C++ LLEXT runtime support symbols
71b7884 
Export essential C++ runtime symbols for loadable LLEXT extensions:
- In src/lib/cpp_new_export.cpp: export operator new, operator delete,
  __cxa_pure_virtual, and __assert_no_args so LLEXT modules linking C++
  code (such as TensorFlow Lite Micro) can resolve runtime support
  symbols against the base firmware image.
- Gate cpp_new_export.cpp behind CONFIG_CPP in src/lib/CMakeLists.txt.

Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@singalsu @lrgirdwo
cmake: microwakeword: add dynamic toolchain discovery and libc shim
7d7b218 
Replace hardcoded compiler versions and toolchain paths with dynamic
toolchain discovery for MicroWakeWord (MWW):
- Query target C compiler for libc.a and derive sysroot and include paths
  dynamically across GCC, Clang, and xt-clang.
- Discover target C++ standard library headers under include/c++/*.
- Add scripts/mww_shim_flatten.py to generate flattened libc shims for LLEXT
  linking.
- Add -ffunction-sections and -fdata-sections to mww_tflm_lib to ensure
  literals are placed on a per-function basis in mirrored RAM.
- Use XTENSA_CROSS_PREFIX gcc for LLEXT linking when available, allowing
  Clang Xtensa builds to link LLEXT modules without host ld incompatibility.
- Add check=True to subprocess.run in llext_link_helper.py to propagate
  linker failure exit codes properly.

Co-developed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Co-developed-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@singalsu @lrgirdwo
audio: microwakeword: integrate multi-slot Wake-on-Voice architecture
5ed6ce2 
Integrate the MicroWakeWord (MWW) audio component with multi-slot keyword
detection, D0i3 low-power listening, and PCAN feature extraction:
- Implement multi-slot keyword detection architecture running up to 3
  concurrent wake-word models (Hey Jarvis, OK Google, Alexa, and fruit
  evaluation models).
- Support 8-bit quantized PCAN feature streams from upstream MFCC.
- Use static storage for TFLM op resolver and interpreter instances to
  eliminate DSP heap fragmentation and memory leaks across stream lifecycles.
- Track host and DSP power transitions via D0ix power state notifier to
  support low-power D0i3 background listening.
- Add volatile 'wovdebug_10*' switch kcontrols armed with a 5000 ms
  countdown timer to trigger synthetic keyword detection during automated
  hardware S0 and D0i3 validation suites.
- Align IPC4 slot identification with reverse DAPM widget instance
  allocation (2 - (IPC4_INST_ID % 3)).
- Provide dataset preparation, training, and mtrace tuning scripts.

Co-developed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Co-developed-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

mww: add dcache writeback for cross-core kpb event data
@lrgirdwo
boards: intel: enable multi-slot WoV, ECNS, and KPB on PTL, WCL, and …
ce1bb0b 
…CAVS 2.5

Enable Wake-on-Voice components and tune heap configurations:
- Enable COMP_KPB, COMP_WOV_ARBITER, COMP_ECNS, and COMP_MICROWAKEWORD
  across Panther Lake, Wildcat Lake, and cAVS 2.5 target configurations.
- In intel_adsp_cavs25_tgph.conf, enable CONFIG_COMP_MFCC_PCAN and
  set CONFIG_IDC_TIMEOUT_US=100000.
- In zephyr/Kconfig, tune SOF_ZEPHYR_HEAP_SIZE and VIRTUAL_HEAP_EXTENDED
  to accommodate multi-slot ML model buffering.

Co-developed-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
topology2: include: add ECNS and WoV Arbiter component definitions
6ff4066 
Provide Topology2 component definition macros and widget structures for
Echo Cancellation and Noise Suppression (ECNS) and Wake-on-Voice (WOV) Arbiter:
- ecns.conf: ECNS processing component definition with dual output pins.
- wov-arbiter.conf: Wake-on-Voice arbiter widget definition and active slot
  kcontrol enum mapping.
- common_definitions.conf: Define default KPB_BUFF_TIME_MS.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@singalsu @lrgirdwo
topology2: include: add MicroWakeWord (MWW) component definitions
28ac44e 
Add Topology2 component definitions for MicroWakeWord (MWW):
- In microwakeword.conf: define Class.Widget.microwakeword with UUID,
  control definitions, and pipeline attributes.
- In mfcc.conf: invert switch widget polarity for proper ALSA mixer
  control semantics.

Co-developed-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Co-developed-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@lrgirdwo
topology2: dmic-wov-multi: implement dual-rate DMIC architecture and …
8179f17 
…multi-slot WoV

Implement the dual-rate DMIC topology architecture with multi-slot Wake-on-Voice:
- Provide dual PDM DAI endpoints:
  - dmic01 on PDM0: 48 kHz stereo 16-bit capture.
  - dmic16k on PDM1: 16 kHz stereo 16-bit detection.
- Feed ECNS directly from the DMIC DAI copiers, eliminating redundant
  mixins and mixouts between DMIC, ECNS, and KPB.
- Connect ECNS output pin 0 (16k mono clean with internal 100 Hz HPF) to KPB
  and multi-slot MWW detectors (slots 1, 2, 3), feeding WoV Arbiter and
  Host Copier PCM 11 / PCM 12.
- Connect ECNS output pin 1 (48k stereo clean) to Host Copier PCM 11.
- Replace WoV mixouts with copiers and run ECNS, MFCC, and MWW in the DP
  domain.
- Add multi-slot WoV manifests for Panther Lake (PTL), Wildcat Lake (WCL),
  and generic CAVS platforms.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Co-developed-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
topology2: integrate multi-slot WoV into SoundWire and HDA topologies
bf15792 
Integrate multi-slot Wake-on-Voice pipelines and feature inclusion into
SoundWire and HDA topologies:
- Wire multi-slot WoV features into cavs-sdw.conf, cavs-rt5682.conf,
  sdw-dmic-generic.conf, and sof-hda-generic.conf.
- Add sof-hda-generic-wov-manifest.conf manifest.
- Add CMake topology build targets for Panther Lake (PTL) ACE 3.0,
  Wildcat Lake (WCL), and Tiger Lake (TGL) with multi-slot WoV SoundWire
  and HDA targets in production CMake files.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Co-developed-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@singalsu @lrgirdwo
topology2: dmic-wov-multi: support 2-channel DMIC and add ADL target
58faa0f 
The dmic01 DAI copier formats and the ECNS Pin 1 input buffer size
were hardcoded for 4 channels. Use the WOVHOST channel definitions and
a new ECNS_PIN1_IN_IBS that follow DMIC_WOV_DAI_CHANNELS, so the
topology also builds correctly for a 2-channel DMIC.

The channel config and map in the DET16K and WOVHOST defines are now
literal values. The references to the CHANNEL_* defines resolved to 0,
so the DAI copiers got channel map 0 and remapped every output channel
from channel 0. This also fixes the dmic16k detection path, which had
been delivering channel 0 on all channels.

Add the sof-adl-max98357a-rt5682-2ch-wov-multi development target that
uses only the PDM0 stereo microphones on Google Brya.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
singalsu and others added 16 commits October 28, 2026 11:49
@singalsu @lrgirdwo
topology2: ace3: add 2ch PTL/WCL rt721/rt722 multi-wov topologies
94dd2fa 
Add 2-channel PCH DMIC variants of the PTL and WCL rt721 and rt722
multi-wov topologies for devices with only the PDM0 microphone pair.
All of them embed the NHLT so the dmic16k DAI finds its blob.

cavs-sdw.conf enables the PDM1 microphones by default, so the 2ch
targets set PDM1_MIC_A_ENABLE=0, PDM1_MIC_B_ENABLE=0 and
DMIC_WOV_DAI_CHANNELS=2 explicitly.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@singalsu @lrgirdwo
topology2: dmic-wov-multi: use only 32-bit input on dmic16k copier
1dc99de 
The dmic16k DAI copier advertised both 32-bit and 16-bit input
formats. With the 16-bit format available the DMIC gateway on PTL
was set up so that the DMA write position advanced erratically and
the detector path received only about 87% of the expected 16 kHz
frame rate, starving the MFCC and MWW slots.

Advertise only the 32-bit format, as the other DMIC copiers do. The
dmic16k path now delivers exactly 16000 frames per second end to end
through ECNS and KPB.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@naveen-manohar @lrgirdwo
topology2: ace3: embed NHLT in PTL/WCL rt722 multi-wov topologies
6271e47 
Multi-slot WoV pipeline uses dmic16k DAI (PDM1, 16 kHz) But
BIOS ACPI NHLT only has 48kHz dmic01 blob, so PCM-11[ECNS]
& PCM-12[WoV] FAIL at hw_params with "no matching blob for
sample rate: 16000".

Enable NHLT prepro plugin for sof-wcl-rt722-4ch-wov-multi
so topology keeps both 48kHz & 16 kHz DMIC blobs.

Test: WCL rt722 PCM-11 captures and PCM-12 opens cleanly

Signed-off-by: Naveen Manohar <naveen.m@intel.com>
@singalsu @lrgirdwo
topology2: ace3: use all four mics for 4ch wov-multi WoV path
7321283 
The 4ch wov-multi targets did not set DMIC_WOV_DAI_CHANNELS, so
dmic-default.conf left it at 2. Only the first two microphones were
fed to ECNS, and its mono downmix for KPB and the detectors averaged
just those two, giving a noisier detection input than the 4ch
platforms allow.

Set DMIC_WOV_DAI_CHANNELS=4 for the PTL and WCL DMIC, rt721, rt722
and HDA generic 4ch wov-multi targets and the generic DMIC one.
ECNS pin 0 and the 48 kHz ECNS host capture then carry all four
channels.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@naveen-manohar @lrgirdwo
topology2: add SoundWire headset ECNS and multi-slot WoV
be72aec 
Add ECNS + Wake-on-Voice instance on sdw headset microphone
similar to existing DMIC WoV graph.

Jack-In module copier(module-copier.11.0, 48 kHz 2ch) feeds
ECNS pin 1 directly, ECNS pin0 through a 48k->16k SRC.
ECNS pin 0 drives KPB -> 3 x (MFCC + MWW) -> WoV arbiter,
as in the DMIC graph. The two ECNS outputs PCMs are:

  PCM 13 "Headset ECNS Capture" (48 kHz 2ch)
  PCM 14 "Headset Multi-WOV"     (16 kHz 1ch)

Pipeline reuses classes & UUIDs from dmic-wov-multi.conf
Included by INCLUDE_SDW_JACK_WOV=true.

Signed-off-by: Naveen Manohar <naveen.m@intel.com>
@naveen-manohar @lrgirdwo
topology2: ace3: enable headset WoV in WCL RT722 multi-WoV targets
2d4e1e9 
Enable headset ECNS & WoV for WCL RT722 4ch & 2ch multi-WoV
topologies.

Signed-off-by: Naveen Manohar <naveen.m@intel.com>
@ujfalusi @lrgirdwo
topology2: ace3: use symlinks for WCL WoV topologies
8d9e66c 
The WCL DMIC and RT721 multi-slot WoV topologies are byte-for-byte
identical to the PTL ones, only reachable under a different name. Drop
the duplicated TPLGS entries and list them in SYMLINKS instead, so they
are built as symlinks to the PTL topologies rather than separately
compiled duplicates.

The WCL RT722 targets stay as separate TPLGS entries since they enable
INCLUDE_SDW_JACK_WOV, which the PTL ones do not.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi @lrgirdwo
topology2: hda-generic: Correct the PTL/WCL WoV topology name
1477b18 
The hda-generic naming convention declares in case NHLT blob is included:
hda-generoc-[DSP plaform]-

PTL and WCL are ACE3, they use the same blob for NHLT, the name of the
topology must be: sof-hda-generic-ace3-4ch-wov-multi.tplg

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi @lrgirdwo
topology2: drop the wcl platform, WCL is ACE3 and uses PLATFORM=ptl
65c829b 
platform/intel/wcl.conf was a verbatim copy of ptl.conf and the WCL
manifests only differed from the PTL ones by PLATFORM="wcl". WCL is an
ACE3 platform exactly like PTL; the SOF topology layer does not need a
separate platform key for it, as the existing sof-wcl-dmic-*-id* symlinks
already show.

Remove wcl.conf and the "wcl" IncludeByKey.PLATFORM entries, delete the
duplicated WCL DMIC multi-WoV manifests and generate sof-wcl-dmic-wov-multi
and sof-wcl-dmic-wov-multi-4ch as symlinks to the PTL topologies instead.

The WCL RT722 targets were the only ones enabling INCLUDE_SDW_JACK_WOV;
PTL and WCL are identical from the topology's point of view, so enable
it on the PTL RT722 targets and turn the WCL ones into symlinks as well.

Update the README to match, including the stale
sof-{ptl,wcl}-hda-generic-4ch-wov-multi target names which were renamed
to sof-hda-generic-ace3-4ch-wov-multi earlier.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@singalsu @lrgirdwo
topology2: ecns: add capture boost and test signal switch controls
0111c71 
The ECNS high-pass filters support switching between boosted (+30 dB Pin 0,
+20 dB Pin 1) and 0 dB responses via the "ECNS capture boost" control.
Also support enabling test signal on KPB mono output pin (Pin 0).

In wov-multi topologies, instantiate unique per-instance controls
("DMIC ECNS boost" / "Jack In ECNS boost" and "DMIC ecns_kpb_test_signal" /
"Jack In ecns_kpb_test_signal") so a topology with both DMIC and Jack
inputs has distinct control names.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@lrgirdwo
topology2: wov-arbiter: rename active slot control to DMIC/Jack In Ph…
9ef7c07 
…rase Detect ID

When both DMIC and SoundWire headset WoV paths are instantiated
in the same topology (e.g. rt722 wov-multi), both wov-arbiter widgets
previously generated an ALSA mixer enum control with the identical
name 'wov_active_slot', causing a naming collision in the mixer.

Disambiguate the active slot controls per input path:
- Change default wov-arbiter enum name to 'DMIC Phrase Detect ID'.
- Override wov-arbiter enum name in sdw-jack-wov-multi.conf to
  'Jack In Phrase Detect ID'.
- Update integration guides and documentation accordingly.

Co-developed-by: Naveen Manohar <naveen.m@intel.com>
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
audio: samples: add multi-slot detect_test keyword detector component
f8f664d 
Enhance sample keyword detector for multi-slot Wake-on-Voice testing:
- Support multi-slot keyword detection with dedicated DP worker threads
  for 20ms audio batch processing.
- Subscribe to NOTIFIER_ID_WOV_CTRL notifications from the WoV arbiter
  to pause and resume detection based on slot arbitration.
- In detect_test.toml: increase instance count to 4.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
tools: wov_capture: add blocking read utilities and 20-run S0/D0i3 va…
498009a 
…lidation suite

Add hardware test utilities for validating multi-slot Wake-on-Voice capture
and D0i3 power transitions:
- wov_blocking_read.c: ALSA capture utility configuring software avail_min
  to ensure prompt poll() wakeups on no-period-wakeup streams.
- wov_blocking_read_tinyalsa.c: TinyALSA variant with period wakeup handling.
- run_wov_10x.py: Automated 20-run hardware test suite (10x S0 and 10x D0i3
  idle delay wake tests) with mathematical sample continuity verification.
- test_wov_no_irq.py, wov_capture_app.c, wov_daemon.py, wov_multi_slot_test.py.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>

tools: wov_capture: wait for keyword-gated PCM readiness

Poll for capture data before reading a keyword-gated PCM
endpoint. Propagate poll & read failures instead of
reporting empty captures as successful and handle
interruption during requested shutdown.

Test: Verified on WCL with a 3sec 16kHz 48kHz capture.
./wov_capture_app \
-D 0 -d 12 -c 1 -r 16000 -f S16_LE \
-t 3 -n 1 -F /data/local/tmp/wov_pcm12.wav -v

Signed-off-by: Naveen Manohar <naveen.m@intel.com>

tools: wov_capture: align wov_capture_app options with tinycap

wov_capture_app used -c for the card and -C for the channel count, while
tinycap (and arecord) use -D for the card/device and -c for the channel
count. The subtle difference made it easy to pass the card number as the
channel count and vice versa when switching between the tools.

Switch to -D CARD and -c CHANS to match tinycap, and update the usage
examples and the wov_arbiter README accordingly.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@lrgirdwo
tools: wov_capture: support DMIC and Jack In Phrase Detect ID controls
7cff58a 
Support unique phrase detect control names across the automated
test harnesses and validation utilities:
- In run_wov_10x.py, test_wov_no_irq.py, and wov_multi_slot_test.py:
  add find_active_slot_control() to auto-detect 'DMIC Phrase Detect ID',
  'Jack In Phrase Detect ID', or fallback to 'wov_active_slot'.
- In wov_multi_slot_test.py, add --control parameter to allow selecting
  a specific phrase detect control when multiple interfaces are present.
- In wov_blocking_read.c, probe 'DMIC Phrase Detect ID',
  'Jack In Phrase Detect ID', and 'wov_active_slot'.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
tools: sof_ri_info: add Intel debug key signature mapping for Panther…
9ee48f2 
… Lake

Add Panther Lake ACE 3.0 Intel OTC debug key modulus and exponent mapping
in sof_ri_info.py to support manifest and signature decoding on PTL binaries.

Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@lrgirdwo
doc: topology2/audio: document multi-slot WoV, dual-rate DMIC, and D0…
10e8d00 
…i3 verification

Document multi-slot Wake-on-Voice architecture and reproduction procedures:
- Update tools/topology/topology2/README.md with comprehensive hardware
  reproduction guide, NHLT requirements, tinyalsa capture commands, and
  power benchmark procedures across PTL, WCL, and TGL.
- Update top-level README.md referencing the WoV test documentation,
  required kernel/firmware branches, and 20/20 test results.

Co-developed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Co-developed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
@ujfalusi @lgirdwood
fixup! boards: intel: enable multi-slot WoV, ECNS, and KPB on PTL, WC…
65a7b09 
…L, and CAVS 2.5

drop leftover #endif from tgl and ptl toml file

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@singalsu singalsu singalsu approved these changes
@kv2019i kv2019i Awaiting requested review from kv2019i kv2019i will be requested when the pull request is marked ready for review kv2019i is a code owner
@lyakh lyakh Awaiting requested review from lyakh lyakh will be requested when the pull request is marked ready for review lyakh is a code owner
@iuliana-prodan iuliana-prodan Awaiting requested review from iuliana-prodan iuliana-prodan will be requested when the pull request is marked ready for review iuliana-prodan is a code owner
@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta will be requested when the pull request is marked ready for review dbaluta is a code owner
@abonislawski abonislawski Awaiting requested review from abonislawski abonislawski will be requested when the pull request is marked ready for review abonislawski is a code owner
@ranj063 ranj063 Awaiting requested review from ranj063 ranj063 will be requested when the pull request is marked ready for review ranj063 is a code owner
@jsarha jsarha Awaiting requested review from jsarha jsarha will be requested when the pull request is marked ready for review jsarha is a code owner
@pblaszko pblaszko Awaiting requested review from pblaszko pblaszko will be requested when the pull request is marked ready for review pblaszko is a code owner
@marcinszkudlinski marcinszkudlinski Awaiting requested review from marcinszkudlinski marcinszkudlinski will be requested when the pull request is marked ready for review marcinszkudlinski is a code owner
@LaurentiuM1234 LaurentiuM1234 Awaiting requested review from LaurentiuM1234 LaurentiuM1234 will be requested when the pull request is marked ready for review LaurentiuM1234 is a code owner
@bardliao bardliao Awaiting requested review from bardliao bardliao will be requested when the pull request is marked ready for review bardliao is a code owner
@tmleman tmleman Awaiting requested review from tmleman tmleman will be requested when the pull request is marked ready for review tmleman is a code owner
@fkwasowi fkwasowi Awaiting requested review from fkwasowi fkwasowi will be requested when the pull request is marked ready for review fkwasowi is a code owner
@iganakov iganakov Awaiting requested review from iganakov iganakov will be requested when the pull request is marked ready for review iganakov is a code owner
@plbossart plbossart Awaiting requested review from plbossart plbossart will be requested when the pull request is marked ready for review plbossart is a code owner
@mmaka1 mmaka1 Awaiting requested review from mmaka1 mmaka1 will be requested when the pull request is marked ready for review mmaka1 is a code owner
@lbetlej lbetlej Awaiting requested review from lbetlej lbetlej will be requested when the pull request is marked ready for review lbetlej is a code owner
Copilot code review Copilot
Copilot will automatically review once the pull request is marked ready for review

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@lgirdwood @singalsu @lrgirdwo @ujfalusi @naveen-manohar