Re: [PATCH v2 0/9] sound: Use -EPROBE_DEFER instead of i915 module loading.
On Wed, 19 Jul 2023 18:41:32 +0200, Maarten Lankhorst wrote:
Explicitly loading i915 becomes a problem when upstreaming the new intel driver for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for driver load of xe, and will fail completely before it loads.
-EPROBE_DEFER has to be returned before any device is created in probe(), otherwise the removal of the device will cause EPROBE_DEFER to try again in an infinite loop.
The conversion is done in gradual steps. First I add an argument to snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver separately. Then I convert each driver to move snd_hdac_i915_init out of the workqueue. Finally I drop the ability to choose modprobe behavior after the last user is converted.
I suspect the avs and skylake drivers used snd_hdac_i915_init purely for the modprobe, but I don't have the hardware to test if it can be safely removed. It can still be done easily in a followup patch to simplify probing.
New since first version:
- snd_hda_core.gpu_bind is added as a mechanism to force gpu binding, for testing. snd_hda_core.gpu_bind=0 forces waiting for GPU bind to off, snd_hda_core.gpu_bind=1 forces waiting for gpu bind. Default setting depends on whether kernel booted with nomodeset.
- Incorporated all feedback review.
Maarten, are you working on v3 patch set? Or, for moving forward, should we merge v2 now and fix the rest based on that later?
thanks,
Takashi
Hey,
Den 2023-07-31 kl. 17:51, skrev Takashi Iwai:
On Wed, 19 Jul 2023 18:41:32 +0200, Maarten Lankhorst wrote:
Explicitly loading i915 becomes a problem when upstreaming the new intel driver for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for driver load of xe, and will fail completely before it loads.
-EPROBE_DEFER has to be returned before any device is created in probe(), otherwise the removal of the device will cause EPROBE_DEFER to try again in an infinite loop.
The conversion is done in gradual steps. First I add an argument to snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver separately. Then I convert each driver to move snd_hdac_i915_init out of the workqueue. Finally I drop the ability to choose modprobe behavior after the last user is converted.
I suspect the avs and skylake drivers used snd_hdac_i915_init purely for the modprobe, but I don't have the hardware to test if it can be safely removed. It can still be done easily in a followup patch to simplify probing.
New since first version:
- snd_hda_core.gpu_bind is added as a mechanism to force gpu binding, for testing. snd_hda_core.gpu_bind=0 forces waiting for GPU bind to off, snd_hda_core.gpu_bind=1 forces waiting for gpu bind. Default setting depends on whether kernel booted with nomodeset.
- Incorporated all feedback review.
Maarten, are you working on v3 patch set? Or, for moving forward, should we merge v2 now and fix the rest based on that later?
I've been working on a small change to keep the workqueue in SOF and only move the binding to the probe function to match what snd-hda-intel is doing, but I don't know if that is needed?
It was a bit unclear to me based on feedback if I should try to kill the workqueue on all drivers (but with no way to test), or keep it around.
Cheers,
~Maarten
On Mon, 31 Jul 2023 18:37:36 +0200, Maarten Lankhorst wrote:
Hey,
Den 2023-07-31 kl. 17:51, skrev Takashi Iwai:
On Wed, 19 Jul 2023 18:41:32 +0200, Maarten Lankhorst wrote:
Explicitly loading i915 becomes a problem when upstreaming the new intel driver for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for driver load of xe, and will fail completely before it loads.
-EPROBE_DEFER has to be returned before any device is created in probe(), otherwise the removal of the device will cause EPROBE_DEFER to try again in an infinite loop.
The conversion is done in gradual steps. First I add an argument to snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver separately. Then I convert each driver to move snd_hdac_i915_init out of the workqueue. Finally I drop the ability to choose modprobe behavior after the last user is converted.
I suspect the avs and skylake drivers used snd_hdac_i915_init purely for the modprobe, but I don't have the hardware to test if it can be safely removed. It can still be done easily in a followup patch to simplify probing.
New since first version:
- snd_hda_core.gpu_bind is added as a mechanism to force gpu binding, for testing. snd_hda_core.gpu_bind=0 forces waiting for GPU bind to off, snd_hda_core.gpu_bind=1 forces waiting for gpu bind. Default setting depends on whether kernel booted with nomodeset.
- Incorporated all feedback review.
Maarten, are you working on v3 patch set? Or, for moving forward, should we merge v2 now and fix the rest based on that later?
I've been working on a small change to keep the workqueue in SOF and only move the binding to the probe function to match what snd-hda-intel is doing, but I don't know if that is needed?
It was a bit unclear to me based on feedback if I should try to kill the workqueue on all drivers (but with no way to test), or keep it around.
I guess it's still safer to keep the workqueue in many drivers. There can be modprobe or firmware loading at any later stage. We can get rid of the workqueue once after confirming that it's really safe, too.
So, if you can work on the patch set in that regard, it's fine, I can wait for it.
thanks,
Takashi
Hey,
Den 2023-07-31 kl. 21:32, skrev Takashi Iwai:
On Mon, 31 Jul 2023 18:37:36 +0200, Maarten Lankhorst wrote:
Hey,
Den 2023-07-31 kl. 17:51, skrev Takashi Iwai:
On Wed, 19 Jul 2023 18:41:32 +0200, Maarten Lankhorst wrote:
Explicitly loading i915 becomes a problem when upstreaming the new intel driver for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for driver load of xe, and will fail completely before it loads.
-EPROBE_DEFER has to be returned before any device is created in probe(), otherwise the removal of the device will cause EPROBE_DEFER to try again in an infinite loop.
The conversion is done in gradual steps. First I add an argument to snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver separately. Then I convert each driver to move snd_hdac_i915_init out of the workqueue. Finally I drop the ability to choose modprobe behavior after the last user is converted.
I suspect the avs and skylake drivers used snd_hdac_i915_init purely for the modprobe, but I don't have the hardware to test if it can be safely removed. It can still be done easily in a followup patch to simplify probing.
New since first version:
- snd_hda_core.gpu_bind is added as a mechanism to force gpu binding, for testing. snd_hda_core.gpu_bind=0 forces waiting for GPU bind to off, snd_hda_core.gpu_bind=1 forces waiting for gpu bind. Default setting depends on whether kernel booted with nomodeset.
- Incorporated all feedback review.
Maarten, are you working on v3 patch set? Or, for moving forward, should we merge v2 now and fix the rest based on that later?
I've been working on a small change to keep the workqueue in SOF and only move the binding to the probe function to match what snd-hda-intel is doing, but I don't know if that is needed?
It was a bit unclear to me based on feedback if I should try to kill the workqueue on all drivers (but with no way to test), or keep it around.
I guess it's still safer to keep the workqueue in many drivers. There can be modprobe or firmware loading at any later stage. We can get rid of the workqueue once after confirming that it's really safe, too.
So, if you can work on the patch set in that regard, it's fine, I can wait for it.
I've finished that patch, but it caused regressions (oops) while rebooting. I think it's safer to kill the workqueue for SOC, and then convert all other drivers later.
Cheers,
~Maarten
I've been working on a small change to keep the workqueue in SOF and only move the binding to the probe function to match what snd-hda-intel is doing, but I don't know if that is needed?
It was a bit unclear to me based on feedback if I should try to kill the workqueue on all drivers (but with no way to test), or keep it around.
My understanding is that we only want to move the binding to the probe function and leave the workqueue removal for another day - possibly never.
Hey,
On 2023-08-01 18:32, Pierre-Louis Bossart wrote:
I've been working on a small change to keep the workqueue in SOF and only move the binding to the probe function to match what snd-hda-intel is doing, but I don't know if that is needed?
It was a bit unclear to me based on feedback if I should try to kill the workqueue on all drivers (but with no way to test), or keep it around.
My understanding is that we only want to move the binding to the probe function and leave the workqueue removal for another day - possibly never.
Patch 8/9 removed the workqueue, but can be replaced by the patch below, that simply moves out snd_sof_probe().
I've attempted this before, but didn't have snd_sof_remove in snd_sof_device_remove, which is why I would get a OOPS when attempting to do a shutdown/reboot.
With that I hopefully addressed the last concern.
Cheers, Maarten
This mail can be applied with git am -c. ------8<--------- 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.
Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com --- sound/soc/sof/core.c | 19 +++++++------------ sound/soc/sof/intel/hda-codec.c | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 30db685cc5f4b..cd4d06d1800b1 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -188,13 +188,6 @@ static int sof_probe_continue(struct snd_sof_dev *sdev) struct snd_sof_pdata *plat_data = sdev->pdata; int ret;
- /* probe the DSP hardware */ - ret = snd_sof_probe(sdev); - if (ret < 0) { - dev_err(sdev->dev, "error: failed to probe DSP %d\n", ret); - goto probe_err; - } - sof_set_fw_state(sdev, SOF_FW_BOOT_PREPARE);
/* check machine info */ @@ -325,10 +318,6 @@ static int sof_probe_continue(struct snd_sof_dev *sdev) dbg_err: snd_sof_free_debug(sdev); dsp_err: - snd_sof_remove(sdev); -probe_err: - sof_ops_free(sdev); - /* all resources freed, update state to match */ sof_set_fw_state(sdev, SOF_FW_BOOT_NOT_STARTED); sdev->first_boot = true; @@ -436,6 +425,12 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data)
sof_set_fw_state(sdev, SOF_FW_BOOT_NOT_STARTED);
+ ret = snd_sof_probe(sdev); + if (ret) { + dev_err_probe(sdev->dev, ret, "failed to probe DSP\n"); + 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); @@ -485,9 +480,9 @@ 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(sdev); sof_ops_free(sdev);
/* release firmware */ diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index f1fd5b44aaac9..344b61576c0e3 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -415,7 +415,7 @@ int hda_codec_i915_init(struct snd_sof_dev *sdev) return 0;
/* i915 exposes a HDA codec for HDMI audio */ - ret = snd_hdac_i915_init(bus, true); + ret = snd_hdac_i915_init(bus, false); if (ret < 0) return ret;
participants (3)
-
Maarten Lankhorst -
Pierre-Louis Bossart -
Takashi Iwai