Skip to content

SoundWire topology update for v2.1.1 - #5870

Merged
lgirdwood merged 5 commits into
thesofproject:stable-v2.1from
libinyang:v2.1.1-update
Jun 10, 2022
Merged

lgirdwood merged 5 commits into
thesofproject:stable-v2.1from
libinyang:v2.1.1-update

Conversation

@libinyang

@libinyang libinyang commented May 31, 2022 •

Copy link
Copy Markdown
Contributor

cherrypick v1.9.3-tplg2 patches

This is to fix thesofproject/sof-bin#76 by adding SoundWire topology for some Dell devices to v2.1.1 release.

libinyang added 4 commits May 30, 2022 16:06
NO_AGGREGATION is never used now. Let's remove it.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Libin Yang <libin.yang@intel.com>
(cherry picked from commit 2898a1a)
The links are dynamically assigned. The descriptions should
be changed correspondingly.

Signed-off-by: Libin Yang <libin.yang@intel.com>
(cherry picked from commit 4bb6863)
…support

add sof-icl-rt711-rt1308-rt715-hdmi NO_LOCAL_MIC & NOAMP support

Signed-off-by: Libin Yang <libin.yang@intel.com>
(cherry picked from commit 0bb995a)
Add sof-adl-rt711-l2-rt1316-l01 support. This tplg doesn't include any
local MICs.

Signed-off-by: Libin Yang <libin.yang@intel.com>
(cherry picked from commit 5ef9e49)
@libinyang

Copy link
Copy Markdown
Contributor Author

porting patches in tag v1.9.3-tplg2 to branch v2.1

@libinyang

Copy link
Copy Markdown
Contributor Author

There is 2 warnings in the code style check of the patches. One is a typo: configuraiton = > configuration. The other is a fake warning. Should I fix the warning or we just keep it as the original patches has the typo too?

@mengdonglin mengdonglin changed the title V2.1.1 update SoundWire topology update for v2.1.1 May 31, 2022
@mengdonglin

mengdonglin commented May 31, 2022 •

Copy link
Copy Markdown
Collaborator

There is 2 warnings in the code style check of the patches. One is a typo: configuraiton = > configuration. The other is a fake warning. Should I fix the warning or we just keep it as the original patches has the typo too?

@libinyang Can you help submit a PR to main branch to fix the typo? And then cherry pick the typo fix to v2.1.1 as well?

@lgirdwood

Copy link
Copy Markdown
Member

There is 2 warnings in the code style check of the patches. One is a typo: configuraiton = > configuration. The other is a fake warning. Should I fix the warning or we just keep it as the original patches has the typo too?

@libinyang Can you help submit a PR to main branch to fix the typo? And then cherry pick the typo fix to v2.1.1 as well?

Ok, we can merge to v2.1.1 after typo fix is added to this PR.

@libinyang

Copy link
Copy Markdown
Contributor Author

patch is submitted: #5874

@marc-hb

marc-hb commented Jun 1, 2022

Copy link
Copy Markdown
Collaborator

And then cherry pick the typo fix to v2.1.1 as well?

checkpatch runs on each patch individually, so this will not turn checkpatch green.

Fixing checkpatch warnings at cherry-picking time is too late.

Signed-off-by: Libin Yang <libin.yang@intel.com>
(cherry picked from commit fa8570d)
@libinyang

Copy link
Copy Markdown
Contributor Author

patches updated. Typo fixed.

@libinyang

Copy link
Copy Markdown
Contributor Author

ping

@keqiaozhang

Copy link
Copy Markdown
Collaborator

SOFCI TEST

@keqiaozhang

Copy link
Copy Markdown
Collaborator

@lgirdwood please hold this PR. I found some errors on TGLH_SKU0A5E_SDW after applying this PR.
http://sof-ci.sh.intel.com/#/result/planresultdetail/13161

[   44.194658] kernel: rt1308 sdw:2:025d:1308:00: DPN_PortCtrl register write failed for port 1
[   44.194661] kernel: soundwire sdw-master-2: Program transport params failed: -61
[   44.194663] kernel: soundwire sdw-master-2: Program params failed: -61
[   44.194665] kernel:  SDW1-Playback: ASoC: error at snd_soc_link_prepare on SDW1-Playback: -61
[   44.194667] kernel:  SDW1-Playback: ASoC: __soc_pcm_prepare() failed (-61)
[   44.194668] kernel:  Speaker: ASoC: dpcm_be_dai_prepare() failed (-61)
[   44.194670] kernel:  Speaker: ASoC: dpcm_fe_dai_prepare() failed (-61)

But we didn't observe this issue on main branch. Libin is checking it.

@keqiaozhang

Copy link
Copy Markdown
Collaborator

@lgirdwood and @libinyang
The alarm has been cleared. Confirmed that this is a hardware issue and has nothing to do with this PR.
It seems that some registers were wrong and cannot be cleared by reboot.
I tried to AC the device and power on the device after a few minutes, then the issue disappears.

I triggered another round of test on TGLH_SKU0A5E_SDW and got 'ALL PASS'.
http://sof-ci.sh.intel.com/#/result/planresultdetail/13168

This PR has passed the validation on all our SDW devices.

@libinyang

Copy link
Copy Markdown
Contributor Author

ping @lgirdwood

@lgirdwood
lgirdwood merged commit e2007a4 into thesofproject:stable-v2.1 Jun 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants