On 19/07/2023 19:41, Maarten Lankhorst wrote:

Selecting CONFIG_DRM selects CONFIG_VIDEO_NOMODESET, which exports video_firmware_drivers_only(). This can be used as a first approximation on whether i915 will be available. It's safe to use as this is only built when CONFIG_SND_HDA_I915 is selected by CONFIG_I915.

It's not completely fool proof, as you can boot with "nomodeset i915.modeset=1" to make i915 load regardless, or use "i915.force_probe=!*" to never load i915, but the common case of booting with nomodeset to disable all GPU drivers this will work as intended.

Because of this, we add an extra module parameter, snd_hda_core.gpu_bind that can be used to signal users intent. -1 follows nomodeset, 0 disables binding, 1 forces wait/-EPROBE_DEFER on binding.

Reviewed-by: Peter Ujfalusi peter.ujfalusi@linux.intel.com

Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com

sound/hda/hdac_i915.c | 10 ++++++++++ 1 file changed, 10 insertions(+)

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 161a9711cd63e..c32709fa4115f 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -11,6 +11,13 @@ #include <sound/hda_i915.h> #include <sound/hda_register.h>

+#include <video/nomodeset.h>

+static int gpu_bind = -1; +module_param(gpu_bind, int, 0644); +MODULE_PARM_DESC(gpu_bind, "Whether to bind sound component to GPU "

• 	   "(1=always, 0=never, -1=on nomodeset(default))");
  

#define IS_HSW_CONTROLLER(pci) (((pci)->device == 0x0a0c) || \ ((pci)->device == 0x0c0c) || \ ((pci)->device == 0x0d0c) || \ @@ -121,6 +128,9 @@ static int i915_gfx_present(struct pci_dev *hdac_pci) { struct pci_dev *display_dev = NULL;

• if (!gpu_bind || (gpu_bind < 0 && video_firmware_drivers_only()))

• return false;
  

• for_each_pci_dev(display_dev) { if (display_dev->vendor == PCI_VENDOR_ID_INTEL && (display_dev->class >> 16) == PCI_BASE_CLASS_DISPLAY &&

Hey,

On 2023-07-24 12:25, Pierre-Louis Bossart wrote:

On 7/21/23 14:19, Péter Ujfalusi wrote:

...

On 19/07/2023 19:41, Maarten Lankhorst wrote:

...

Selecting CONFIG_DRM selects CONFIG_VIDEO_NOMODESET, which exports video_firmware_drivers_only(). This can be used as a first approximation on whether i915 will be available. It's safe to use as this is only built when CONFIG_SND_HDA_I915 is selected by CONFIG_I915.

It's not completely fool proof, as you can boot with "nomodeset i915.modeset=1" to make i915 load regardless, or use "i915.force_probe=!*" to never load i915, but the common case of booting with nomodeset to disable all GPU drivers this will work as intended.

Because of this, we add an extra module parameter, snd_hda_core.gpu_bind that can be used to signal users intent. -1 follows nomodeset, 0 disables binding, 1 forces wait/-EPROBE_DEFER on binding.

Reviewed-by: Peter Ujfalusi peter.ujfalusi@linux.intel.com

...

Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com

sound/hda/hdac_i915.c | 10 ++++++++++ 1 file changed, 10 insertions(+)

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 161a9711cd63e..c32709fa4115f 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -11,6 +11,13 @@ #include <sound/hda_i915.h> #include <sound/hda_register.h>

+#include <video/nomodeset.h>

+static int gpu_bind = -1; +module_param(gpu_bind, int, 0644); +MODULE_PARM_DESC(gpu_bind, "Whether to bind sound component to GPU "

• 	   "(1=always, 0=never, -1=on nomodeset(default))");
  

• #define IS_HSW_CONTROLLER(pci) (((pci)->device == 0x0a0c) || \ ((pci)->device == 0x0c0c) || \ ((pci)->device == 0x0d0c) || \

@@ -121,6 +128,9 @@ static int i915_gfx_present(struct pci_dev *hdac_pci) { struct pci_dev *display_dev = NULL;

• if (!gpu_bind || (gpu_bind < 0 && video_firmware_drivers_only()))

• return false;
  

Bear with me since I am just going back to work mode but I can't figure out what the second part of the test does

bool video_firmware_drivers_only(void) { return video_nomodeset; } EXPORT_SYMBOL(video_firmware_drivers_only);

and video_nomodeset=1 by default, so why would we return false when gpu_bind = -1?

This seems to be a change of functionality, what am I missing?

video_nomodeset is 0 by default, only when nomodeset is given as argument is it set to 1. :-)

Cheers, ~Maarten

On Tue, 25 Jul 2023 13:52:32 +0200, Pierre-Louis Bossart wrote:

...

...

...

...

@@ -121,6 +128,9 @@ static int i915_gfx_present(struct pci_dev *hdac_pci)   {       struct pci_dev *display_dev = NULL;   +    if (!gpu_bind || (gpu_bind < 0 && video_firmware_drivers_only())) +        return false;

Bear with me since I am just going back to work mode but I can't figure out what the second part of the test does

bool video_firmware_drivers_only(void) {     return video_nomodeset; } EXPORT_SYMBOL(video_firmware_drivers_only);

and video_nomodeset=1 by default, so why would we return false when gpu_bind = -1?

This seems to be a change of functionality, what am I missing?

video_nomodeset is 0 by default, only when nomodeset is given as argument is it set to 1. :-)

I must be missing something on how the default is handled.

bool video_firmware_drivers_only(void) { return video_nomodeset; } EXPORT_SYMBOL(video_firmware_drivers_only);

static int __init disable_modeset(char *str) { video_nomodeset = true;

isn't default 'true' then?

disable_modeset() is called *only* when nomodeset boot option is given. Then it overrides the value to true.

Takashi

On 19/07/2023 19:41, Maarten Lankhorst wrote:

Xe is a new GPU driver that re-uses the display (and sound) code from i915. It's no longer possible to load i915, as the GPU can be driven by the xe driver instead.

The new behavior will return -EPROBE_DEFER, and wait for a compatible driver to be loaded instead of modprobing i915.

Converting all drivers at the same time is a lot of work, instead we will convert each user one by one.

Changes since v1:

• Use dev_err_probe to set a probe reason for debugfs' deferred_devices.

Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com

include/sound/hda_i915.h | 4 ++-- sound/hda/hdac_i915.c | 8 ++++---- sound/pci/hda/hda_intel.c | 2 +- sound/soc/intel/avs/core.c | 2 +- sound/soc/intel/skylake/skl.c | 2 +- sound/soc/sof/intel/hda-codec.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index c32709fa4115f..961fcd3397f40 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -155,7 +155,7 @@ static int i915_gfx_present(struct pci_dev *hdac_pci)

• Returns zero for success or a negative error code.

*/ -int snd_hdac_i915_init(struct hdac_bus *bus) +int snd_hdac_i915_init(struct hdac_bus *bus, bool allow_modprobe) { struct drm_audio_component *acomp; int err; @@ -171,7 +171,7 @@ int snd_hdac_i915_init(struct hdac_bus *bus) acomp = bus->audio_component; if (!acomp) return -ENODEV;

• if (!acomp->ops) {

• if (allow_modprobe && !acomp->ops) { if (!IS_ENABLED(CONFIG_MODULES) || !request_module("i915")) { /* 60s timeout */

@@ -180,9 +180,9 @@ int snd_hdac_i915_init(struct hdac_bus *bus) } } if (!acomp->ops) {

• dev_info(bus->dev, "couldn't bind with audio component\n");
  

• int err = allow_modprobe ? -ENODEV : -EPROBE_DEFER;
  

Add one blank line here.

snd_hdac_acomp_exit(bus);

• return -ENODEV;
  

• return dev_err_probe(bus->dev, err, "couldn't bind with audio component\n");
  

  } return 0;

}

On 19/07/2023 19:41, Maarten Lankhorst wrote:

Add missing pci_set_drv to NULL call on error.

Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com

sound/pci/hda/hda_intel.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index ef831770ca7da..0d2d6bc6c75ef 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2188,6 +2188,7 @@ static int azx_probe(struct pci_dev *pci, return 0;

out_free:

• pci_set_drvdata(pci, NULL);

The original patch added this: f4c482a4d0b3 ("ALSA: hda - Fix yet another race of vga_switcheroo registration")

but got removed later by: 20a24225d8f9 ("ALSA: PCI: Remove superfluous pci_set_drvdata(pci, NULL) at remove")

and partially added back (to azx_remove) by: e81478bbe7a1 ("ALSA: hda: fix general protection fault in azx_runtime_idle")

I guess, it should do not harm to add it back...

snd_card_free(card); return err; }

Reviewed-by: Peter Ujfalusi peter.ujfalusi@linux.intel.com

On 7/19/23 18:41, Maarten Lankhorst wrote:

xe is a new driver for intel GPU's that shares the sound related code with i915.

Don't allow it to be modprobed though; the module is not upstream yet and we should exclusively use the EPROBE_DEFER mechanism.

I can't figure out what this comment means.

how would the -EPROBE_DEFER mechanism help if the driver that will trigger a new probe is not upstream?

Not following at all what you intended to explain.

Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com

sound/hda/hdac_i915.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 961fcd3397f40..12c1f8d93499f 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -115,7 +115,8 @@ static int i915_component_master_match(struct device *dev, int subcomponent, hdac_pci = to_pci_dev(bus->dev); i915_pci = to_pci_dev(dev);

• if (!strcmp(dev->driver->name, "i915") &&

• if ((!strcmp(dev->driver->name, "i915") ||

•  !strcmp(dev->driver->name, "xe")) &&
  

  subcomponent == I915_COMPONENT_AUDIO && connectivity_check(i915_pci, hdac_pci)) return 1;

On 7/19/23 18:41, 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.

Changes since v1:

• Use dev_err_probe()
• Don't move probed_devs bitmap unnecessarily. (tiwai)
• Move snd_hdac_i915_init slightly upward, to ensure it's always initialised before vga-switcheroo is called.

Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com

sound/pci/hda/hda_intel.c | 59 ++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 11cf9907f039f..e3128d7d742e7 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2147,6 +2147,36 @@ static int azx_probe(struct pci_dev *pci,

pci_set_drvdata(pci, card);

+#ifdef CONFIG_SND_HDA_I915

• /* bind with i915 if needed */
• if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) {

• err = snd_hdac_i915_init(azx_bus(chip), false);
  

• if (err < 0) {
  

• 	/* if the controller is bound only with HDMI/DP
  

• 	 * (for HSW and BDW), we need to abort the probe;
  

• 	 * for other chips, still continue probing as other
  

• 	 * codecs can be on the same link.
  

• 	 */
  

• 	if (CONTROLLER_IN_GPU(pci)) {
  

• 		dev_err_probe(card->dev, err,
  

• 			     "HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
  

• 		goto out_free;
  

• 	} else {
  

• 		/* don't bother any longer */
  

• 		chip->driver_caps &= ~AZX_DCAPS_I915_COMPONENT;
  

• 	}
  

• }
  

• /* HSW/BDW controllers need this power */
  

• if (CONTROLLER_IN_GPU(pci))
  

• 	hda->need_i915_power = true;
  

• }

+#else

• if (CONTROLLER_IN_GPU(pci))

• dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");
  

+#endif

Is it intentional that the display_power() is left in the probe workqueue?

this piece of code follows the stuff above in the existing code?

/* Request display power well for the HDA controller or codec. For * Haswell/Broadwell, both the display HDA controller and codec need * this power. For other platforms, like Baytrail/Braswell, only the * display codec needs the power and it can be released after probe. */ display_power(chip, true);

• err = register_vga_switcheroo(chip); if (err < 0) { dev_err(card->dev, "Error registering vga_switcheroo client\n");

@@ -2174,11 +2204,6 @@ static int azx_probe(struct pci_dev *pci, } #endif /* CONFIG_SND_HDA_PATCH_LOADER */

-#ifndef CONFIG_SND_HDA_I915

• if (CONTROLLER_IN_GPU(pci))

• dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");
  

-#endif

• if (schedule_probe) schedule_delayed_work(&hda->probe_work, 0);

@@ -2275,30 +2300,6 @@ static int azx_probe_continue(struct azx *chip) to_hda_bus(bus)->bus_probing = 1; hda->probe_continued = 1;

• /* bind with i915 if needed */
• if (chip->driver_caps & AZX_DCAPS_I915_COMPONENT) {

• err = snd_hdac_i915_init(bus, true);
  

• if (err < 0) {
  

• 	/* if the controller is bound only with HDMI/DP
  

• 	 * (for HSW and BDW), we need to abort the probe;
  

• 	 * for other chips, still continue probing as other
  

• 	 * codecs can be on the same link.
  

• 	 */
  

• 	if (CONTROLLER_IN_GPU(pci)) {
  

• 		dev_err(chip->card->dev,
  

• 			"HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
  

• 		goto out_free;
  

• 	} else {
  

• 		/* don't bother any longer */
  

• 		chip->driver_caps &= ~AZX_DCAPS_I915_COMPONENT;
  

• 	}
  

• }
  

• /* HSW/BDW controllers need this power */
  

• if (CONTROLLER_IN_GPU(pci))
  

• 	hda->need_i915_power = true;
  

• }
• /* Request display power well for the HDA controller or codec. For
  • Haswell/Broadwell, both the display HDA controller and codec need
  • this power. For other platforms, like Baytrail/Braswell, only the

On 19/07/2023 19:41, Maarten Lankhorst wrote:

This was only used to allow modprobing i915, by converting to the -EPROBE_DEFER mechanism, it can be completely removed, and is in fact counterproductive since -EPROBE_DEFER otherwise won't be handled correctly.

Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com Acked-by: Matthew Auld matthew.auld@intel.com Acked-by: Mark Brown broonie@kernel.org

---

sound/soc/sof/Kconfig | 19 ----------------- sound/soc/sof/core.c | 38 ++------------------------------- sound/soc/sof/intel/Kconfig | 1 - sound/soc/sof/intel/hda-codec.c | 2 +- sound/soc/sof/intel/hda.c | 32 ++++++++++++++++----------- sound/soc/sof/sof-pci-dev.c | 3 +-- sound/soc/sof/sof-priv.h | 5 ----- 7 files changed, 23 insertions(+), 77 deletions(-)

diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig index 80361139a49ad..8ee39e5558062 100644 --- a/sound/soc/sof/Kconfig +++ b/sound/soc/sof/Kconfig @@ -82,17 +82,6 @@ config SND_SOC_SOF_DEVELOPER_SUPPORT

if SND_SOC_SOF_DEVELOPER_SUPPORT

-config SND_SOC_SOF_FORCE_PROBE_WORKQUEUE

• bool "SOF force probe workqueue"
• select SND_SOC_SOF_PROBE_WORK_QUEUE
• help

•  This option forces the use of a probe workqueue, which is only used
  

•  when HDaudio is enabled due to module dependencies. Forcing this
  

•  option is intended for debug only, but this should not add any
  

•  functional issues in nominal cases.
  

•  Say Y if you are involved in SOF development and need this option.
  

•  If not, select N.
  

config SND_SOC_SOF_NOCODEC tristate

@@ -271,14 +260,6 @@ config SND_SOC_SOF module dependencies but since the module or built-in type is decided at the top level it doesn't matter.

-config SND_SOC_SOF_PROBE_WORK_QUEUE

• bool
• help

•  This option is not user-selectable but automagically handled by
  

•  'select' statements at a higher level.
  

•  When selected, the probe is handled in two steps, for example to
  

•  avoid lockdeps if request_module is used in the probe.
  

# Supported IPC versions config SND_SOC_SOF_IPC3 bool diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 30db685cc5f4b..cdf86dc4a8a87 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -191,7 +191,8 @@ static int sof_probe_continue(struct snd_sof_dev *sdev) /* probe the DSP hardware */ ret = snd_sof_probe(sdev); if (ret < 0) {

• dev_err(sdev->dev, "error: failed to probe DSP %d\n", ret);
  

• if (ret != -EPROBE_DEFER)
  

• 	dev_err(sdev->dev, "error: failed to probe DSP %d\n", ret);
  

While at it, can you drop thee "error:" prefix from the print?

goto probe_err;

}

@@ -309,8 +310,6 @@ static int sof_probe_continue(struct snd_sof_dev *sdev) if (plat_data->sof_probe_complete) plat_data->sof_probe_complete(sdev->dev);

• sdev->probe_completed = true;
• return 0;

sof_machine_err: @@ -336,19 +335,6 @@ static int sof_probe_continue(struct snd_sof_dev *sdev) return ret; }

-static void sof_probe_work(struct work_struct *work) -{

• struct snd_sof_dev *sdev =

• container_of(work, struct snd_sof_dev, probe_work);
  

• int ret;
• ret = sof_probe_continue(sdev);
• if (ret < 0) {

• /* errors cannot be propagated, log */
  

• dev_err(sdev->dev, "error: %s failed err: %d\n", __func__, ret);
  

• }

-}

int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data) { struct snd_sof_dev *sdev; @@ -436,33 +422,16 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data)

sof_set_fw_state(sdev, SOF_FW_BOOT_NOT_STARTED);

• if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)) {

• INIT_WORK(&sdev->probe_work, sof_probe_work);
  

• schedule_work(&sdev->probe_work);
  

• return 0;
  

• }
• return sof_probe_continue(sdev);

} EXPORT_SYMBOL(snd_sof_device_probe);

-bool snd_sof_device_probe_completed(struct device *dev) -{

• struct snd_sof_dev *sdev = dev_get_drvdata(dev);
• return sdev->probe_completed;

-} -EXPORT_SYMBOL(snd_sof_device_probe_completed);

int snd_sof_device_remove(struct device *dev) { struct snd_sof_dev *sdev = dev_get_drvdata(dev); struct snd_sof_pdata *pdata = sdev->pdata; int ret;

• if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE))

• cancel_work_sync(&sdev->probe_work);
  

• /*
  • Unregister any registered client device first before IPC and debugfs
  • to allow client drivers to be removed cleanly

@@ -501,9 +470,6 @@ int snd_sof_device_shutdown(struct device *dev) { struct snd_sof_dev *sdev = dev_get_drvdata(dev);

• if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE))

• cancel_work_sync(&sdev->probe_work);
  

• if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) { sof_fw_trace_free(sdev); return snd_sof_shutdown(sdev);

diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index 69c1a370d3b61..d9e87a91670a3 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -293,7 +293,6 @@ config SND_SOC_SOF_HDA_LINK config SND_SOC_SOF_HDA_AUDIO_CODEC bool "SOF support for HDAudio codecs" depends on SND_SOC_SOF_HDA_LINK

• select SND_SOC_SOF_PROBE_WORK_QUEUE help This adds support for HDAudio codecs with Sound Open Firmware for Intel(R) platforms.

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;

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 64bebe1a72bbc..a8b7a68142c05 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -801,8 +801,11 @@ 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");
  

• if (ret < 0) {

• if (ret != -EPROBE_DEFER)
  

• 	dev_warn(sdev->dev, "init of i915 and HDMI codec failed: %i\n", ret);
  

• return ret;
  

• }

  /* get controller capabilities */ ret = hda_dsp_ctrl_get_caps(sdev);

@@ -1115,14 +1118,6 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) sdev->pdata->hw_pdata = hdev; hdev->desc = chip;

• hdev->dmic_dev = platform_device_register_data(sdev->dev, "dmic-codec",

• 				       PLATFORM_DEVID_NONE,
  

• 				       NULL, 0);
  

• if (IS_ERR(hdev->dmic_dev)) {

• dev_err(sdev->dev, "error: failed to create DMIC device\n");
  

• return PTR_ERR(hdev->dmic_dev);
  

• }
• /*
  • use position update IPC if either it is forced
  • or we don't have other choice

@@ -1142,6 +1137,15 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) if (ret < 0) goto hdac_bus_unmap;

• hdev->dmic_dev = platform_device_register_data(sdev->dev, "dmic-codec",

• 				       PLATFORM_DEVID_NONE,
  

• 				       NULL, 0);
  

• if (IS_ERR(hdev->dmic_dev)) {

• dev_err(sdev->dev, "error: failed to create DMIC device\n");
  

From here also, let's not add them back.

• ret = PTR_ERR(hdev->dmic_dev);
  

• goto hdac_exit;
  

• }
• if (sdev->dspless_mode_selected) goto skip_dsp_setup;

@@ -1150,7 +1154,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) if (!sdev->bar[HDA_DSP_BAR]) { dev_err(sdev->dev, "error: ioremap error\n"); ret = -ENXIO;

• goto hdac_bus_unmap;
  

• goto platform_unreg;
  

  }

  sdev->mmio_bar = HDA_DSP_BAR;

@@ -1248,10 +1252,12 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) /* dsp_unmap: not currently used */ if (!sdev->dspless_mode_selected) iounmap(sdev->bar[HDA_DSP_BAR]); -hdac_bus_unmap: +platform_unreg: platform_device_unregister(hdev->dmic_dev);

• iounmap(bus->remap_addr);

+hdac_exit: hda_codec_i915_exit(sdev); +hdac_bus_unmap:

• iounmap(bus->remap_addr);

err: return ret; } diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index f5ece43d0ec24..0fa424613082e 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -339,8 +339,7 @@ void sof_pci_remove(struct pci_dev *pci) snd_sof_device_remove(&pci->dev);

/* follow recommendation in pci-driver.c to increment usage counter */

• if (snd_sof_device_probe_completed(&pci->dev) &&

•    !(sof_pci_debug & SOF_PCI_DISABLE_PM_RUNTIME))
  

• if (!(sof_pci_debug & SOF_PCI_DISABLE_PM_RUNTIME)) pm_runtime_get_noresume(&pci->dev);

  /* release pci regions and disable device */

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h index d4f6702e93dcb..71db636cfdccc 100644 --- a/sound/soc/sof/sof-priv.h +++ b/sound/soc/sof/sof-priv.h @@ -564,10 +564,6 @@ struct snd_sof_dev { enum sof_fw_state fw_state; bool first_boot;

• /* work queue in case the probe is implemented in two steps */
• struct work_struct probe_work;
• bool probe_completed;
• /* DSP HW differentiation */ struct snd_sof_pdata *pdata;

@@ -675,7 +671,6 @@ struct snd_sof_dev { int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data); int snd_sof_device_remove(struct device *dev); int snd_sof_device_shutdown(struct device *dev); -bool snd_sof_device_probe_completed(struct device *dev);

int snd_sof_runtime_suspend(struct device *dev); int snd_sof_runtime_resume(struct device *dev);

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;