Unverified Commit 8692d498 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: core: check for mandatory fw_ready op during SOF probe 



fw_ready should be a mandatory op. Make sure fw_ready ops is set
during probe.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190927200538.660-8-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/core.c

+2 −1
Original line number Diff line number Diff line
@@ -466,7 +466,8 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data) 
	if (!sof_ops(sdev) || !sof_ops(sdev)->probe || !sof_ops(sdev)->run ||

	    !sof_ops(sdev)->block_read || !sof_ops(sdev)->block_write ||

	    !sof_ops(sdev)->send_msg || !sof_ops(sdev)->load_firmware ||

	    !sof_ops(sdev)->ipc_msg_data || !sof_ops(sdev)->ipc_pcm_params)

	    !sof_ops(sdev)->ipc_msg_data || !sof_ops(sdev)->ipc_pcm_params ||

	    !sof_ops(sdev)->fw_ready)

		return -EINVAL;



	INIT_LIST_HEAD(&sdev->pcm_list);

sound/soc/sof/ipc.c

+0 −6
Original line number Diff line number Diff line
@@ -792,12 +792,6 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev) 
	struct snd_sof_ipc *ipc;

	struct snd_sof_ipc_msg *msg;



	/* check if mandatory ops required for ipc are defined */

	if (!sof_ops(sdev)->fw_ready) {

		dev_err(sdev->dev, "error: ipc mandatory ops not defined\n");

		return NULL;

	}



	ipc = devm_kzalloc(sdev->dev, sizeof(*ipc), GFP_KERNEL);

	if (!ipc)

		return NULL;

sound/soc/sof/sof-priv.h

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ struct snd_sof_dsp_ops { 
	 * FW ready checks for ABI compatibility and creates

	 * memory windows at first boot

	 */

	int (*fw_ready)(struct snd_sof_dev *sdev, u32 msg_id); /* optional */

	int (*fw_ready)(struct snd_sof_dev *sdev, u32 msg_id); /* mandatory */



	/* connect pcm substream to a host stream */

	int (*pcm_open)(struct snd_sof_dev *sdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE