Skip to content

ASoC: Intel: sof_sdw: append dai type to dai link name unconditionally #5767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bardliao wants to merge 1 commit into
base: topic/sof-dev
Choose a base branch
from
+12 −11
Open

ASoC: Intel: sof_sdw: append dai type to dai link name unconditionally #5767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions sound/soc/intel/boards/sof_sdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,10 +928,16 @@ static int create_sdw_dailink(struct snd_soc_card *card,
}
}

/*
* The dai_type is used to select function topologies. Since the topology stream name
* and DAI link name use partial matching, unconditionally appending the dai_type provides
* necessary selection metadata without breaking existing topologies. Although
* ctx->append_dai_type is not checked here, we overwrite it to ensure consistency in case
* it is referenced elsewhere.
*/
ctx->append_dai_type = true;
Copy link
Copy Markdown
Collaborator

@ujfalusi ujfalusi May 8, 2026

Choose a reason for hiding this comment

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

in a followup patch remove the append_dai_type completely? It is now always true

The commit message is a bit hard to follow, it would be great to reword it and now, the copilot version is not much better for the comment.
Basically if I read it right, we will remove the differentiation between num_link_dailinks == 1 and num_link_dailinks > 1, right?

Copy link
Copy Markdown
Collaborator Author

@bardliao bardliao May 8, 2026

Choose a reason for hiding this comment

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

@ujfalusi Basically, the only "SDW%d-Playback-%s" and "SDW%d-Capture-%s" will be kept in sdw_stream_name[]. The dai type name is used to selecte the function topologies. In other words, the dai type name if required for the function topology. And in theory, it won't impact the matching of the existing topology. I.e. SDW0-Playback can still match SDW0-Playback-SimpleJack

Copy link
Copy Markdown
Collaborator

@ujfalusi ujfalusi May 8, 2026

Choose a reason for hiding this comment

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

right, my point is that now append_dai_type is constant true, so it can be removed, no?

On the partial / exact match: you had PR which changed some matching from partial to exact, now you rename things since it is used in match which is partial. It is just hard to follow what is partial and what is not...

Copy link
Copy Markdown
Collaborator Author

@bardliao bardliao May 8, 2026

Choose a reason for hiding this comment

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

right, my point is that now append_dai_type is constant true, so it can be removed, no?

Yes, I just file the PR for quick test and get feedback. I will remove the non-used part if the concept is agreed.

On the partial / exact match: you had PR which changed some matching from partial to exact, now you rename things since it is used in match which is partial. It is just hard to follow what is partial and what is not...

Are you talking about #5728? This is to match the link mask. And here is the stream name and dai link name.

for_each_pcm_streams(stream) {
static const char * const sdw_stream_name[] = {
"SDW%d-Playback",
"SDW%d-Capture",
"SDW%d-Playback-%s",
"SDW%d-Capture-%s",
};
Expand Down Expand Up @@ -959,15 +965,10 @@ static int create_sdw_dailink(struct snd_soc_card *card,
}

/* create stream name according to first link id */
if (ctx->append_dai_type)
name = devm_kasprintf(dev, GFP_KERNEL,
sdw_stream_name[stream + 2],
ffs(sof_end->link_mask) - 1,
type_strings[sof_end->dai_info->dai_type]);
else
name = devm_kasprintf(dev, GFP_KERNEL,
sdw_stream_name[stream],
ffs(sof_end->link_mask) - 1);
name = devm_kasprintf(dev, GFP_KERNEL,
sdw_stream_name[stream],
ffs(sof_end->link_mask) - 1,
type_strings[sof_end->dai_info->dai_type]);
if (!name)
return -ENOMEM;

Expand Down
Loading