Skip to content

[topology] Add KWD tplg for TGL - #2405

Merged
lbetlej merged 5 commits into
thesofproject:masterfrom
xiulipan:pr/hdakwd
Apr 2, 2020
Merged

[topology] Add KWD tplg for TGL#2405
lbetlej merged 5 commits into
thesofproject:masterfrom
xiulipan:pr/hdakwd

Conversation

@xiulipan

@xiulipanxiulipan commented Feb 19, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

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

@lgirdwood

lgirdwood commented Feb 19, 2020

Copy link
Copy Markdown
Member

@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

xiulipan commented Feb 20, 2020

Copy link
Copy Markdown
ContributorAuthor

@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

xiulipan commented Feb 20, 2020

Copy link
Copy Markdown
ContributorAuthor

SOFCI TEST

2 similar comments
@lgirdwood

lgirdwood commented Feb 26, 2020

Copy link
Copy Markdown
Member

SOFCI TEST

@lgirdwood

lgirdwood commented Feb 28, 2020

Copy link
Copy Markdown
Member

SOFCI TEST

juimonen
juimonen reviewed Mar 2, 2020
View reviewed changes

@juimonenjuimonen left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

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

@lgirdwood

lgirdwood commented Mar 2, 2020

Copy link
Copy Markdown
Member

SOFCI TEST

@lgirdwood

lgirdwood commented Mar 2, 2020

Copy link
Copy Markdown
Member

The WHL DUT has been rebooted so retest.

@xiulipan

xiulipan commented Mar 6, 2020

Copy link
Copy Markdown
ContributorAuthor

@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

lgirdwood commented Mar 6, 2020

Copy link
Copy Markdown
Member

SOFCI TEST

@lgirdwood

lgirdwood commented Mar 6, 2020

Copy link
Copy Markdown
Member

Licence server timeout on CI

@xiulipanxiulipan mentioned this pull request Mar 16, 2020
Closed
@xiulipanxiulipan changed the title [topology] Add KWD tplg for HDA platforms[topology] Add KWD tplg for TGLMar 23, 2020
@xiulipan
xiulipanforce-pushed the pr/hdakwd branch 2 times, most recently from c9012be to 4df04beCompareMarch 23, 2020 09:42
@xiulipan

xiulipan commented Mar 26, 2020

Copy link
Copy Markdown
ContributorAuthor

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

@lgirdwood

lgirdwood commented Mar 26, 2020

Copy link
Copy Markdown
Member

Jenkins known issues.

jajanusz
jajanusz suggested changes Mar 26, 2020
View reviewed changes
Comment threadtools/topology/sof-hda-generic-kwd.m4 Outdated
jairaj-arava
jairaj-arava reviewed Mar 27, 2020
View reviewed changes
Comment threadtools/topology/platform/intel/intel-generic-dmic-kwd.m4 Outdated
@xiulipan

xiulipan commented Mar 27, 2020

Copy link
Copy Markdown
ContributorAuthor

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

@keqiaozhang

keqiaozhang commented Mar 27, 2020

Copy link
Copy Markdown
Collaborator

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

lgirdwood
lgirdwood requested changes Mar 27, 2020
View reviewed changes
Comment threadtools/topology/platform/intel/intel-generic-dmic-kwd.m4 Outdated
Comment threadtools/topology/sof-tgl-max98373-rt5682.m4 Outdated
@xiulipan

xiulipan commented Mar 30, 2020

Copy link
Copy Markdown
ContributorAuthor

@lgirdwood@jajanusz updated, ping for review.

lgirdwood
lgirdwood reviewed Mar 30, 2020
View reviewed changes

@lgirdwoodlgirdwood left a comment

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.

Looks like some macros are in the wrong place ?

Comment threadtools/topology/sof-hda-generic-kwd.m4 Outdated
@xiulipan
topology: fix ID typo in kfbm pipeline
2e6cca3
The PCM ID should use PCM_ID instead for PIPELINE_ID
Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
@xiulipan
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 <xiuli.pan@linux.intel.com>
@xiulipan
topology: intel: add generic dmic key word dection
48c41fa
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 <xiuli.pan@linux.intel.com>
@xiulipan
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 <xiuli.pan@linux.intel.com>
@xiulipan
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 <xiuli.pan@linux.intel.com>
@xiulipan

xiulipan commented Apr 1, 2020

Copy link
Copy Markdown
ContributorAuthor

@lgirdwood@RDharageswari updated, ping for review.

@xiulipan

xiulipan commented Apr 2, 2020

Copy link
Copy Markdown
ContributorAuthor

@jajanusz Can you check update and merge this PR

@xiulipanxiulipan mentioned this pull request Apr 2, 2020
Closed
@YvonneYang2YvonneYang2 mentioned this pull request Apr 2, 2020
Closed
@lgirdwood

lgirdwood commented Apr 2, 2020

Copy link
Copy Markdown
Member

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

@YvonneYang2YvonneYang2 mentioned this pull request Apr 2, 2020
Closed
@lbetlej
lbetlej merged commit 06401fe into thesofproject:masterApr 2, 2020
This was referenced Apr 8, 2020
Closed
Closed
Closed
Closed
Closed
@xiulipanxiulipan mentioned this pull request Jul 31, 2020
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sathya-nujellasathya-nujellasathya-nujella left review comments
@lgirdwoodlgirdwoodlgirdwood approved these changes
@dbalutadbalutaAwaiting requested review from dbaluta
@lbetlejlbetlejAwaiting requested review from lbetlej
@mmaka1mmaka1Awaiting requested review from mmaka1
@plbossartplbossartAwaiting requested review from plbossart
@ranj063ranj063Awaiting requested review from ranj063
@tlaudatlaudaAwaiting requested review from tlauda
+4 more reviewers
@juimonenjuimonenjuimonen left review comments
@jairaj-aravajairaj-aravajairaj-arava left review comments
@RDharageswariRDharageswariRDharageswari requested changes
@jajanuszjajanuszjajanusz approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@xiulipan@lgirdwood@keqiaozhang@juimonen@RDharageswari@jajanusz@sathya-nujella@jairaj-arava@lbetlej