[topology] Add KWD tplg for TGL #2405

xiulipan · 2020-02-19T06:22:32Z

Add vol-kfbm pipe
Add DMIC KWD template for intel.
Add KWD pipeline in hda_generic pipeline with above template

lgirdwood · 2020-02-19T12:26:06Z

@slawblauciak @mengdonglin @xiulipan @tlauda it appears we still have the DAI IPC timeout (unrelated to this PR but in the CI results)

kernel: [  285.192629] sof-audio-pci 0000:00:0e.0: ipc tx: 0x80010000: GLB_DAI_MSG: CONFIG
kernel: [  285.192763] sof-audio-pci 0000:00:0e.0: ipc tx succeeded: 0x80010000: GLB_DAI_MSG: CONFIG
kernel: [  285.192770] sof-audio-pci 0000:00:0e.0: ipc tx: 0x80010000: GLB_DAI_MSG: CONFIG
kernel: [  285.697819] sof-audio-pci 0000:00:0e.0: error: ipc timed out for 0x80010000 size 120
kernel: [  285.697831] sof-audio-pci 0000:00:0e.0: info: preventing DSP entering D3 state to preserve context
kernel: [  285.697856] sof-audio-pci 0000:00:0e.0: status: fw entered - code 00000005
kernel: [  285.697900] sof-audio-pci 0000:00:0e.0: error: unexpected fault 0x00000000 trace 0x00004000
kernel: [  285.697908] sof-audio-pci 0000:00:0e.0: error: hda irq intsts 0x00000000 intlctl 0xc0000001 rirb 00
kernel: [  285.697911] sof-audio-pci 0000:00:0e.0: error: dsp irq ppsts 0x00000000 adspis 0x00000000
kernel: [  285.697917] sof-audio-pci 0000:00:0e.0: error: host status 0x00000000 dsp status 0x00000000 mask 0x00000003
kernel: [  285.697920] sof-audio-pci 0000:00:0e.0: error: waking up any trace sleepers
kernel: [  285.697931] sof-audio-pci 0000:00:0e.0: error: failed to set dai config for NoCodec-5
kernel: [  285.697935] sof-audio-pci 0000:00:0e.0: error: failed to restore pipeline after resume -110

xiulipan · 2020-02-20T10:15:47Z

@lgirdwood It seems the XCC FW for CI is not enabled for this PR test. I will try to re-run this test to see if the same issue can be seen.
https://sof-ci.01.org/sofpr/PR2405/build4923/devicetest/APL_UP2_NOCODEC/verify-sof-firmware-load.sh/verify-sof-firmware-load.sh.txt

kernel: [ 3.340637] sof-audio-pci 0000:00:0e.0: Firmware info: used compiler XCC 12:0:8 xtensa-apl-elf used optimization flags O2

xiulipan · 2020-02-20T10:15:56Z

SOFCI TEST

lgirdwood · 2020-02-26T22:33:18Z

SOFCI TEST

lgirdwood · 2020-02-28T21:56:28Z

SOFCI TEST

juimonen

commit message: dection -> detection, also dmis -> dmic (?)

lgirdwood · 2020-03-02T18:39:22Z

SOFCI TEST

lgirdwood · 2020-03-02T18:39:45Z

The WHL DUT has been rebooted so retest.

xiulipan · 2020-03-06T07:32:40Z

@lgirdwood Maybe we need to wait for the TGL FW update here. I actually removed all HDMI PCM to make this tplg loaded on TGL.

lgirdwood · 2020-03-06T10:35:51Z

SOFCI TEST

lgirdwood · 2020-03-06T10:36:17Z

Licence server timeout on CI

xiulipan · 2020-03-26T03:44:15Z

@sathya-nujella @RDharageswari could you help to test and review?

lgirdwood · 2020-03-26T11:51:08Z

Jenkins known issues.

tools/topology/sof-hda-generic-kwd.m4

tools/topology/platform/intel/intel-generic-dmic-kwd.m4

xiulipan · 2020-03-27T05:14:09Z

@RDharageswari @keqiaozhang Could you help to test the new tplg with vol in KDW pipeline?

keqiaozhang · 2020-03-27T06:30:35Z

@xiulipan Verified this new tplg on TGL, KWD works, no obvious issues found.

tools/topology/platform/intel/intel-generic-dmic-kwd.m4

tools/topology/sof-tgl-max98373-rt5682.m4

xiulipan · 2020-03-30T04:19:06Z

@lgirdwood @jajanusz updated, ping for review.

lgirdwood

Looks like some macros are in the wrong place ?

tools/topology/sof-hda-generic-kwd.m4

The PCM ID should use PCM_ID instead for PIPELINE_ID Signed-off-by: Pan Xiuli <[email protected]>

Add vol comp before kfbm comp in pipe-vol-kfbm-capture. Signed-off-by: Pan Xiuli <[email protected]>

Add generic dmic kwd template. Need to define flowing variable to make it work: CHANNELS: channel for the DMIC KFBM_TYPE: kfpm or vol-kfpm DMIC_PCM_48K_ID: PCM ID for 48K DMIC DMIC_PIPELINE_48k_ID: pipeline ID for 48K DMIC DMIC_DAI_LINK_48K_ID: dai link ID in machine dirver for 48K DMIC DMIC_PCM_16k_ID: PCM ID for KWD 16K DMIC DMIC_PIPELINE_16k_ID: pipeline ID for 16K DMIC DMIC_PIPELINE_KWD_ID: pipeline ID for KWD DMIC_DAI_LINK_16k_ID: dai link ID in machine driver for 16K DMIC Signed-off-by: Pan Xiuli <[email protected]>

Add KWD pipeline with kfpm only for HDA generic topology. DMIC 48K have PCM 6 DMIC 16K have PCM 7 Signed-off-by: Pan Xiuli <[email protected]>

Add KWD pipelines with vol-kfpm pipe using intel-generic-dmic-kwd tmplate. 48K DMIC still uses PCM 99 Add 16K DMIC KWD on PCM 100 Signed-off-by: Pan Xiuli <[email protected]>

xiulipan · 2020-04-01T15:11:25Z

@lgirdwood @RDharageswari updated, ping for review.

xiulipan · 2020-04-02T07:57:43Z

@jajanusz Can you check update and merge this PR

lgirdwood · 2020-04-02T09:18:20Z

CI known issues. @jajanusz good to go once you are ready.

xiulipan requested review from dbaluta, jajanusz, lbetlej, lgirdwood, mmaka1, plbossart, ranj063 and tlauda as code owners February 19, 2020 06:22

lgirdwood approved these changes Feb 19, 2020

View reviewed changes

juimonen reviewed Mar 2, 2020

View reviewed changes

xiulipan mentioned this pull request Mar 16, 2020

[BUG] [TGL] WOV capture fails for the second time on TGL Chrome DUT #2511

Closed

xiulipan force-pushed the pr/hdakwd branch from 62cdd00 to 7c05bd7 Compare March 23, 2020 08:34

xiulipan changed the title ~~[topology] Add KWD tplg for HDA platforms~~ [topology] Add KWD tplg for TGL Mar 23, 2020

xiulipan force-pushed the pr/hdakwd branch 2 times, most recently from c9012be to 4df04be Compare March 23, 2020 09:42

jajanusz approved these changes Mar 26, 2020

View reviewed changes

jajanusz suggested changes Mar 26, 2020

View reviewed changes

tools/topology/sof-hda-generic-kwd.m4 Outdated Show resolved Hide resolved

jairaj-arava reviewed Mar 27, 2020

View reviewed changes

tools/topology/platform/intel/intel-generic-dmic-kwd.m4 Outdated Show resolved Hide resolved

xiulipan force-pushed the pr/hdakwd branch from 86c2fd7 to ef3b9ab Compare March 27, 2020 05:13

lgirdwood requested changes Mar 27, 2020

View reviewed changes

tools/topology/platform/intel/intel-generic-dmic-kwd.m4 Outdated Show resolved Hide resolved

tools/topology/sof-tgl-max98373-rt5682.m4 Outdated Show resolved Hide resolved

xiulipan force-pushed the pr/hdakwd branch from ef3b9ab to 74446f5 Compare March 30, 2020 04:18

lgirdwood reviewed Mar 30, 2020

View reviewed changes

tools/topology/sof-hda-generic-kwd.m4 Outdated Show resolved Hide resolved

xiulipan added 5 commits April 1, 2020 10:54

topology: fix ID typo in kfbm pipeline

2e6cca3

The PCM ID should use PCM_ID instead for PIPELINE_ID Signed-off-by: Pan Xiuli <[email protected]>

topology: add pipe-vol-kfbm-capture to have vol before kfbm

b1817ed

Add vol comp before kfbm comp in pipe-vol-kfbm-capture. Signed-off-by: Pan Xiuli <[email protected]>

topology: add hda generic kwd pipeline

30213ef

Add KWD pipeline with kfpm only for HDA generic topology. DMIC 48K have PCM 6 DMIC 16K have PCM 7 Signed-off-by: Pan Xiuli <[email protected]>

topology: add KWD comp into sof-tgl-max98373-rt5682

92ee265

Add KWD pipelines with vol-kfpm pipe using intel-generic-dmic-kwd tmplate. 48K DMIC still uses PCM 99 Add 16K DMIC KWD on PCM 100 Signed-off-by: Pan Xiuli <[email protected]>

xiulipan force-pushed the pr/hdakwd branch from 74446f5 to 92ee265 Compare April 1, 2020 04:27

xiulipan requested review from jajanusz and lgirdwood April 1, 2020 15:12

lgirdwood approved these changes Apr 1, 2020

View reviewed changes

xiulipan mentioned this pull request Apr 2, 2020

Add KWD toplogy for TGL #2691

Closed

YvonneYang2 mentioned this pull request Apr 2, 2020

[BUG][TGL]Two channels both output sound at the same time during speaker test on aplay0,0(speaker). thesofproject/linux#1977

Closed

YvonneYang2 mentioned this pull request Apr 2, 2020

[BUG][TGL]Warning message "snd_hda_codec_hdmi ehdaudio0D2: ASoC: can't open DAI intel-hdmi-hifi2: -16" occurred during multipipline test. thesofproject/linux#1978

Closed

jajanusz approved these changes Apr 2, 2020

View reviewed changes

lbetlej merged commit 06401fe into thesofproject:master Apr 2, 2020

xiulipan mentioned this pull request Jul 31, 2020

[bug][JSL] DMIC48kHz no volume control in alsamixer #3259

Closed

[topology] Add KWD tplg for TGL #2405

[topology] Add KWD tplg for TGL #2405

Uh oh!

Conversation

xiulipan commented Feb 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lgirdwood commented Feb 19, 2020

Uh oh!

xiulipan commented Feb 20, 2020

Uh oh!

xiulipan commented Feb 20, 2020

Uh oh!

lgirdwood commented Feb 26, 2020

Uh oh!

lgirdwood commented Feb 28, 2020

Uh oh!

juimonen left a comment

Choose a reason for hiding this comment

Uh oh!

lgirdwood commented Mar 2, 2020

Uh oh!

lgirdwood commented Mar 2, 2020

Uh oh!

xiulipan commented Mar 6, 2020

Uh oh!

lgirdwood commented Mar 6, 2020

Uh oh!

lgirdwood commented Mar 6, 2020

Uh oh!

xiulipan commented Mar 26, 2020

Uh oh!

lgirdwood commented Mar 26, 2020

Uh oh!

Uh oh!

Uh oh!

xiulipan commented Mar 27, 2020

Uh oh!

keqiaozhang commented Mar 27, 2020

Uh oh!

Uh oh!

Uh oh!

xiulipan commented Mar 30, 2020

Uh oh!

lgirdwood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xiulipan commented Apr 1, 2020

Uh oh!

xiulipan commented Apr 2, 2020

Uh oh!

lgirdwood commented Apr 2, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

xiulipan commented Feb 19, 2020 •

edited

Loading