topology2: add missing nhlt by bardliao · Pull Request #6957 · thesofproject/sof

bardliao · 2023-01-16T09:37:30Z

Somehow some SoundWire topologies don't have PREPROCESS_PLUGINS=nhlt definition. It leads to nhlt is not included in those topologies.

Signed-off-by: Bard Liao yung-chuan.liao@linux.intel.com

Fixes: #6955

Somehow some SoundWire topologies don't have PREPROCESS_PLUGINS=nhlt definition. It leads to nhlt is not included in those topologies. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

kv2019i

Thanks @bardliao ! Let's see the CI results...

kv2019i · 2023-01-16T11:54:18Z

Hmm, puzzled. So this seems to fix the HDMI load issue (although this PR doesn't touch the HDMI issue). But some of the tests fail to dmic error which incicates some NHLT blob is still missing and/or wrong:
https://sof-ci.01.org/sofpr/PR6957/build3383/devicetest/index.html?model=ADLP_RVP_SDW_IPC4ZPH&testcase=check-capture-10sec

[   10.603905] <err> dai_intel_dmic_nhlt: dmic_set_config_nhlt(): illegal OUTCONTROL0 = 0x00390843
[   10.603913] <err> dai_intel_dmic: dmic_set_config(): Failed to set the requested configuration.
[   10.603943] <err> copier: comp:0 0x40000 failed to create dai

juimonen · 2023-01-16T12:16:17Z

topologies compiled need to have the PLATFORM definition. like mtl, tgl etc. Dmic blob is different depending on that -> we have dmic hw change between tgl and mtl.

bardliao · 2023-01-16T12:41:43Z

topologies compiled need to have the PLATFORM definition. like mtl, tgl etc. Dmic blob is different depending on that -> we have dmic hw change between tgl and mtl.

Thanks @juimonen for pointing this out. DMIC_DRIVER_VERSION should be 1 for ADL, right?

juimonen · 2023-01-16T12:43:57Z

topologies compiled need to have the PLATFORM definition. like mtl, tgl etc. Dmic blob is different depending on that -> we have dmic hw change between tgl and mtl.

Thanks @juimonen for pointing this out. DMIC_DRIVER_VERSION should be 1 for ADL, right?

yes.

bardliao · 2023-01-16T13:42:52Z

Thanks @juimonen, setting DMIC_DRIVER_VERSION=1 fixed the DMIC recording issue on ADL SDW RVP. Instead of removing DMIC from sof-adl-rt711-4ch.tplg, I removed DMIC_DRIVER_VERSION=3 which is for MTL only from cavs-sdw.conf in this PR. Let's wait and see the PR test result.

DMIC_DRIVER_VERSION=3 is already set in mtl.conf. Other platforms should use the default value in dmic-default.conf Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

kv2019i · 2023-01-16T15:07:57Z

Hmm, still issue with the blob:
https://sof-ci.01.org/sofpr/PR6957/build3393/devicetest/index.html?model=ADLP_RVP_SDW_IPC4ZPH&testcase=check-capture-10sec

[  355.903195] kernel: snd_sof:sof_ipc4_prepare_copier_module: sof-audio-pci-intel-tgl 0000:00:1f.3: copier copier.DMIC.101.1, type 28
[  355.903201] kernel: snd_sof:snd_sof_get_nhlt_endpoint_data: sof-audio-pci-intel-tgl 0000:00:1f.3: dai index 0 nhlt type 2 direction 1
[  355.903209] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Looking for configuration:
[  355.903213] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   vbus_id=0 link_type=2 dir=1, dev_type=0
[  355.903219] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   ch=4 fmt=32/32 rate=48000
[  355.903226] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint count=2
[  355.903230] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=0 dev_type = 0
[  355.903236] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=1 dev_type = 0
[  355.903241] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: no matching blob for sample rate: 48000 sample width: 32 channels: 4
[  355.903254] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: failed to prepare widget copier.DMIC.101.1
[  355.903195] kernel: snd_sof:sof_ipc4_prepare_copier_module: sof-audio-pci-intel-tgl 0000:00:1f.3: copier copier.DMIC.101.1, type 28
[  355.903201] kernel: snd_sof:snd_sof_get_nhlt_endpoint_data: sof-audio-pci-intel-tgl 0000:00:1f.3: dai index 0 nhlt type 2 direction 1
[  355.903209] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Looking for configuration:
[  355.903213] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   vbus_id=0 link_type=2 dir=1, dev_type=0
[  355.903219] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   ch=4 fmt=32/32 rate=48000
[  355.903226] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint count=2
[  355.903230] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=0 dev_type = 0
[  355.903236] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=1 dev_type = 0
[  355.903241] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: no matching blob for sample rate: 48000 sample width: 32 channels: 4
[  355.903254] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: failed to prepare widget copier.DMIC.101.1 [  355.903195] kernel: snd_sof:sof_ipc4_prepare_copier_module: sof-audio-pci-intel-tgl 0000:00:1f.3: copier copier.DMIC.101.1, type 28
[  355.903201] kernel: snd_sof:snd_sof_get_nhlt_endpoint_data: sof-audio-pci-intel-tgl 0000:00:1f.3: dai index 0 nhlt type 2 direction 1
[  355.903209] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Looking for configuration:
[  355.903213] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   vbus_id=0 link_type=2 dir=1, dev_type=0
[  355.903219] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   ch=4 fmt=32/32 rate=48000
[  355.903226] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint count=2
[  355.903230] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=0 dev_type = 0
[  355.903236] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=1 dev_type = 0
[  355.903241] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: no matching blob for sample rate: 48000 sample width: 32 channels: 4
[  355.903254] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: failed to prepare widget copier.DMIC.101.1 [  355.903195] kernel: snd_sof:sof_ipc4_prepare_copier_module: sof-audio-pci-intel-tgl 0000:00:1f.3: copier copier.DMIC.101.1, type 28
[  355.903201] kernel: snd_sof:snd_sof_get_nhlt_endpoint_data: sof-audio-pci-intel-tgl 0000:00:1f.3: dai index 0 nhlt type 2 direction 1
[  355.903209] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Looking for configuration:
[  355.903213] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   vbus_id=0 link_type=2 dir=1, dev_type=0
[  355.903219] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   ch=4 fmt=32/32 rate=48000
[  355.903226] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint count=2
[  355.903230] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=0 dev_type = 0
[  355.903236] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=1 dev_type = 0
[  355.903241] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: no matching blob for sample rate: 48000 sample width: 32 channels: 4
[  355.903254] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: failed to prepare widget copier.DMIC.101.1

juimonen · 2023-01-16T15:16:27Z

these are needed in cmakefile or inside the topology file: NUM_DMICS=4,DMIC0_ID=3,DMIC1_ID=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1

so the dmic definitions need to be present also when compiling (if you want 4 ch)... default is 2ch. actually don't know what is the "ID", at least NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1, need to be there.

bardliao · 2023-01-17T01:00:34Z

https://sof-ci.01.org/sofpr/PR6957/build3393/devicetest/index.html?model=ADLP_RVP_SDW_IPC4ZPH&testcase=check-capture-10sec failed is because that options snd_sof_intel_hda_common sof_use_tplg_nhlt=1 is not in /etc/modprobe.d/snd_sof_intel_hda_common.conf. Let's trigger the test again. @miRoox FYI

bardliao · 2023-01-17T01:00:43Z

SOFCI TEST

bardliao · 2023-01-17T01:08:37Z

these are needed in cmakefile or inside the topology file: NUM_DMICS=4,DMIC0_ID=3,DMIC1_ID=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1

so the dmic definitions need to be present also when compiling (if you want 4 ch)... default is 2ch. actually don't know what is the "ID", at least NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1, need to be there.

@juimonen Yes, the topology is built with
"cavs-sdw;sof-adl-rt711-4ch;DEEPBUFFER_FW_DMA_MS=100,NUM_DMICS=4,DMIC0_ID=2,
DMIC1_ID=3,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,HDMI1_ID=4,HDMI2_ID=5,
HDMI3_ID=6,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-rt711-4ch.bin"

bardliao · 2023-01-17T01:10:17Z

Hmm, still issue with the blob: https://sof-ci.01.org/sofpr/PR6957/build3393/devicetest/index.html?model=ADLP_RVP_SDW_IPC4ZPH&testcase=check-capture-10sec

[  355.903195] kernel: snd_sof:sof_ipc4_prepare_copier_module: sof-audio-pci-intel-tgl 0000:00:1f.3: copier copier.DMIC.101.1, type 28
[  355.903201] kernel: snd_sof:snd_sof_get_nhlt_endpoint_data: sof-audio-pci-intel-tgl 0000:00:1f.3: dai index 0 nhlt type 2 direction 1
[  355.903209] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Looking for configuration:
[  355.903213] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   vbus_id=0 link_type=2 dir=1, dev_type=0
[  355.903219] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   ch=4 fmt=32/32 rate=48000
[  355.903226] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint count=2
[  355.903230] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=0 dev_type = 0
[  355.903236] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=1 dev_type = 0
[  355.903241] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: no matching blob for sample rate: 48000 sample width: 32 channels: 4
[  355.903254] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: failed to prepare widget copier.DMIC.101.1
[  355.903195] kernel: snd_sof:sof_ipc4_prepare_copier_module: sof-audio-pci-intel-tgl 0000:00:1f.3: copier copier.DMIC.101.1, type 28
[  355.903201] kernel: snd_sof:snd_sof_get_nhlt_endpoint_data: sof-audio-pci-intel-tgl 0000:00:1f.3: dai index 0 nhlt type 2 direction 1
[  355.903209] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Looking for configuration:
[  355.903213] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   vbus_id=0 link_type=2 dir=1, dev_type=0
[  355.903219] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   ch=4 fmt=32/32 rate=48000
[  355.903226] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint count=2
[  355.903230] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=0 dev_type = 0
[  355.903236] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=1 dev_type = 0
[  355.903241] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: no matching blob for sample rate: 48000 sample width: 32 channels: 4
[  355.903254] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: failed to prepare widget copier.DMIC.101.1 [  355.903195] kernel: snd_sof:sof_ipc4_prepare_copier_module: sof-audio-pci-intel-tgl 0000:00:1f.3: copier copier.DMIC.101.1, type 28
[  355.903201] kernel: snd_sof:snd_sof_get_nhlt_endpoint_data: sof-audio-pci-intel-tgl 0000:00:1f.3: dai index 0 nhlt type 2 direction 1
[  355.903209] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Looking for configuration:
[  355.903213] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   vbus_id=0 link_type=2 dir=1, dev_type=0
[  355.903219] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   ch=4 fmt=32/32 rate=48000
[  355.903226] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint count=2
[  355.903230] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=0 dev_type = 0
[  355.903236] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=1 dev_type = 0
[  355.903241] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: no matching blob for sample rate: 48000 sample width: 32 channels: 4
[  355.903254] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: failed to prepare widget copier.DMIC.101.1 [  355.903195] kernel: snd_sof:sof_ipc4_prepare_copier_module: sof-audio-pci-intel-tgl 0000:00:1f.3: copier copier.DMIC.101.1, type 28
[  355.903201] kernel: snd_sof:snd_sof_get_nhlt_endpoint_data: sof-audio-pci-intel-tgl 0000:00:1f.3: dai index 0 nhlt type 2 direction 1
[  355.903209] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Looking for configuration:
[  355.903213] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   vbus_id=0 link_type=2 dir=1, dev_type=0
[  355.903219] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3:   ch=4 fmt=32/32 rate=48000
[  355.903226] kernel: snd_intel_dspcfg:intel_nhlt_get_endpoint_blob: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint count=2
[  355.903230] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=0 dev_type = 0
[  355.903236] kernel: snd_intel_dspcfg:nhlt_check_ep_match: sof-audio-pci-intel-tgl 0000:00:1f.3: Endpoint: vbus_id=2 link_type=3 dir=1 dev_type = 0
[  355.903241] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: no matching blob for sample rate: 48000 sample width: 32 channels: 4
[  355.903254] kernel: sof-audio-pci-intel-tgl 0000:00:1f.3: failed to prepare widget copier.DMIC.101.1

I checked it and the reason is that options snd_sof_intel_hda_common sof_use_tplg_nhlt=1 was not set. So the driver was using nhlt from BIOS not from the topology.

bardliao · 2023-01-17T02:34:57Z

https://sof-ci.01.org/sofpr/PR6957/build3404/devicetest/index.html looks good now.

juimonen · 2023-01-17T07:17:06Z

@bardliao thanks!

bardliao requested review from juimonen and ranj063 January 16, 2023 09:37

bardliao requested review from aborisovich and marc-hb as code owners January 16, 2023 09:37

juimonen approved these changes Jan 16, 2023

View reviewed changes

topology2: add missing nhlt

ae62c2c

Somehow some SoundWire topologies don't have PREPROCESS_PLUGINS=nhlt definition. It leads to nhlt is not included in those topologies. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

kv2019i approved these changes Jan 16, 2023

View reviewed changes

bardliao mentioned this pull request Jan 16, 2023

Revert "topology: hdmi-generic: change HDMI PCM id" #6953

Closed

bardliao force-pushed the topology2-nhlt branch from d6a1e01 to 111ddcc Compare January 16, 2023 13:35

bardliao requested review from dbaluta, lbetlej, lgirdwood, mmaka1 and plbossart as code owners January 16, 2023 13:35

topology2: cavs-sdw: remove default value of DMIC_DRIVER_VERSION

111ddcc

DMIC_DRIVER_VERSION=3 is already set in mtl.conf. Other platforms should use the default value in dmic-default.conf Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

bardliao mentioned this pull request Jan 17, 2023

topology2: remove HDMI from topologies for MTL #6946

Merged

kv2019i merged commit 4b810a8 into thesofproject:main Jan 17, 2023

miRoox mentioned this pull request Jan 18, 2023

[BUG] no matching blob for sample rate: 48000 sample width: 32 channels: 4 when capture with DMIC on ADLP_RVP_SDW + IPC4 #6955

Closed

Conversation

bardliao commented Jan 16, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kv2019i left a comment

Choose a reason for hiding this comment

Uh oh!

kv2019i commented Jan 16, 2023

Uh oh!

juimonen commented Jan 16, 2023

Uh oh!

bardliao commented Jan 16, 2023

Uh oh!

juimonen commented Jan 16, 2023

Uh oh!

bardliao commented Jan 16, 2023

Uh oh!

kv2019i commented Jan 16, 2023

Uh oh!

juimonen commented Jan 16, 2023

Uh oh!

bardliao commented Jan 17, 2023

Uh oh!

bardliao commented Jan 17, 2023

Uh oh!

bardliao commented Jan 17, 2023

Uh oh!

bardliao commented Jan 17, 2023

Uh oh!

bardliao commented Jan 17, 2023

Uh oh!

juimonen commented Jan 17, 2023

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

bardliao commented Jan 16, 2023 •

edited

Loading