Unverified Commit 524ee559 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: Only check SSP MCLK mask in case of IPC3 



IPC4 is using the NHLT blob itself and sends the SSP blob from it directly
to the firmware, there is no need for the MCLK quirk based on the SSP blob
since the SSP blob is in use.

At the same time reword the error, info and debug messages for clarity.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarBalamurugan C <balamurugan.c@intel.com>
Link: https://patch.msgid.link/20251215130819.31218-1-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a1bcb662

sound/soc/sof/intel/hda.c

+22 −14
Original line number Diff line number Diff line
@@ -1611,7 +1611,6 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev) 
		    mach->mach_params.i2s_link_mask) {

			const struct sof_intel_dsp_desc *chip = get_chip_info(sdev->pdata);

			int ssp_num;

			int mclk_mask;



			if (hweight_long(mach->mach_params.i2s_link_mask) > 1 &&

			    !(mach->tplg_quirk_mask & SND_SOC_ACPI_TPLG_INTEL_SSP_MSB))
@@ -1636,19 +1635,28 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev) 


			sof_pdata->tplg_filename = tplg_filename;



			mclk_mask = check_nhlt_ssp_mclk_mask(sdev, ssp_num);

			if (sof_pdata->ipc_type == SOF_IPC_TYPE_3) {

				int mclk_mask = check_nhlt_ssp_mclk_mask(sdev,

									 ssp_num);



				if (mclk_mask < 0) {

				dev_err(sdev->dev, "Invalid MCLK configuration\n");

					dev_err(sdev->dev,

						"Invalid MCLK configuration for SSP%d\n",

						ssp_num);

					return NULL;

				}



			dev_dbg(sdev->dev, "MCLK mask %#x found in NHLT\n", mclk_mask);



				if (mclk_mask) {

				dev_info(sdev->dev, "Overriding topology with MCLK mask %#x from NHLT\n", mclk_mask);

					sdev->mclk_id_override = true;

					sdev->mclk_id_quirk = (mclk_mask & BIT(0)) ? 0 : 1;

					dev_info(sdev->dev,

						 "SSP%d to use MCLK id %d (mask: %#x)\n",

						 ssp_num, sdev->mclk_id_quirk, mclk_mask);

				} else {

					dev_dbg(sdev->dev,

						"MCLK mask is empty for SSP%d in NHLT\n",

						ssp_num);

				}

			}

		}