topology: cleanup/align SoundWire device numbers #3806

plbossart · 2021-02-01T22:22:07Z

No description provided.

naveen-manohar

With UCM changes, Verified Basic Audio on Volteer-SDW - sof-tgl-sdw-max98373-rt5682.tplg

plbossart · 2021-02-02T17:07:55Z

@bardliao @RanderWang can you take a look on other SoundWire devices?

bardliao · 2021-02-03T06:35:07Z

I tested 3 sdw laptops and all of them looks good to me.
Below is the result of cat /proc/asound/pcm

tgl sdca
00-00: Headphone (*) :  : playback 1
00-01: Headset mic (*) :  : capture 1
00-02: SDW1-speakers (*) :  : playback 1
00-04: Microphones (*) :  : capture 1
00-05: HDMI1 (*) :  : playback 1
00-06: HDMI2 (*) :  : playback 1
00-07: HDMI3 (*) :  : playback 1


tgl sdw
00-00: Headphone (*) :  : playback 1
00-01: Headset mic (*) :  : capture 1
00-02: Speakers (*) :  : playback 1
00-04: Microphones (*) :  : capture 1
00-05: HDMI1 (*) :  : playback 1
00-06: HDMI2 (*) :  : playback 1
00-07: HDMI3 (*) :  : playback 1


cml sdw 2 1308 laptop
00-00: Headphone (*) :  : playback 1
00-01: Headset mic (*) :  : capture 1
00-02: SDW1-speakers (*) :  : playback 1
00-04: Microphones (*) :  : capture 1
00-05: HDMI1 (*) :  : playback 1
00-06: HDMI2 (*) :  : playback 1
00-07: HDMI3 (*) :  : playback 1

RanderWang · 2021-02-03T13:31:35Z

I tested 3 sdw laptops and all of them looks good to me.
Below is the result of cat /proc/version

tgl sdca
00-00: Headphone (*) :  : playback 1
00-01: Headset mic (*) :  : capture 1
00-02: SDW1-speakers (*) :  : playback 1
00-04: Microphones (*) :  : capture 1
00-05: HDMI1 (*) :  : playback 1
00-06: HDMI2 (*) :  : playback 1
00-07: HDMI3 (*) :  : playback 1


tgl sdw
00-00: Headphone (*) :  : playback 1
00-01: Headset mic (*) :  : capture 1
00-02: Speakers (*) :  : playback 1
00-04: Microphones (*) :  : capture 1
00-05: HDMI1 (*) :  : playback 1
00-06: HDMI2 (*) :  : playback 1
00-07: HDMI3 (*) :  : playback 1


cml sdw 2 1308 laptop
00-00: Headphone (*) :  : playback 1
00-01: Headset mic (*) :  : capture 1
00-02: SDW1-speakers (*) :  : playback 1
00-04: Microphones (*) :  : capture 1
00-05: HDMI1 (*) :  : playback 1
00-06: HDMI2 (*) :  : playback 1
00-07: HDMI3 (*) :  : playback 1

@bardliao why only 3 HDMI for tgl device ?

RanderWang · 2021-02-03T13:34:28Z

tools/topology/sof-tgl-rt715-rt711-rt1308-hdmi.m4

PCM8 for iDisp4 is missed

RanderWang · 2021-02-03T13:34:59Z

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

RanderWang · 2021-02-03T14:03:43Z

it is ok on Volteer
root@sh-tglu-volt-sdw-03:~# cat /proc/asound/pcm
00-00: Headphone () : : playback 1
00-01: Headset mic () : : capture 1
00-02: smart373-spk () : : playback 1
00-03: echo () : : capture 1
00-05: HDMI1 () : : playback 1
00-06: HDMI2 () : : playback 1
00-07: HDMI3 () : : playback 1
00-08: HDMI4 () : : playback 1
00-10: DMIC48kHz () : : capture 1
00-12: DMIC16k () : : capture 1
01-00: USB Audio : USB Audio : playback 1 : capture 1

naveen-manohar · 2021-02-03T14:18:23Z

On Volteer-SDW:
Old_PCM vs New_PCM

lgirdwood · 2021-02-05T16:42:40Z

@naveen-manohar are you saying we alos need an UCM update here ?
@plbossart looks like we have a conflict.

plbossart · 2021-02-05T17:15:14Z

@naveen-manohar are you saying we alos need an UCM update here ?
@plbossart looks like we have a conflict.

Yes Volteer will need a UCM update, but that was shared and accepted by the Chrome folks. The Volteer configuration is not in alsa-ucm-conf upstream so platforms which are handled upstream, such as Dell/HP, have priority.

plbossart · 2021-02-05T17:16:52Z

@plbossart looks like we have a conflict.

yes, I managed to self-conflict between PRs. I need to change device names as well.

naveen-manohar · 2021-02-06T04:34:26Z

@naveen-manohar are you saying we alos need an UCM update here ?
@plbossart looks like we have a conflict.

Yes Volteer will need a UCM update, but that was shared and accepted by the Chrome folks. The Volteer configuration is not in alsa-ucm-conf upstream so platforms which are handled upstream, such as Dell/HP, have priority.

Post this PR merge, shall take to Chrome Tree & submit along with UCM change.

lgirdwood · 2021-02-09T17:17:46Z

@plbossart fyi - some merge conflicts.

plbossart · 2021-02-09T17:23:56Z

@plbossart fyi - some merge conflicts.

yes, will work on this later today.

This topology is no longer used and productized, let's remove it. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

This file was used for early enablement of SoundWire on a platform, before we had support for amplifiers. This is no longer needed, let's remove it. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Confusion between input and output, and PCM name and pipeline ID. Copy/paste likely here. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Add macro to allow the use of "BufferedMic" instead of "DMIC16kHz" in KPB usages. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

This patch follows the suggested layout: PCM0 playback Jack PCM1 capture Jack PCM2 playback Speaker PCM3 capture Amplifier Reference (typically based on I/V feedback) PCM4 capture Microphone PCM5 playback HDMI 1 PCM6 playback HDMI 2 PCM7 playback HDMI 3 PCM8 playback HDMI 4 PCM9 RESERVED PCM10 capture DMIC PCM11 capture DMIC16kHz PCM12 capture BufferedMic (aka KPB) PCM13 playback Bluetooth PCM14 capture Bluetooth PCM40 playback Speaker 2 (non-aggregated) Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Align on the following names: PCM0 playback Jack PCM1 capture Jack PCM2 playback Speaker PCM3 capture Amplifier Reference (typically based on I/V feedback) PCM4 capture Microphone PCM5 playback HDMI 1 PCM6 playback HDMI 2 PCM7 playback HDMI 3 PCM8 playback HDMI 4 PCM9 RESERVED PCM10 capture DMIC PCM11 capture DMIC16kHz PCM12 capture BufferedMic (aka KPB) PCM13 playback Bluetooth PCM14 capture Bluetooth Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

plbossart · 2021-02-09T21:07:30Z

@ranj063 @kv2019i @bardliao @perexg FYI here's the list of devices and names I came up with.

PCMDeviceList.txt

plbossart · 2021-02-11T20:47:31Z

@lgirdwood we should have been more careful on this one, CI tests did show a problem with alsa-bat precisely due to the device number issues.

https://sof-ci.01.org/sofpr/PR3806/build8108/devicetest/

I only realized this with the daily test and @fredoh9 's help.

good old alsa-bat still has its value. All other tests don't seem to check for expected device numbers or names.

lgirdwood · 2021-02-12T10:10:55Z

@plbossart thanks, fwiw, I've been seeing this all week and I've created an issue for CI test to dump PCM and card names when this happens. Do you have a followup for UCM ? or do you want to revert and hold for v1.8 ?

plbossart · 2021-02-12T14:33:28Z

@plbossart thanks, fwiw, I've been seeing this all week and I've created an issue for CI test to dump PCM and card names when this happens. Do you have a followup for UCM ? or do you want to revert and hold for v1.8 ?

I have a followup coming, @ranj063 helped me find the issues in current topologies that were exposed by my changes.
It's literally a Jenga game, when you remove or redefine a part the whole thing can crumble.

plbossart requested review from ranj063 and xiulipan as code owners February 1, 2021 22:22

plbossart requested review from RanderWang, bardliao and naveen-manohar February 1, 2021 22:23

naveen-manohar approved these changes Feb 2, 2021

View reviewed changes

RanderWang reviewed Feb 3, 2021

View reviewed changes

tools/topology/sof-tgl-rt715-rt711-rt1308-hdmi.m4 Outdated

Copy link

Collaborator

RanderWang Feb 3, 2021

Choose a reason for hiding this comment

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

PCM8 for iDisp4 is missed

RanderWang reviewed Feb 3, 2021

View reviewed changes

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

Copy link

Collaborator

RanderWang Feb 3, 2021

Choose a reason for hiding this comment

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

PCM8 ?

plbossart added 6 commits February 9, 2021 13:16

topology: remove sof-tgl-rt711-i2s-rt1308.m4

184f9fc

This topology is no longer used and productized, let's remove it. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

topology: remove sof-tgl-rt5682.m4

24d3a3f

This file was used for early enablement of SoundWire on a platform, before we had support for amplifiers. This is no longer needed, let's remove it. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

topology: sof-smart-amplifier: fix error message

3a70eea

Confusion between input and output, and PCM name and pipeline ID. Copy/paste likely here. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

topology: intel-generic-dmic: add macro for PCM device names

5f87b4a

Add macro to allow the use of "BufferedMic" instead of "DMIC16kHz" in KPB usages. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

plbossart force-pushed the fix/sdw-device-numbers branch from a9acd04 to 43e182d Compare February 9, 2021 21:05

plbossart requested review from dbaluta, lbetlej, lgirdwood and mmaka1 as code owners February 9, 2021 21:05

lgirdwood approved these changes Feb 10, 2021

View reviewed changes

lgirdwood merged commit 980d880 into thesofproject:master Feb 10, 2021

lgirdwood added this to the v1.7 milestone Feb 10, 2021

fredoh9 mentioned this pull request Feb 12, 2021

[BUG] simultaneous-playback-capture is broken in TGLU_VOLT_SDW thesofproject/sof-test#614

Closed

topology: cleanup/align SoundWire device numbers #3806

topology: cleanup/align SoundWire device numbers #3806

Uh oh!

Conversation

plbossart commented Feb 1, 2021

Uh oh!

naveen-manohar left a comment

Choose a reason for hiding this comment

Uh oh!

plbossart commented Feb 2, 2021

Uh oh!

bardliao commented Feb 3, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RanderWang commented Feb 3, 2021

Uh oh!

RanderWang Feb 3, 2021

Choose a reason for hiding this comment

Uh oh!

RanderWang Feb 3, 2021

Choose a reason for hiding this comment

Uh oh!

RanderWang commented Feb 3, 2021

Uh oh!

naveen-manohar commented Feb 3, 2021

Uh oh!

lgirdwood commented Feb 5, 2021

Uh oh!

plbossart commented Feb 5, 2021

Uh oh!

plbossart commented Feb 5, 2021

Uh oh!

naveen-manohar commented Feb 6, 2021

Uh oh!

lgirdwood commented Feb 9, 2021

Uh oh!

plbossart commented Feb 9, 2021

Uh oh!

plbossart commented Feb 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

plbossart commented Feb 11, 2021

Uh oh!

lgirdwood commented Feb 12, 2021

Uh oh!

plbossart commented Feb 12, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bardliao commented Feb 3, 2021 •

edited

Loading

plbossart commented Feb 9, 2021 •

edited

Loading