Unverified Commit 7a567740 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: Switch to use the generic pm_ops.set_core_state 



Instead of craft and send an IPC(3) message in hda_dsp_core_get(),
tgl_dsp_core_get() and tgl_dsp_core_put(), use the generic ops for handling
the IPC dependent implementation of core power on/off.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220610083549.16773-6-peter.ujfalusi@linux.intel.com


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

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

+6 −9
Original line number Diff line number Diff line
@@ -932,13 +932,7 @@ void hda_dsp_d0i3_work(struct work_struct *work) 


int hda_dsp_core_get(struct snd_sof_dev *sdev, int core)

{

	struct sof_ipc_pm_core_config pm_core_config = {

		.hdr = {

			.cmd = SOF_IPC_GLB_PM_MSG | SOF_IPC_PM_CORE_ENABLE,

			.size = sizeof(pm_core_config),

		},

		.enable_mask = sdev->enabled_cores_mask | BIT(core),

	};

	const struct sof_ipc_pm_ops *pm_ops = sdev->ipc->ops->pm;

	int ret, ret1;



	/* power up core */
@@ -953,9 +947,12 @@ int hda_dsp_core_get(struct snd_sof_dev *sdev, int core) 
	if (sdev->fw_state != SOF_FW_BOOT_COMPLETE || core == SOF_DSP_PRIMARY_CORE)

		return 0;



	/* No need to continue the set_core_state ops is not available */

	if (!pm_ops->set_core_state)

		return 0;



	/* Now notify DSP for secondary cores */

	ret = sof_ipc_tx_message(sdev->ipc, &pm_core_config, sizeof(pm_core_config),

				 &pm_core_config, sizeof(pm_core_config));

	ret = pm_ops->set_core_state(sdev, core, true);

	if (ret < 0) {

		dev_err(sdev->dev, "failed to enable secondary core '%d' failed with %d\n",

			core, ret);

sound/soc/sof/intel/tgl.c

+10 −20
Original line number Diff line number Diff line
@@ -24,40 +24,30 @@ static const struct snd_sof_debugfs_map tgl_dsp_debugfs[] = { 


static int tgl_dsp_core_get(struct snd_sof_dev *sdev, int core)

{

	struct sof_ipc_pm_core_config pm_core_config = {

		.hdr = {

			.cmd = SOF_IPC_GLB_PM_MSG | SOF_IPC_PM_CORE_ENABLE,

			.size = sizeof(pm_core_config),

		},

		.enable_mask = sdev->enabled_cores_mask | BIT(core),

	};

	const struct sof_ipc_pm_ops *pm_ops = sdev->ipc->ops->pm;



	/* power up primary core if not already powered up and return */

	if (core == SOF_DSP_PRIMARY_CORE)

		return hda_dsp_enable_core(sdev, BIT(core));



	/* notify DSP for secondary cores */

	return sof_ipc_tx_message(sdev->ipc, &pm_core_config, sizeof(pm_core_config),

				 &pm_core_config, sizeof(pm_core_config));

	if (pm_ops->set_core_state)

		return pm_ops->set_core_state(sdev, core, true);



	return 0;

}



static int tgl_dsp_core_put(struct snd_sof_dev *sdev, int core)

{

	struct sof_ipc_pm_core_config pm_core_config = {

		.hdr = {

			.cmd = SOF_IPC_GLB_PM_MSG | SOF_IPC_PM_CORE_ENABLE,

			.size = sizeof(pm_core_config),

		},

		.enable_mask = sdev->enabled_cores_mask & ~BIT(core),

	};

	const struct sof_ipc_pm_ops *pm_ops = sdev->ipc->ops->pm;



	/* power down primary core and return */

	if (core == SOF_DSP_PRIMARY_CORE)

		return hda_dsp_core_reset_power_down(sdev, BIT(core));



	/* notify DSP for secondary cores */

	return sof_ipc_tx_message(sdev->ipc, &pm_core_config, sizeof(pm_core_config),

				 &pm_core_config, sizeof(pm_core_config));

	if (pm_ops->set_core_state)

		return pm_ops->set_core_state(sdev, core, false);



	return 0;

}



/* Tigerlake ops */