Skip to content

Change the naming scheme for the SSP/HDA/DMIC DAI copiers - #7670

Merged
kv2019i merged 6 commits into
thesofproject:mainfrom
ranj063:fix/dai_copier
May 29, 2023
Merged

kv2019i merged 6 commits into
thesofproject:mainfrom
ranj063:fix/dai_copier

Conversation

@ranj063

@ranj063 ranj063 commented May 23, 2023 •

Copy link
Copy Markdown
Collaborator

Change the convention from
copier.<copier_type>.<pipeline ID>.<instance ID>
to
dai-copier.<copier_type>.<stream_name>.<direction>

Depends on thesofproject/linux#4375

@ranj063
ranj063 requested a review from jsarha as a code owner May 23, 2023 02:59
@ranj063
ranj063 requested review from bardliao and plbossart May 23, 2023 05:25

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Why didn't we need direction before?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

its never used before. direction is only meant for IPC3. But now I need it for the name

@plbossart plbossart 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.

one suggestion below @ranj063

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.

if we need to reduce the widget name length, "playback" and "capture" are obvious targets.

We could use something like "p"/"c" (as done for ALSA in /proc pcm0c/ pcm0p/ pcm10p/ pcm1p/). Or 'pb' and 'cp'.

Just a suggestion.

@ranj063

ranj063 commented May 24, 2023

Copy link
Copy Markdown
Collaborator Author

SOFCI TEST

@kv2019i kv2019i left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

The dependency to kernel change is unfortunate, but I guess a price we have to pay. Otherwise, this is a massive improvement to readability/maintainability of the tplg files, so a very welcome change.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

"These are" or "They are"

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

fixed and now the kernel dependency is merged as well. So lets retest

ranj063 added 6 commits May 26, 2023 08:52
To make it explicit that it is only for the DAI gateway.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Move the uuid attribute definition to widget-common.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
In preparation for changing the name of the DAI copier which will make
them a bit longer, reduce the token name lengths by removing the
sof_tkn_ prefix. This is required because the header names in topology
have a 44 character limit and with a long name like:
dai-copier.SSP.NoCodec-0.playback.sof_tkn_comp.uuid, the limit will be
hit. Removing the sof_tkn_ prefix will reduce the number of characters
in the tuple name headers.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Change the naming from dai-copier.<copier_type>.<pipeline_id>.<instance>
to dai_copier.<copier_type>.<stream_name.<direction>.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
…ndatory

Set them based on direction and the actual number of pins used.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
These are mandatory for both directions as they are used to set the DMA
buffer format.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
@kv2019i

kv2019i commented May 29, 2023

Copy link
Copy Markdown
Collaborator

Nothing related to this PR in https://sof-ci.01.org/sofpr/PR7670/build8583/devicetest/index.html , proceeding with merge.

@kv2019i
kv2019i merged commit f107548 into thesofproject:main May 29, 2023
@ranj063
ranj063 deleted the fix/dai_copier branch May 29, 2023 14:06
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.

4 participants