mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
ASoC: SOF: core: Add probe_early and remove_late callbacks
The existing DSP probe may be handled in a workqueue to allow for extra time, typically for the i915 request_module and HDAudio codec handling. With the upcoming changes for i915/Xe driver relying on the -EPROBE_DEFER mechanism, we need to have a first pass of the probe which cannot be pushed to a workqueue. Introduce 2 new optional callbacks. probe_early is called before the workqueue runs. remove_late may be called from the workqueue if load is unsuccesful, but will otherwise be called on module unload. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Acked-by: Mark Brown <broonie@kernel.org> Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://lore.kernel.org/r/20231009115437.99976-3-maarten.lankhorst@linux.intel.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
f549a82aff
commit
17baaa1f95
3 changed files with 29 additions and 0 deletions
|
@ -327,6 +327,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
|
|||
dsp_err:
|
||||
snd_sof_remove(sdev);
|
||||
probe_err:
|
||||
snd_sof_remove_late(sdev);
|
||||
sof_ops_free(sdev);
|
||||
|
||||
/* all resources freed, update state to match */
|
||||
|
@ -436,6 +437,14 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data)
|
|||
|
||||
sof_set_fw_state(sdev, SOF_FW_BOOT_NOT_STARTED);
|
||||
|
||||
/*
|
||||
* first pass of probe which isn't allowed to run in a work-queue,
|
||||
* typically to rely on -EPROBE_DEFER dependencies
|
||||
*/
|
||||
ret = snd_sof_probe_early(sdev);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)) {
|
||||
INIT_WORK(&sdev->probe_work, sof_probe_work);
|
||||
schedule_work(&sdev->probe_work);
|
||||
|
@ -487,9 +496,11 @@ int snd_sof_device_remove(struct device *dev)
|
|||
snd_sof_ipc_free(sdev);
|
||||
snd_sof_free_debug(sdev);
|
||||
snd_sof_remove(sdev);
|
||||
snd_sof_remove_late(sdev);
|
||||
sof_ops_free(sdev);
|
||||
} else if (aborted) {
|
||||
/* probe_work never ran */
|
||||
snd_sof_remove_late(sdev);
|
||||
sof_ops_free(sdev);
|
||||
}
|
||||
|
||||
|
|
|
@ -38,6 +38,14 @@ static inline void sof_ops_free(struct snd_sof_dev *sdev)
|
|||
/* Mandatory operations are verified during probing */
|
||||
|
||||
/* init */
|
||||
static inline int snd_sof_probe_early(struct snd_sof_dev *sdev)
|
||||
{
|
||||
if (sof_ops(sdev)->probe_early)
|
||||
return sof_ops(sdev)->probe_early(sdev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int snd_sof_probe(struct snd_sof_dev *sdev)
|
||||
{
|
||||
return sof_ops(sdev)->probe(sdev);
|
||||
|
@ -51,6 +59,14 @@ static inline int snd_sof_remove(struct snd_sof_dev *sdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static inline int snd_sof_remove_late(struct snd_sof_dev *sdev)
|
||||
{
|
||||
if (sof_ops(sdev)->remove_late)
|
||||
return sof_ops(sdev)->remove_late(sdev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int snd_sof_shutdown(struct snd_sof_dev *sdev)
|
||||
{
|
||||
if (sof_ops(sdev)->shutdown)
|
||||
|
|
|
@ -165,8 +165,10 @@ struct sof_firmware {
|
|||
struct snd_sof_dsp_ops {
|
||||
|
||||
/* probe/remove/shutdown */
|
||||
int (*probe_early)(struct snd_sof_dev *sof_dev); /* optional */
|
||||
int (*probe)(struct snd_sof_dev *sof_dev); /* mandatory */
|
||||
int (*remove)(struct snd_sof_dev *sof_dev); /* optional */
|
||||
int (*remove_late)(struct snd_sof_dev *sof_dev); /* optional */
|
||||
int (*shutdown)(struct snd_sof_dev *sof_dev); /* optional */
|
||||
|
||||
/* DSP core boot / reset */
|
||||
|
|
Loading…
Reference in a new issue