Commit f1977d5b authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Takashi Iwai
Browse files

ASoC: SOF: Intel: hda: start splitting the probe 



This patch moves the initial parts of the probe to the probe_early()
callback, which provides a much faster decision on whether the SOF
driver shall deal with a specific platform or yield to other Intel
drivers.

This is a limited functionality change, the bigger change is to move
the i915/Xe initialization to the probe_early().

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20231009115437.99976-4-maarten.lankhorst@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 17baaa1f

sound/soc/sof/intel/hda-common-ops.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


struct snd_sof_dsp_ops sof_hda_common_ops = {

	/* probe/remove/shutdown */

	.probe_early	= hda_dsp_probe_early,

	.probe		= hda_dsp_probe,

	.remove		= hda_dsp_remove,

sound/soc/sof/intel/hda.c

+13 −3
Original line number Diff line number Diff line
@@ -1118,11 +1118,10 @@ static irqreturn_t hda_dsp_interrupt_thread(int irq, void *context) 
	return IRQ_HANDLED;

}



int hda_dsp_probe(struct snd_sof_dev *sdev)

int hda_dsp_probe_early(struct snd_sof_dev *sdev)

{

	struct pci_dev *pci = to_pci_dev(sdev->dev);

	struct sof_intel_hda_dev *hdev;

	struct hdac_bus *bus;

	const struct sof_intel_dsp_desc *chip;

	int ret = 0;
@@ -1162,6 +1161,17 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) 
	sdev->pdata->hw_pdata = hdev;

	hdev->desc = chip;



err:

	return ret;

}



int hda_dsp_probe(struct snd_sof_dev *sdev)

{

	struct pci_dev *pci = to_pci_dev(sdev->dev);

	struct sof_intel_hda_dev *hdev = sdev->pdata->hw_pdata;

	struct hdac_bus *bus;

	int ret = 0;



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

						       PLATFORM_DEVID_NONE,

						       NULL, 0);
@@ -1299,7 +1309,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) 
	platform_device_unregister(hdev->dmic_dev);

	iounmap(bus->remap_addr);

	hda_codec_i915_exit(sdev);

err:



	return ret;

}

sound/soc/sof/intel/hda.h

+1 −0
Original line number Diff line number Diff line
@@ -573,6 +573,7 @@ struct sof_intel_hda_stream { 
/*

 * DSP Core services.

 */

int hda_dsp_probe_early(struct snd_sof_dev *sdev);

int hda_dsp_probe(struct snd_sof_dev *sdev);

int hda_dsp_remove(struct snd_sof_dev *sdev);

int hda_dsp_core_power_up(struct snd_sof_dev *sdev, unsigned int core_mask);