Unverified Commit 5974f684 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Introduce num_cores and ref count per core 



Add two fields num_cores and dsp_cores_ref_count to
struct snd_sof_dev. These will be used to maintain the
ref count for each core to determine when it should be
powered up or down.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20211119192621.4096077-3-kai.vehmanen@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 81ed6770

sound/soc/sof/imx/imx8.c

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ static int imx8_probe(struct snd_sof_dev *sdev) 
	if (!priv)

		return -ENOMEM;



	sdev->num_cores = 1;

	sdev->pdata->hw_pdata = priv;

	priv->dev = sdev->dev;

	priv->sdev = sdev;

sound/soc/sof/imx/imx8m.c

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static int imx8m_probe(struct snd_sof_dev *sdev) 
	if (!priv)

		return -ENOMEM;



	sdev->num_cores = 1;

	sdev->pdata->hw_pdata = priv;

	priv->dev = sdev->dev;

	priv->sdev = sdev;

sound/soc/sof/intel/bdw.c

+9 −0
Original line number Diff line number Diff line
@@ -412,10 +412,19 @@ static int bdw_probe(struct snd_sof_dev *sdev) 
	const struct sof_dev_desc *desc = pdata->desc;

	struct platform_device *pdev =

		container_of(sdev->dev, struct platform_device, dev);

	const struct sof_intel_dsp_desc *chip;

	struct resource *mmio;

	u32 base, size;

	int ret;



	chip = get_chip_info(sdev->pdata);

	if (!chip) {

		dev_err(sdev->dev, "error: no such device supported\n");

		return -EIO;

	}



	sdev->num_cores = chip->cores_num;



	/* LPE base */

	mmio = platform_get_resource(pdev, IORESOURCE_MEM,

				     desc->resindex_lpe_base);

sound/soc/sof/intel/byt.c

+9 −0
Original line number Diff line number Diff line
@@ -113,10 +113,19 @@ static int byt_acpi_probe(struct snd_sof_dev *sdev) 
	const struct sof_dev_desc *desc = pdata->desc;

	struct platform_device *pdev =

		container_of(sdev->dev, struct platform_device, dev);

	const struct sof_intel_dsp_desc *chip;

	struct resource *mmio;

	u32 base, size;

	int ret;



	chip = get_chip_info(sdev->pdata);

	if (!chip) {

		dev_err(sdev->dev, "error: no such device supported\n");

		return -EIO;

	}



	sdev->num_cores = chip->cores_num;



	/* DSP DMA can only access low 31 bits of host memory */

	ret = dma_coerce_mask_and_coherent(sdev->dev, DMA_BIT_MASK(31));

	if (ret < 0) {

sound/soc/sof/intel/hda.c

+2 −0
Original line number Diff line number Diff line
@@ -897,6 +897,8 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) 
		goto err;

	}



	sdev->num_cores = chip->cores_num;



	hdev = devm_kzalloc(sdev->dev, sizeof(*hdev), GFP_KERNEL);

	if (!hdev)

		return -ENOMEM;