Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit be1b577d authored by Zhu Yingjiang's avatar Zhu Yingjiang Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: fix the hda init chip 



re-write hda_init_caps and remove the HDA reset, clean HDA
streams and clear interrupt steps in hda_dsp_probe so the
HDA init steps will not be called twice if the
CONFIG_SND_SOC_SOF_HDA is true.

Fixes: 8a300c8f ("ASoC: SOF: Intel: Add HDA controller for Intel DSP")
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarZhu Yingjiang <yingjiang.zhu@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1183e9a6

sound/soc/sof/intel/hda-ctrl.c

+93 −9
Original line number Diff line number Diff line
@@ -161,21 +161,105 @@ int hda_dsp_ctrl_clock_power_gating(struct snd_sof_dev *sdev, bool enable) 
	return 0;

}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

/*

 * While performing reset, controller may not come back properly and causing

 * issues, so recommendation is to set CGCTL.MISCBDCGE to 0 then do reset

 * (init chip) and then again set CGCTL.MISCBDCGE to 1

 */

int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset)

{

	struct hdac_bus *bus = sof_to_bus(sdev);

	int ret;

	struct hdac_stream *stream;

	int sd_offset, ret = 0;



	if (bus->chip_init)

		return 0;



	hda_dsp_ctrl_misc_clock_gating(sdev, false);

	ret = snd_hdac_bus_init_chip(bus, full_reset);

	hda_dsp_ctrl_misc_clock_gating(sdev, true);



	if (full_reset) {

		/* clear WAKESTS */

		snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_WAKESTS,

					SOF_HDA_WAKESTS_INT_MASK,

					SOF_HDA_WAKESTS_INT_MASK);



		/* reset HDA controller */

		ret = hda_dsp_ctrl_link_reset(sdev, true);

		if (ret < 0) {

			dev_err(sdev->dev, "error: failed to reset HDA controller\n");

			return ret;

		}



		usleep_range(500, 1000);



		/* exit HDA controller reset */

		ret = hda_dsp_ctrl_link_reset(sdev, false);

		if (ret < 0) {

			dev_err(sdev->dev, "error: failed to exit HDA controller reset\n");

			return ret;

		}



		usleep_range(1000, 1200);

	}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* check to see if controller is ready */

	if (!snd_hdac_chip_readb(bus, GCTL)) {

		dev_dbg(bus->dev, "controller not ready!\n");

		return -EBUSY;

	}



	/* Accept unsolicited responses */

	snd_hdac_chip_updatel(bus, GCTL, AZX_GCTL_UNSOL, AZX_GCTL_UNSOL);



	/* detect codecs */

	if (!bus->codec_mask) {

		bus->codec_mask = snd_hdac_chip_readw(bus, STATESTS);

		dev_dbg(bus->dev, "codec_mask = 0x%lx\n", bus->codec_mask);

	}

#endif



	/* clear stream status */

	list_for_each_entry(stream, &bus->stream_list, list) {

		sd_offset = SOF_STREAM_SD_OFFSET(stream);

		snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,

					sd_offset +

					SOF_HDA_ADSP_REG_CL_SD_STS,

					SOF_HDA_CL_DMA_SD_INT_MASK,

					SOF_HDA_CL_DMA_SD_INT_MASK);

	}



	/* clear WAKESTS */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_WAKESTS,

				SOF_HDA_WAKESTS_INT_MASK,

				SOF_HDA_WAKESTS_INT_MASK);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* clear rirb status */

	snd_hdac_chip_writeb(bus, RIRBSTS, RIRB_INT_MASK);

#endif



	/* clear interrupt status register */

	snd_sof_dsp_write(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTSTS,

			  SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_ALL_STREAM);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* initialize the codec command I/O */

	snd_hdac_bus_init_cmd_io(bus);

#endif



	/* enable CIE and GIE interrupts */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL,

				SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN,

				SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* program the position buffer */

	if (bus->use_posbuf && bus->posbuf.addr) {

		snd_hdac_chip_writel(bus, DPLBASE, (u32)bus->posbuf.addr);

		snd_hdac_chip_writel(bus, DPUBASE,

				     upper_32_bits(bus->posbuf.addr));

	}

#endif



	bus->chip_init = true;



	hda_dsp_ctrl_misc_clock_gating(sdev, true);



	return ret;

}

sound/soc/sof/intel/hda.c

+19 −80
Original line number Diff line number Diff line
@@ -264,9 +264,12 @@ static const char *fixup_tplg_name(struct snd_sof_dev *sdev, 
	return tplg_filename;

}



#endif



static int hda_init_caps(struct snd_sof_dev *sdev)

{

	struct hdac_bus *bus = sof_to_bus(sdev);

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	struct hdac_ext_link *hlink;

	struct snd_soc_acpi_mach_params *mach_params;

	struct snd_soc_acpi_mach *hda_mach;
@@ -274,8 +277,9 @@ static int hda_init_caps(struct snd_sof_dev *sdev) 
	struct snd_soc_acpi_mach *mach;

	const char *tplg_filename;

	int codec_num = 0;

	int ret = 0;

	int i;

#endif

	int ret = 0;



	device_disable_async_suspend(bus->dev);
@@ -283,6 +287,14 @@ static int hda_init_caps(struct snd_sof_dev *sdev) 
	if (bus->ppcap)

		dev_dbg(sdev->dev, "PP capability, will probe DSP later.\n");



	ret = hda_dsp_ctrl_init_chip(sdev, true);

	if (ret < 0) {

		dev_err(bus->dev, "error: init chip failed with ret: %d\n",

			ret);

		return ret;

	}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	if (bus->mlcap)

		snd_hdac_ext_bus_get_ml_capabilities(bus);
@@ -293,12 +305,6 @@ static int hda_init_caps(struct snd_sof_dev *sdev) 
		return ret;

	}



	ret = hda_dsp_ctrl_init_chip(sdev, true);

	if (ret < 0) {

		dev_err(bus->dev, "error: init chip failed with ret: %d\n", ret);

		goto out;

	}



	/* codec detection */

	if (!bus->codec_mask) {

		dev_info(bus->dev, "no hda codecs found!\n");
@@ -339,8 +345,10 @@ static int hda_init_caps(struct snd_sof_dev *sdev) 
				/* use local variable for readability */

				tplg_filename = pdata->tplg_filename;

				tplg_filename = fixup_tplg_name(sdev, tplg_filename);

				if (!tplg_filename)

					goto out;

				if (!tplg_filename) {

					hda_codec_i915_exit(sdev);

					return ret;

				}

				pdata->tplg_filename = tplg_filename;

			}

		}
@@ -364,35 +372,10 @@ static int hda_init_caps(struct snd_sof_dev *sdev) 
	 */

	list_for_each_entry(hlink, &bus->hlink_list, list)

		snd_hdac_ext_bus_link_put(bus, hlink);



	return 0;



out:

	hda_codec_i915_exit(sdev);

	return ret;

}



#else



static int hda_init_caps(struct snd_sof_dev *sdev)

{

	/*

	 * set CGCTL.MISCBDCGE to 0 during reset and set back to 1

	 * when reset finished.

	 * TODO: maybe no need for init_caps?

	 */

	hda_dsp_ctrl_misc_clock_gating(sdev, 0);



	/* clear WAKESTS */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_WAKESTS,

				SOF_HDA_WAKESTS_INT_MASK,

				SOF_HDA_WAKESTS_INT_MASK);



#endif

	return 0;

}



#endif



static const struct sof_intel_dsp_desc

	*get_chip_info(struct snd_sof_pdata *pdata)

{
@@ -409,9 +392,8 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) 
	struct pci_dev *pci = to_pci_dev(sdev->dev);

	struct sof_intel_hda_dev *hdev;

	struct hdac_bus *bus;

	struct hdac_stream *stream;

	const struct sof_intel_dsp_desc *chip;

	int sd_offset, ret = 0;

	int ret = 0;



	/*

	 * detect DSP by checking class/subclass/prog-id information
@@ -558,49 +540,6 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) 
	if (ret < 0)

		goto free_ipc_irq;



	/* reset HDA controller */

	ret = hda_dsp_ctrl_link_reset(sdev, true);

	if (ret < 0) {

		dev_err(sdev->dev, "error: failed to reset HDA controller\n");

		goto free_ipc_irq;

	}



	/* exit HDA controller reset */

	ret = hda_dsp_ctrl_link_reset(sdev, false);

	if (ret < 0) {

		dev_err(sdev->dev, "error: failed to exit HDA controller reset\n");

		goto free_ipc_irq;

	}



	/* clear stream status */

	list_for_each_entry(stream, &bus->stream_list, list) {

		sd_offset = SOF_STREAM_SD_OFFSET(stream);

		snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,

					sd_offset +

					SOF_HDA_ADSP_REG_CL_SD_STS,

					SOF_HDA_CL_DMA_SD_INT_MASK,

					SOF_HDA_CL_DMA_SD_INT_MASK);

	}



	/* clear WAKESTS */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_WAKESTS,

				SOF_HDA_WAKESTS_INT_MASK,

				SOF_HDA_WAKESTS_INT_MASK);



	/* clear interrupt status register */

	snd_sof_dsp_write(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTSTS,

			  SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_ALL_STREAM);



	/* enable CIE and GIE interrupts */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL,

				SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN,

				SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN);



	/* re-enable CGCTL.MISCBDCGE after reset */

	hda_dsp_ctrl_misc_clock_gating(sdev, true);



	device_disable_async_suspend(&pci->dev);



	/* enable DSP features */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,

				SOF_HDA_PPCTL_GPROCEN, SOF_HDA_PPCTL_GPROCEN);