Re: [PATCH v6 11/12] ASoC: SOF: Intel: Move binding to display driver outside of deferred probe

[Maarten Lankhorst]

On 2023-10-05 12:58, Péter Ujfalusi wrote:
> On 04/10/2023 19:59, Kai Vehmanen wrote:
> > Hi,
> >
> > I'm good with rest of the series, but one patch requires work.
> >
> > On Wed, 4 Oct 2023, Maarten Lankhorst wrote:
> >
> > > Now that we can use -EPROBE_DEFER, it's no longer required to spin off
> > > the snd_hdac_i915_init into a workqueue.
> > >
> > > Use the -EPROBE_DEFER mechanism instead, which must be returned in the
> > > probe function.
> > >
> > > The previously added probe_early can be used for this,
> > > and we also use the newly added remove_late for unbinding afterwards.
> > [...]
> > > --- a/sound/soc/sof/intel/hda-common-ops.c
> > > +++ b/sound/soc/sof/intel/hda-common-ops.c
> > > @@ -19,6 +19,7 @@ struct snd_sof_dsp_ops sof_hda_common_ops = {
> > >   	.probe_early	= hda_dsp_probe_early,
> > >   	.probe		= hda_dsp_probe,
> > >   	.remove		= hda_dsp_remove,
> > > +	.remove_late	= hda_dsp_remove_late,
> > >   
> > >   	/* Register IO uses direct mmio */
> > >   
> > > diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
> > > index 86a2571488bc..4eb7f04b8ae1 100644
> > > --- a/sound/soc/sof/intel/hda.c
> > > +++ b/sound/soc/sof/intel/hda.c
> > > @@ -1160,6 +1160,7 @@ int hda_dsp_probe_early(struct snd_sof_dev *sdev)
> > >   		return -ENOMEM;
> > >   	sdev->pdata->hw_pdata = hdev;
> > >   	hdev->desc = chip;
> > > +	ret = hda_init(sdev);
> > >   
> > >   err:
> > >   	return ret;
> >
> > I don't think this works. The hda_codec_i915_init() errors are ignored in
> > hda_init() so this never returns -EPROBE_DEFER.
> >
> > So something like this is needed on top (tested quickly on one SOF
> > machine and this blocks SOF load until i915 or xe driver is loaded):
> >
> > --cut--
> > diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
> > index 9025bfaf6a7e..8b17c82dcc89 100644
> > --- a/sound/soc/sof/intel/hda.c
> > +++ b/sound/soc/sof/intel/hda.c
> > @@ -863,13 +863,20 @@ static int hda_init(struct snd_sof_dev *sdev)
> >          /* init i915 and HDMI codecs */
> >          ret = hda_codec_i915_init(sdev);
> >          if (ret < 0)
> > -               dev_warn(sdev->dev, "init of i915 and HDMI codec
> > failed\n");
> > +               dev_warn(sdev->dev, "init of i915 and HDMI codec failed
> > (%d)\n", ret);
>
> we should not print anything or maximum dev_dbg in case of EPROBE_DEFER.
There's dev_err_probe, which is dev_err on error, or sets the reason for 
deferred probe to the arguments if the error is -EPROBE_DEFER.

~Maarten