Skip to content

Modify the naming convention for the host copier in topology - #7631

Merged
ranj063 merged 12 commits into
thesofproject:mainfrom
ranj063:fix/host_copier
May 19, 2023
Merged

ranj063 merged 12 commits into
thesofproject:mainfrom
ranj063:fix/host_copier

Conversation

@ranj063

@ranj063 ranj063 commented May 16, 2023 •

Copy link
Copy Markdown
Collaborator

The names for the host copier have been changed from the current convention of copier.host.<PIPELINE_ID>.<INSTANCE_ID> to host-copier.<PCM_ID>.

@ranj063
ranj063 requested a review from jsarha as a code owner May 16, 2023 22:48
@ranj063
ranj063 requested a review from plbossart May 16, 2023 22:48
@ranj063 ranj063 changed the title Modify the naming convertion for the host copier in topology Modify the naming convention for the host copier in topology May 16, 2023
@ranj063

ranj063 commented May 17, 2023

Copy link
Copy Markdown
Collaborator Author

SOFCI TEST

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

I guess I am not fully getting the idea for the copier input/output pins, and I also wonder about replacing the macros with open-coding, see below @ranj063.

The replacement looks mostly good otherwise, I didn't spot any major issues.

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.

are you trying to say that one of 'num_input_pins' and 'num_output_pins" shall be zero?

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.

i've removed the default values and mandatory attributes for both. num_input_pins and num_output_pins come into the picture only where there're more than 1. Otherwise, they're just ignored by the kernel driver and in all our topologies today we dont have more than 1 of these for playback/capture.

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.

ANd I was wrong about this. So I've fixed all host-copiers to have the right number of input/output pins based on direction

Comment thread tools/topology/topology2/include/components/host-copier.conf Outdated

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.

what is the host-copier connected to on playback?

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.

what is the host-copier connected to on capture?

Comment thread tools/topology/topology2/platform/intel/bt-generic.conf Outdated
Comment thread tools/topology/topology2/platform/intel/dmic-wov.conf Outdated
Comment thread tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf Outdated

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

Still confused on pin definitions...

Comment thread tools/topology/topology2/include/components/host-copier.conf Outdated
ranj063 added 12 commits May 18, 2023 09:05
… gateway

This will replace the generic copier for the host gateway.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Replace the generic copier with host-copier object in the pipeline class
definition and all its instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Replace the generic copier with host-copier in the class definition and
the instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Replace the generic copier with host-copier in the class definition and
the instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Replace the generic copier with host-copier in the class definition and
the instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Replace the generic copier with host-copier in the class definition.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Replace the generic copier with host-copier in the class definition and
the instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Replace the generic copier with host-copier in the class definition.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Replace the generic copier with host-copier in the class definition and
the instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Replace the generic copier with host-copier in the class definition and
the instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Replace the generic copier with host-copier in the class definition and
the instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
It is now handled by the host-copier class. Renaming the copier class to
dai-copier and modifying its naming convention will be done in the
follow up patches.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
@ranj063
ranj063 force-pushed the fix/host_copier branch from 343bbbb to 1de2209 Compare May 18, 2023 16:06
@ranj063
ranj063 requested a review from plbossart May 18, 2023 17:26

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

LGTM @ranj063

@ranj063
ranj063 merged commit e545577 into thesofproject:main May 19, 2023
@ranj063
ranj063 deleted the fix/host_copier branch May 19, 2023 15:17
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.

3 participants