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

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

ASoC: SOF: Intel: hda: use SOF defined init chip in resume 



Unify resume code by using SOF common function hda_dsp_ctrl_init_chip()
which can handle both HDA and non-HDA cases. Move code to reset
stream-to-link mapping into hda_dsp_ctrl_init_chip().

Signed-off-by: default avatarZhu Yingjiang <yingjiang.zhu@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190722141402.7194-15-pierre-louis.bossart@linux.intel.com


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

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

+9 −0
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ int hda_dsp_ctrl_clock_power_gating(struct snd_sof_dev *sdev, bool enable) 
int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset)

{

	struct hdac_bus *bus = sof_to_bus(sdev);

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	struct hdac_ext_link *hlink;

#endif

	struct hdac_stream *stream;

	int sd_offset, ret = 0;
@@ -253,6 +256,12 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset) 
				  upper_32_bits(bus->posbuf.addr));

	}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* Reset stream-to-link mapping */

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

		bus->io_ops->reg_writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV);

#endif



	bus->chip_init = true;



	hda_dsp_ctrl_misc_clock_gating(sdev, true);

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

+0 −26
Original line number Diff line number Diff line
@@ -368,32 +368,6 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) 
	/* check dma status and clean up CORB/RIRB buffers */

	if (!bus->cmd_dma_state)

		snd_hdac_bus_stop_cmd_io(bus);

#else



	hda_dsp_ctrl_misc_clock_gating(sdev, false);



	/* reset controller */

	ret = hda_dsp_ctrl_link_reset(sdev, true);

	if (ret < 0) {

		dev_err(sdev->dev,

			"error: failed to reset controller during resume\n");

		return ret;

	}



	/* take controller out of reset */

	ret = hda_dsp_ctrl_link_reset(sdev, false);

	if (ret < 0) {

		dev_err(sdev->dev,

			"error: failed to ready controller during resume\n");

		return ret;

	}



	/* enable hda bus irq */

	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);



	hda_dsp_ctrl_misc_clock_gating(sdev, true);

#endif



	/* enable ppcap interrupt */