Unverified Commit fd1c769d authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: remove warning on ABI checks 



We should only have an error when enforcing strict mapping between
kernel and firmware versions. In all other cases, there is no reason
to throw a warning.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220708200719.26961-1-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/ipc3-topology.c

+4 −9
Original line number Diff line number Diff line
@@ -2348,16 +2348,11 @@ static int sof_ipc3_parse_manifest(struct snd_soc_component *scomp, int index, 
		return -EINVAL;

	}



	if (SOF_ABI_VERSION_MINOR(abi_version) > SOF_ABI_MINOR) {

		if (!IS_ENABLED(CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS)) {

			dev_warn(scomp->dev, "%s: Topology ABI is more recent than kernel\n",

				 __func__);

		} else {

			dev_err(scomp->dev, "%s: Topology ABI is more recent than kernel\n",

				__func__);

	if (IS_ENABLED(CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS) &&

	    SOF_ABI_VERSION_MINOR(abi_version) > SOF_ABI_MINOR) {

		dev_err(scomp->dev, "%s: Topology ABI is more recent than kernel\n", __func__);

		return -EINVAL;

	}

	}



	return 0;

}

sound/soc/sof/ipc3.c

+4 −7
Original line number Diff line number Diff line
@@ -758,14 +758,11 @@ int sof_ipc3_validate_fw_version(struct snd_sof_dev *sdev) 
		return -EINVAL;

	}



	if (SOF_ABI_VERSION_MINOR(v->abi_version) > SOF_ABI_MINOR) {

		if (!IS_ENABLED(CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS)) {

			dev_warn(sdev->dev, "FW ABI is more recent than kernel\n");

		} else {

	if (IS_ENABLED(CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS) &&

	    SOF_ABI_VERSION_MINOR(v->abi_version) > SOF_ABI_MINOR) {

		dev_err(sdev->dev, "FW ABI is more recent than kernel\n");

		return -EINVAL;

	}

	}



	if (ready->flags & SOF_IPC_INFO_BUILD) {

		dev_info(sdev->dev,