Unverified Commit 740e5d87 authored by Yong Zhi's avatar Yong Zhi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: MTL: remove redundant snd_sof_dsp_read() call 



Drop redundant CPA bit check after polling the same condition.

Fixes: 064520e8 ("ASoC: SOF: Intel: Add support for MeteorLake (MTL)")
Reviewed-by: default avatarChao Song <chao.song@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarYong Zhi <yong.zhi@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220715145216.277003-2-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/intel/mtl.c

+1 −12
Original line number Diff line number Diff line
@@ -372,20 +372,9 @@ static int mtl_dsp_core_power_up(struct snd_sof_dev *sdev, int core) 
	ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_DSP2CXCTL_PRIMARY_CORE, dspcxctl,

					    (dspcxctl & cpa) == cpa, HDA_DSP_REG_POLL_INTERVAL_US,

					    HDA_DSP_RESET_TIMEOUT_US);

	if (ret < 0) {

	if (ret < 0)

		dev_err(sdev->dev, "%s: timeout on MTL_DSP2CXCTL_PRIMARY_CORE read\n",

			__func__);

		return ret;

	}



	/* did core power up ? */

	dspcxctl = snd_sof_dsp_read(sdev, HDA_DSP_BAR, MTL_DSP2CXCTL_PRIMARY_CORE);

	if ((dspcxctl & MTL_DSP2CXCTL_PRIMARY_CORE_CPA_MASK)

		!= MTL_DSP2CXCTL_PRIMARY_CORE_CPA_MASK) {

		dev_err(sdev->dev, "power up core failed core %d adspcs %#x\n",

			core, dspcxctl);

		ret = -EIO;

	}



	return ret;

}