ASoC: SOF: ipc4-topology: Always validate the audio format on fmt init

Even if there is a single format supported by the module on it's input or
output, it must be validated that it is matching with the reference
parameters.

The DAI copier's DAI side reference is adjusted to the formats it supports,
but modules deep within the path might have incorrect configuration in
topology (single format which is not matching with the previous module's
output for example). This should be reported as errors and not silently
accepted.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

Author: ujfalusi

sound/soc/sof/ipc4-topology.c

@@ -1384,34 +1384,6 @@ static int sof_ipc4_update_hw_params(struct snd_sof_dev *sdev, struct snd_pcm_hw
 	return 0;
 }
 
-static bool sof_ipc4_is_single_format(struct snd_sof_dev *sdev,
-				      struct sof_ipc4_pin_format *pin_fmts, u32 pin_fmts_size)
-{
-	struct sof_ipc4_audio_format *fmt;
-	u32 rate, channels, valid_bits;
-	int i;
-
-	fmt = &pin_fmts[0].audio_fmt;
-	rate = fmt->sampling_frequency;
-	channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(fmt->fmt_cfg);
-	valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(fmt->fmt_cfg);
-
-	/* check if all output formats in topology are the same */
-	for (i = 1; i < pin_fmts_size; i++) {
-		u32 _rate, _channels, _valid_bits;
-
-		fmt = &pin_fmts[i].audio_fmt;
-		_rate = fmt->sampling_frequency;
-		_channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(fmt->fmt_cfg);
-		_valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(fmt->fmt_cfg);
-
-		if (_rate != rate || _channels != channels || _valid_bits != valid_bits)
-			return false;
-	}
-
-	return true;
-}
-
 static int sof_ipc4_init_output_audio_fmt(struct snd_sof_dev *sdev,
 					  struct snd_sof_widget *swidget,
 					  struct sof_ipc4_base_module_cfg *base_config,
@@ -1421,7 +1393,6 @@ static int sof_ipc4_init_output_audio_fmt(struct snd_sof_dev *sdev,
 {
 	struct sof_ipc4_pin_format *pin_fmts = available_fmt->output_pin_fmts;
 	u32 pin_fmts_size = available_fmt->num_output_formats;
-	bool single_format;
 	int i = 0;
 
 	if (!pin_fmts_size) {
@@ -1430,16 +1401,6 @@ static int sof_ipc4_init_output_audio_fmt(struct snd_sof_dev *sdev,
 		return -EINVAL;
 	}
 
-	single_format = sof_ipc4_is_single_format(sdev, pin_fmts, pin_fmts_size);
-
-	/* pick the first format if there's only one available or if all formats are the same */
-	if (single_format)
-		goto out_fmt;
-
-	/*
-	 * if there are multiple output formats, then choose the output format that matches
-	 * the reference params
-	 */
 	for (i = 0; i < pin_fmts_size; i++) {
 		struct sof_ipc4_audio_format *fmt = &pin_fmts[i].audio_fmt;
 
@@ -1491,7 +1452,6 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev,
 	u32 valid_bits;
 	u32 channels;
 	u32 rate;
-	bool single_format;
 	int sample_valid_bits;
 	int i = 0;
 
@@ -1500,10 +1460,6 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev,
 		return -EINVAL;
 	}
 
-	single_format = sof_ipc4_is_single_format(sdev, pin_fmts, pin_fmts_size);
-	if (single_format)
-		goto in_fmt;
-
 	sample_valid_bits = sof_ipc4_get_valid_bits(sdev, params);
 	if (sample_valid_bits < 0)
 		return sample_valid_bits;
@@ -1523,14 +1479,13 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev,
 		valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(fmt->fmt_cfg);
 		if (params_rate(params) == rate && params_channels(params) == channels &&
 		    sample_valid_bits == valid_bits)
-			break;
+			goto in_fmt;
 	}
 
-	if (i == pin_fmts_size) {
-		dev_err(sdev->dev, "%s: Unsupported audio format: %uHz, %ubit, %u channels\n",
-			__func__, params_rate(params), sample_valid_bits, params_channels(params));
-		return -EINVAL;
-	}
+	dev_err(sdev->dev, "%s: Unsupported audio format: %uHz, %ubit, %u channels\n",
+		__func__, params_rate(params), sample_valid_bits, params_channels(params));
+
+	return -EINVAL;
 
 in_fmt:
 	/* copy input format */