Unverified Commit 537b4a0c authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-dsp: Expose hda_dsp_core_power_up() 



The hda_dsp_core_power_up() needs to be exposed so that it can be used in
hda-loader.c to correct the boot flow.
The first step must not unstall the core, it should only power up the
core(s).

Add sanity check for the core_mask while exposing it to be safe.

Complements: 2a68ff84 ("ASoC: SOF: Intel: hda: Revisit IMR boot sequence")
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220609085949.29062-2-peter.ujfalusi@linux.intel.com


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

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

+9 −1
Original line number Diff line number Diff line
@@ -181,12 +181,20 @@ int hda_dsp_core_run(struct snd_sof_dev *sdev, unsigned int core_mask) 
 * Power Management.

 */



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

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

{

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

	const struct sof_intel_dsp_desc *chip = hda->desc;

	unsigned int cpa;

	u32 adspcs;

	int ret;



	/* restrict core_mask to host managed cores mask */

	core_mask &= chip->host_managed_cores_mask;

	/* return if core_mask is not valid */

	if (!core_mask)

		return 0;



	/* update bits */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPCS,

				HDA_DSP_ADSPCS_SPA_MASK(core_mask),

sound/soc/sof/intel/hda.h

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

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

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

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

int hda_dsp_core_reset_power_down(struct snd_sof_dev *sdev,