ASoC: SOF: Intel: hda: Only check SSP MCLK mask in case of IPC3
Subsystems (3)
Peter Ujfalusi
maintainerPATCH 1/1 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.
--- sound/soc/sof/intel/hda.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
sound/soc/sof/intel/hda.c +22 -14
@@ -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 (mclk_mask <0 ) { -dev_err (sdev->dev,"Invalid MCLK configuration\n" ); -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 ; +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 for SSP%d\n" , + ssp_num); +return NULL ; + } + +if (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); + } } }
Signature · 1 line
2.52.0
Mark Brown
maintainerQuoted 8 lines · Peter Ujfalusi
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.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SOF: Intel: hda: Only check SSP MCLK mask in case of IPC3
commit: 524ee559948d8d079b13466e70fa741f909699c0
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark