Unverified Commit 64b96917 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: rename cores_mask to host_managed_cores_mask 



Rename the cores_mask in struct sof_intel_dsp_desc to
host_managed_cores_mask to be more indicative of the fact that
only these cores can be powered up/down by the host.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarKeyon Jie <yang.jie@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200910164125.2033062-2-kai.vehmanen@linux.intel.com


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

sound/soc/sof/intel/apl.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ const struct sof_intel_dsp_desc apl_chip_info = { 
	/* Apollolake */

	.cores_num = 2,

	.init_core_mask = 1,

	.cores_mask = HDA_DSP_CORE_MASK(0) | HDA_DSP_CORE_MASK(1),

	.host_managed_cores_mask = HDA_DSP_CORE_MASK(0) | HDA_DSP_CORE_MASK(1),

	.ipc_req = HDA_DSP_REG_HIPCI,

	.ipc_req_mask = HDA_DSP_REG_HIPCI_BUSY,

	.ipc_ack = HDA_DSP_REG_HIPCIE,

sound/soc/sof/intel/bdw.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ EXPORT_SYMBOL_NS(sof_bdw_ops, SND_SOC_SOF_BROADWELL); 


const struct sof_intel_dsp_desc bdw_chip_info = {

	.cores_num = 1,

	.cores_mask = 1,

	.host_managed_cores_mask = 1,

};

EXPORT_SYMBOL_NS(bdw_chip_info, SND_SOC_SOF_BROADWELL);

sound/soc/sof/intel/byt.c

+3 −3
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ EXPORT_SYMBOL_NS(sof_tng_ops, SND_SOC_SOF_MERRIFIELD); 


const struct sof_intel_dsp_desc tng_chip_info = {

	.cores_num = 1,

	.cores_mask = 1,

	.host_managed_cores_mask = 1,

};

EXPORT_SYMBOL_NS(tng_chip_info, SND_SOC_SOF_MERRIFIELD);
@@ -896,7 +896,7 @@ EXPORT_SYMBOL_NS(sof_byt_ops, SND_SOC_SOF_BAYTRAIL); 


const struct sof_intel_dsp_desc byt_chip_info = {

	.cores_num = 1,

	.cores_mask = 1,

	.host_managed_cores_mask = 1,

};

EXPORT_SYMBOL_NS(byt_chip_info, SND_SOC_SOF_BAYTRAIL);
@@ -976,7 +976,7 @@ EXPORT_SYMBOL_NS(sof_cht_ops, SND_SOC_SOF_BAYTRAIL); 


const struct sof_intel_dsp_desc cht_chip_info = {

	.cores_num = 1,

	.cores_mask = 1,

	.host_managed_cores_mask = 1,

};

EXPORT_SYMBOL_NS(cht_chip_info, SND_SOC_SOF_BAYTRAIL);

sound/soc/sof/intel/cnl.c

+4 −4
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ const struct sof_intel_dsp_desc cnl_chip_info = { 
	/* Cannonlake */

	.cores_num = 4,

	.init_core_mask = 1,

	.cores_mask = HDA_DSP_CORE_MASK(0) |

	.host_managed_cores_mask = HDA_DSP_CORE_MASK(0) |

				HDA_DSP_CORE_MASK(1) |

				HDA_DSP_CORE_MASK(2) |

				HDA_DSP_CORE_MASK(3),
@@ -353,7 +353,7 @@ const struct sof_intel_dsp_desc icl_chip_info = { 
	/* Icelake */

	.cores_num = 4,

	.init_core_mask = 1,

	.cores_mask = HDA_DSP_CORE_MASK(0) |

	.host_managed_cores_mask = HDA_DSP_CORE_MASK(0) |

				HDA_DSP_CORE_MASK(1) |

				HDA_DSP_CORE_MASK(2) |

				HDA_DSP_CORE_MASK(3),
@@ -372,7 +372,7 @@ const struct sof_intel_dsp_desc ehl_chip_info = { 
	/* Elkhartlake */

	.cores_num = 4,

	.init_core_mask = 1,

	.cores_mask = HDA_DSP_CORE_MASK(0),

	.host_managed_cores_mask = HDA_DSP_CORE_MASK(0),

	.ipc_req = CNL_DSP_REG_HIPCIDR,

	.ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,

	.ipc_ack = CNL_DSP_REG_HIPCIDA,
@@ -388,7 +388,7 @@ const struct sof_intel_dsp_desc jsl_chip_info = { 
	/* Jasperlake */

	.cores_num = 2,

	.init_core_mask = 1,

	.cores_mask = HDA_DSP_CORE_MASK(0) |

	.host_managed_cores_mask = HDA_DSP_CORE_MASK(0) |

				HDA_DSP_CORE_MASK(1),

	.ipc_req = CNL_DSP_REG_HIPCIDR,

	.ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,

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

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) 
#endif



	/* power down DSP */

	ret = hda_dsp_core_reset_power_down(sdev, chip->cores_mask);

	ret = hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);

	if (ret < 0) {

		dev_err(sdev->dev,

			"error: failed to power down core during suspend\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE