Skip to content

Commit e9db1b5

Browse files
bardliaobroonie
authored andcommitted
ASoC: SOF: ipc3-topology: Convert the topology pin index to ALH dai index
Intel SoundWire machine driver always uses Pin number 2 and above. Currently, the pin number is used as the FW DAI index directly. As a result, FW DAI 0 and 1 are never used. That worked fine because we use up to 2 DAIs in a SDW link. Convert the topology pin index to ALH dai index, the mapping is using 2-off indexing, iow, pin #2 is ALH dai #0. The issue exists since beginning. And the Fixes tag is the first commit that this commit can be applied. Fixes: b66bfc3 ("ASoC: SOF: sof-audio: Fix broken early bclk feature for SSP") Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://patch.msgid.link/20241127092955.20026-1-yung-chuan.liao@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 2f20203 commit e9db1b5

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

sound/soc/sof/ipc3-topology.c

+24-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
/* size of tplg ABI in bytes */
2121
#define SOF_IPC3_TPLG_ABI_SIZE 3
2222

23+
/* Base of SOF_DAI_INTEL_ALH, this should be aligned with SOC_SDW_INTEL_BIDIR_PDI_BASE */
24+
#define INTEL_ALH_DAI_INDEX_BASE 2
25+
2326
struct sof_widget_data {
2427
int ctrl_type;
2528
int ipc_cmd;
@@ -1594,6 +1597,17 @@ static int sof_ipc3_widget_setup_comp_dai(struct snd_sof_widget *swidget)
15941597
if (ret < 0)
15951598
goto free;
15961599

1600+
/* Subtract the base to match the FW dai index. */
1601+
if (comp_dai->type == SOF_DAI_INTEL_ALH) {
1602+
if (comp_dai->dai_index < INTEL_ALH_DAI_INDEX_BASE) {
1603+
dev_err(sdev->dev,
1604+
"Invalid ALH dai index %d, only Pin numbers >= %d can be used\n",
1605+
comp_dai->dai_index, INTEL_ALH_DAI_INDEX_BASE);
1606+
return -EINVAL;
1607+
}
1608+
comp_dai->dai_index -= INTEL_ALH_DAI_INDEX_BASE;
1609+
}
1610+
15971611
dev_dbg(scomp->dev, "dai %s: type %d index %d\n",
15981612
swidget->widget->name, comp_dai->type, comp_dai->dai_index);
15991613
sof_dbg_comp_config(scomp, &comp_dai->config);
@@ -2167,8 +2181,16 @@ static int sof_ipc3_dai_config(struct snd_sof_dev *sdev, struct snd_sof_widget *
21672181
case SOF_DAI_INTEL_ALH:
21682182
if (data) {
21692183
/* save the dai_index during hw_params and reuse it for hw_free */
2170-
if (flags & SOF_DAI_CONFIG_FLAGS_HW_PARAMS)
2171-
config->dai_index = data->dai_index;
2184+
if (flags & SOF_DAI_CONFIG_FLAGS_HW_PARAMS) {
2185+
/* Subtract the base to match the FW dai index. */
2186+
if (data->dai_index < INTEL_ALH_DAI_INDEX_BASE) {
2187+
dev_err(sdev->dev,
2188+
"Invalid ALH dai index %d, only Pin numbers >= %d can be used\n",
2189+
config->dai_index, INTEL_ALH_DAI_INDEX_BASE);
2190+
return -EINVAL;
2191+
}
2192+
config->dai_index = data->dai_index - INTEL_ALH_DAI_INDEX_BASE;
2193+
}
21722194
config->alh.stream_id = data->dai_data;
21732195
}
21742196
break;

0 commit comments

Comments
 (0)