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

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.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9a06508b
...@@ -466,7 +466,8 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data) ...@@ -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 || 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)->block_read || !sof_ops(sdev)->block_write ||
!sof_ops(sdev)->send_msg || !sof_ops(sdev)->load_firmware || !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; return -EINVAL;
INIT_LIST_HEAD(&sdev->pcm_list); INIT_LIST_HEAD(&sdev->pcm_list);
......
...@@ -792,12 +792,6 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev) ...@@ -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 *ipc;
struct snd_sof_ipc_msg *msg; 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); ipc = devm_kzalloc(sdev->dev, sizeof(*ipc), GFP_KERNEL);
if (!ipc) if (!ipc)
return NULL; return NULL;
......
...@@ -133,7 +133,7 @@ struct snd_sof_dsp_ops { ...@@ -133,7 +133,7 @@ struct snd_sof_dsp_ops {
* FW ready checks for ABI compatibility and creates * FW ready checks for ABI compatibility and creates
* memory windows at first boot * 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 */ /* connect pcm substream to a host stream */
int (*pcm_open)(struct snd_sof_dev *sdev, int (*pcm_open)(struct snd_sof_dev *sdev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment