Unverified Commit 92728090 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mark Brown
Browse files

ASoC: SOF: Intel: HDA: fix core status verification 



When checking for enabled cores it isn't enough to check that
some of the requested cores are running, we have to check that
all of them are.

Fixes: 747503b1 ("ASoC: SOF: Intel: Add Intel specific HDA DSP HW operations")
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210322163728.16616-2-pierre-louis.bossart@linux.intel.com


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

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

+11 −4
Original line number Diff line number Diff line
@@ -226,11 +226,18 @@ bool hda_dsp_core_is_enabled(struct snd_sof_dev *sdev, 


	val = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPCS);



	is_enable = (val & HDA_DSP_ADSPCS_CPA_MASK(core_mask)) &&

		    (val & HDA_DSP_ADSPCS_SPA_MASK(core_mask)) &&

#define MASK_IS_EQUAL(v, m, field) ({	\

	u32 _m = field(m);		\

	((v) & _m) == _m;		\

})



	is_enable = MASK_IS_EQUAL(val, core_mask, HDA_DSP_ADSPCS_CPA_MASK) &&

		MASK_IS_EQUAL(val, core_mask, HDA_DSP_ADSPCS_SPA_MASK) &&

		!(val & HDA_DSP_ADSPCS_CRST_MASK(core_mask)) &&

		!(val & HDA_DSP_ADSPCS_CSTALL_MASK(core_mask));



#undef MASK_IS_EQUAL



	dev_dbg(sdev->dev, "DSP core(s) enabled? %d : core_mask %x\n",

		is_enable, core_mask);