ASoC: sdw_utils: Call init callbacks on the correct codec DAI

asoc_sdw_rtd_init() needs to call the rtd_init() callbacks for each
codec in a dailink. It was finding the codecs by looking for the
matching DAI name in codec_info_list[] but this is broken because the
DAI name isn't guaranteed to be unique. Parts using the same codec
driver (so the same DAI names) might require different machine driver
setup.

An array of pointers to the codec_info[] entries used to construct the
dailink are saved into the private data of the dailink.
Then asoc_sdw_rtd_init() can then use that array to get the correct
information to initialize support for that codec.

The rtd_init() callbacks in the codec_info[] array take a struct
snd_soc_dai, so the codec DAIs created by ASoC must be matched up with
the corresponding codec_info[] entry used to create the dailink. The
DAI name cannot be used for this because multiple parts in codec_info[]
could have the same DAI names. Instead, the order of codec DAI entries
in struct snd_soc_pcm_runtime is expected to be the same as the order
of codec DAIs in struct snd_soc_dai_link->codecs. As the order of
codec DAI entries in struct snd_soc_dai_link->codecs also matches the
order of their corresponding codec_info[] pointers added to the dailink
private data, it follows that there is a 1:1 mapping with the order of
DAIs returned by for_each_rtd_codec_dais(). In other words:

    dailink.codec[i]
      was created from endpoint[i]

   and

   dailink private dai_info[i]
      was created from endpoint[i].codec_info

   so

   for_each_rtd_codec_dais(..., i, ...)
      corresponds to endpoint[i]
      and dai_info[i]

Change-Id: Idde610bfe8909a40b884e07801f7418c57711774
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>

Author: rfvirgil

include/sound/soc_sdw_utils.h

@@ -106,7 +106,7 @@ struct asoc_sdw_endpoint {
 	bool include_sidecar;
 
 	struct asoc_sdw_codec_info *codec_info;
-	const struct asoc_sdw_dai_info *dai_info;
+	struct asoc_sdw_dai_info *dai_info;
 };
 
 struct asoc_sdw_dailink {
@@ -118,6 +118,16 @@ struct asoc_sdw_dailink {
 	struct list_head endpoints;
 };
 
+struct asoc_sdw_dailink_dai_info {
+	const struct asoc_sdw_codec_info *codec_info;
+	struct asoc_sdw_dai_info *dai_info;
+};
+
+struct asoc_sdw_dailink_private {
+	int num_dai_infos;
+	struct asoc_sdw_dailink_dai_info dai_infos[] __counted_by(num_dai_infos);
+};
+
 extern struct asoc_sdw_codec_info codec_info_list[];
 int asoc_sdw_get_codec_info_list_count(void);
 
@@ -149,14 +159,15 @@ void asoc_sdw_mc_dailink_exit_loop(struct snd_soc_card *card);
 
 int asoc_sdw_card_late_probe(struct snd_soc_card *card);
 
-void asoc_sdw_init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,
-			    int *be_id, char *name, int playback, int capture,
-			    struct snd_soc_dai_link_component *cpus, int cpus_num,
-			    struct snd_soc_dai_link_component *platform_component,
-			    int num_platforms, struct snd_soc_dai_link_component *codecs,
-			    int codecs_num, int no_pcm,
-			    int (*init)(struct snd_soc_pcm_runtime *rtd),
-			    const struct snd_soc_ops *ops);
+int asoc_sdw_init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,
+			   struct asoc_sdw_dailink *soc_dai,
+			   int *be_id, char *name, int playback, int capture,
+			   struct snd_soc_dai_link_component *cpus, int cpus_num,
+			   struct snd_soc_dai_link_component *platform_component,
+			   int num_platforms, struct snd_soc_dai_link_component *codecs,
+			   int codecs_num, int no_pcm,
+			   int (*init)(struct snd_soc_pcm_runtime *rtd),
+			   const struct snd_soc_ops *ops);
 
 int asoc_sdw_init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,
 				  int *be_id, char *name, int playback, int capture,

sound/soc/amd/acp/acp-sdw-legacy-mach.c

@@ -237,10 +237,14 @@ static int create_sdw_dailink(struct snd_soc_card *card,
 		playback = (stream == SNDRV_PCM_STREAM_PLAYBACK);
 		capture = (stream == SNDRV_PCM_STREAM_CAPTURE);
 
-		asoc_sdw_init_dai_link(dev, *dai_links, be_id, name, playback, capture,
-				       cpus, num_cpus, sdw_platform_component,
-				       1, codecs, num_codecs,
-				       0, asoc_sdw_rtd_init, &sdw_ops);
+		ret = asoc_sdw_init_dai_link(dev, *dai_links, soc_dai,
+					     be_id, name, playback, capture,
+					     cpus, num_cpus, sdw_platform_component,
+					     1, codecs, num_codecs,
+					     0, asoc_sdw_rtd_init, &sdw_ops);
+		if (ret)
+			return ret;
+
 		/*
 		 * SoundWire DAILINKs use 'stream' functions and Bank Switch operations
 		 * based on wait_for_completion(), tag them as 'nonatomic'.

sound/soc/amd/acp/acp-sdw-sof-mach.c

@@ -193,10 +193,13 @@ static int create_sdw_dailink(struct snd_soc_card *card,
 		playback = (stream == SNDRV_PCM_STREAM_PLAYBACK);
 		capture = (stream == SNDRV_PCM_STREAM_CAPTURE);
 
-		asoc_sdw_init_dai_link(dev, *dai_links, be_id, name, playback, capture,
-				       cpus, num_cpus, platform_component,
-				       ARRAY_SIZE(platform_component), codecs, num_codecs,
-				       1, asoc_sdw_rtd_init, &sdw_ops);
+		ret = asoc_sdw_init_dai_link(dev, *dai_links, sof_dai,
+					     be_id, name, playback, capture,
+					     cpus, num_cpus, platform_component,
+					     ARRAY_SIZE(platform_component), codecs, num_codecs,
+					     1, asoc_sdw_rtd_init, &sdw_ops);
+		if (ret)
+			return ret;
 
 		/*
 		 * SoundWire DAILINKs use 'stream' functions and Bank Switch operations

sound/soc/intel/boards/sof_sdw.c

@@ -998,9 +998,12 @@ static int create_sdw_dailink(struct snd_soc_card *card,
 		playback = (stream == SNDRV_PCM_STREAM_PLAYBACK);
 		capture = (stream == SNDRV_PCM_STREAM_CAPTURE);
 
-		asoc_sdw_init_dai_link(dev, *dai_links, be_id, name, playback, capture,
-				       cpus, num_cpus, platform, 1, codecs, num_codecs,
-				       1, asoc_sdw_rtd_init, &sdw_ops);
+		ret = asoc_sdw_init_dai_link(dev, *dai_links, sof_dai,
+					     be_id, name, playback, capture,
+					     cpus, num_cpus, platform, 1, codecs, num_codecs,
+					     1, asoc_sdw_rtd_init, &sdw_ops);
+		if (ret)
+			return ret;
 
 		/*
 		 * SoundWire DAILINKs use 'stream' functions and Bank Switch operations

sound/soc/sdw_utils/soc_sdw_utils.c

@@ -837,27 +837,36 @@ EXPORT_SYMBOL_NS(asoc_sdw_find_codec_info_dai, "SND_SOC_SDW_UTILS");
 int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
-	struct asoc_sdw_codec_info *codec_info;
+	struct asoc_sdw_dailink_private *priv;
+	const struct asoc_sdw_codec_info *codec_info;
+	struct asoc_sdw_dai_info *dai_info;
 	struct snd_soc_dai *dai;
 	const char *spk_components="";
-	int dai_index;
 	int ret;
 	int i;
 
+	priv = snd_soc_link_get_drv_data(rtd->dai_link);
+	if (!priv)
+		goto skip_codec_inits;
+
 	for_each_rtd_codec_dais(rtd, i, dai) {
-		codec_info = asoc_sdw_find_codec_info_dai(dai->name, &dai_index);
-		if (!codec_info)
-			return -EINVAL;
+		if (i >= priv->num_dai_infos)
+			break;
+
+		codec_info = priv->dai_infos[i].codec_info;
+		dai_info = priv->dai_infos[i].dai_info;
 
 		/*
 		 * A codec dai can be connected to different dai links for capture and playback,
 		 * but we only need to call the rtd_init function once.
 		 * The rtd_init for each codec dai is independent. So, the order of rtd_init
 		 * doesn't matter.
 		 */
-		if (codec_info->dais[dai_index].rtd_init_done)
+		if (dai_info->rtd_init_done)
 			continue;
 
+		dev_dbg(rtd->dev, "%#x/%s: Creating controls\n",
+			codec_info->part_id, dai_info->dai_name);
 		/*
 		 * Add card controls and dapm widgets for the first codec dai.
 		 * The controls and widgets will be used for all codec dais.
@@ -866,19 +875,19 @@ int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
 		if (i > 0)
 			goto skip_add_controls_widgets;
 
-		if (codec_info->dais[dai_index].controls) {
-			ret = snd_soc_add_card_controls(card, codec_info->dais[dai_index].controls,
-							codec_info->dais[dai_index].num_controls);
+		if (dai_info->controls) {
+			ret = snd_soc_add_card_controls(card, dai_info->controls,
+							dai_info->num_controls);
 			if (ret) {
 				dev_err(card->dev, "%#x controls addition failed: %d\n",
 					codec_info->part_id, ret);
 				return ret;
 			}
 		}
-		if (codec_info->dais[dai_index].widgets) {
+		if (dai_info->widgets) {
 			ret = snd_soc_dapm_new_controls(&card->dapm,
-							codec_info->dais[dai_index].widgets,
-							codec_info->dais[dai_index].num_widgets);
+							dai_info->widgets,
+							dai_info->num_widgets);
 			if (ret) {
 				dev_err(card->dev, "%#x widgets addition failed: %d\n",
 					codec_info->part_id, ret);
@@ -887,31 +896,34 @@ int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
 		}
 
 skip_add_controls_widgets:
-		if (codec_info->dais[dai_index].rtd_init) {
-			ret = codec_info->dais[dai_index].rtd_init(rtd, dai);
+		if (dai_info->rtd_init) {
+			dev_dbg(rtd->dev, "%#x/%s: rtd_init for DAI %s/%s\n",
+				codec_info->part_id, dai_info->dai_name,
+				dai->component->name, dai->name);
+
+			ret = dai_info->rtd_init(rtd, dai);
 			if (ret)
 				return ret;
 		}
 
 		/* Generate the spk component string for card->components string */
-		if (codec_info->dais[dai_index].dai_type == SOC_SDW_DAI_TYPE_AMP &&
-		    codec_info->dais[dai_index].component_name) {
+		if (dai_info->dai_type == SOC_SDW_DAI_TYPE_AMP && dai_info->component_name) {
 			if (strlen (spk_components) == 0)
 				spk_components =
 					devm_kasprintf(card->dev, GFP_KERNEL, "%s",
-						       codec_info->dais[dai_index].component_name);
+						       dai_info->component_name);
 			else
 				/* Append component name to spk_components */
 				spk_components =
 					devm_kasprintf(card->dev, GFP_KERNEL,
 						       "%s+%s", spk_components,
-						       codec_info->dais[dai_index].component_name);
+						       dai_info->component_name);
 		}
 
-		codec_info->dais[dai_index].rtd_init_done = true;
-
+		dai_info->rtd_init_done = true;
 	}
 
+skip_codec_inits:
 	if (strlen (spk_components) > 0) {
 		/* Update card components for speaker components */
 		card->components = devm_kasprintf(card->dev, GFP_KERNEL, "%s spk:%s",
@@ -1194,15 +1206,21 @@ int asoc_sdw_card_late_probe(struct snd_soc_card *card)
 }
 EXPORT_SYMBOL_NS(asoc_sdw_card_late_probe, "SND_SOC_SDW_UTILS");
 
-void asoc_sdw_init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,
-			    int *be_id, char *name, int playback, int capture,
-			    struct snd_soc_dai_link_component *cpus, int cpus_num,
-			    struct snd_soc_dai_link_component *platform_component,
-			    int num_platforms, struct snd_soc_dai_link_component *codecs,
-			    int codecs_num, int no_pcm,
-			    int (*init)(struct snd_soc_pcm_runtime *rtd),
-			    const struct snd_soc_ops *ops)
+int asoc_sdw_init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,
+			   struct asoc_sdw_dailink *soc_dai,
+			   int *be_id, char *name, int playback, int capture,
+			   struct snd_soc_dai_link_component *cpus, int cpus_num,
+			   struct snd_soc_dai_link_component *platform_component,
+			   int num_platforms, struct snd_soc_dai_link_component *codecs,
+			   int codecs_num, int no_pcm,
+			   int (*init)(struct snd_soc_pcm_runtime *rtd),
+			   const struct snd_soc_ops *ops)
 {
+	struct asoc_sdw_dailink_private *priv;
+	int num_endpoints;
+	struct asoc_sdw_endpoint *endpoint;
+	int i;
+
 	dev_dbg(dev, "create dai link %s, id %d\n", name, *be_id);
 	dai_links->id = (*be_id)++;
 	dai_links->name = name;
@@ -1218,6 +1236,29 @@ void asoc_sdw_init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_lin
 	dai_links->capture_only  = !playback &&  capture;
 	dai_links->init = init;
 	dai_links->ops = ops;
+
+	if (!soc_dai)
+		return 0;
+
+	num_endpoints = list_count_nodes(&soc_dai->endpoints);
+	WARN_ON(num_endpoints != dai_links->num_codecs);
+
+	priv = devm_kzalloc(dev, struct_size(priv, dai_infos, num_endpoints),
+			    GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	priv->num_dai_infos = num_endpoints;
+	i = 0;
+	list_for_each_entry(endpoint, &soc_dai->endpoints, list) {
+		priv->dai_infos[i].codec_info = endpoint->codec_info;
+		priv->dai_infos[i].dai_info = endpoint->dai_info;
+		i++;
+	}
+
+	snd_soc_link_set_drv_data(dai_links, priv);
+
+	return 0;
 }
 EXPORT_SYMBOL_NS(asoc_sdw_init_dai_link, "SND_SOC_SDW_UTILS");
 
@@ -1241,11 +1282,9 @@ int asoc_sdw_init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *d
 	dlc[2].name = codec_name;
 	dlc[2].dai_name = codec_dai_name;
 
-	asoc_sdw_init_dai_link(dev, dai_links, be_id, name, playback, capture,
-			       &dlc[0], 1, &dlc[1], 1, &dlc[2], 1,
-			       no_pcm, init, ops);
-
-	return 0;
+	return asoc_sdw_init_dai_link(dev, dai_links, NULL, be_id, name, playback, capture,
+				      &dlc[0], 1, &dlc[1], 1, &dlc[2], 1,
+				      no_pcm, init, ops);
 }
 EXPORT_SYMBOL_NS(asoc_sdw_init_simple_dai_link, "SND_SOC_SDW_UTILS");
 
@@ -1463,7 +1502,7 @@ int asoc_sdw_parse_sdw_endpoints(struct snd_soc_card *card,
 
 			for (j = 0; j < adr_dev->num_endpoints; j++) {
 				const struct snd_soc_acpi_endpoint *adr_end;
-				const struct asoc_sdw_dai_info *dai_info;
+				struct asoc_sdw_dai_info *dai_info;
 				struct asoc_sdw_dailink *soc_dai;
 				int stream;