Skip to content

Commit fd4e9e9

Browse files
RanderWangbroonie
authored andcommitted
ASoC: SOF: Intel: mtl: setup primary core info on MeteorLake platform
Set primary core mask and refcount. Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Signed-off-by: Rander Wang <rander.wang@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20230616100039.378150-9-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 3999614 commit fd4e9e9

1 file changed

Lines changed: 15 additions & 4 deletions

File tree

sound/soc/sof/intel/mtl.c

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,17 @@ static int mtl_dsp_core_power_up(struct snd_sof_dev *sdev, int core)
361361
ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, MTL_DSP2CXCTL_PRIMARY_CORE, dspcxctl,
362362
(dspcxctl & cpa) == cpa, HDA_DSP_REG_POLL_INTERVAL_US,
363363
HDA_DSP_RESET_TIMEOUT_US);
364-
if (ret < 0)
364+
if (ret < 0) {
365365
dev_err(sdev->dev, "%s: timeout on MTL_DSP2CXCTL_PRIMARY_CORE read\n",
366366
__func__);
367+
return ret;
368+
}
367369

368-
return ret;
370+
/* set primary core mask and refcount to 1 */
371+
sdev->enabled_cores_mask = BIT(SOF_DSP_PRIMARY_CORE);
372+
sdev->dsp_core_ref_count[SOF_DSP_PRIMARY_CORE] = 1;
373+
374+
return 0;
369375
}
370376

371377
static int mtl_dsp_core_power_down(struct snd_sof_dev *sdev, int core)
@@ -388,10 +394,15 @@ static int mtl_dsp_core_power_down(struct snd_sof_dev *sdev, int core)
388394
!(dspcxctl & MTL_DSP2CXCTL_PRIMARY_CORE_CPA_MASK),
389395
HDA_DSP_REG_POLL_INTERVAL_US,
390396
HDA_DSP_PD_TIMEOUT * USEC_PER_MSEC);
391-
if (ret < 0)
397+
if (ret < 0) {
392398
dev_err(sdev->dev, "failed to power down primary core\n");
399+
return ret;
400+
}
393401

394-
return ret;
402+
sdev->enabled_cores_mask = 0;
403+
sdev->dsp_core_ref_count[SOF_DSP_PRIMARY_CORE] = 0;
404+
405+
return 0;
395406
}
396407

397408
int mtl_power_down_dsp(struct snd_sof_dev *sdev)

0 commit comments

Comments
 (0)