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

ASoC: SOF: Intel: remove the HDA_DSP_CORE_MASK() macro 



Remove the HDA_DSP_CORE_MASK() macro and use BIT() and GENMASK()
macros directly for more clarity.

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-4-kai.vehmanen@linux.intel.com


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

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,

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

	.host_managed_cores_mask = GENMASK(1, 0),

	.ipc_req = HDA_DSP_REG_HIPCI,

	.ipc_req_mask = HDA_DSP_REG_HIPCI_BUSY,

	.ipc_ack = HDA_DSP_REG_HIPCIE,

sound/soc/sof/intel/cnl.c

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

	.cores_num = 4,

	.init_core_mask = 1,

	.host_managed_cores_mask = HDA_DSP_CORE_MASK(0) |

				HDA_DSP_CORE_MASK(1) |

				HDA_DSP_CORE_MASK(2) |

				HDA_DSP_CORE_MASK(3),

	.host_managed_cores_mask = GENMASK(3, 0),

	.ipc_req = CNL_DSP_REG_HIPCIDR,

	.ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,

	.ipc_ack = CNL_DSP_REG_HIPCIDA,
@@ -353,10 +350,7 @@ const struct sof_intel_dsp_desc icl_chip_info = { 
	/* Icelake */

	.cores_num = 4,

	.init_core_mask = 1,

	.host_managed_cores_mask = HDA_DSP_CORE_MASK(0) |

				HDA_DSP_CORE_MASK(1) |

				HDA_DSP_CORE_MASK(2) |

				HDA_DSP_CORE_MASK(3),

	.host_managed_cores_mask = GENMASK(3, 0),

	.ipc_req = CNL_DSP_REG_HIPCIDR,

	.ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,

	.ipc_ack = CNL_DSP_REG_HIPCIDA,
@@ -372,7 +366,7 @@ const struct sof_intel_dsp_desc ehl_chip_info = { 
	/* Elkhartlake */

	.cores_num = 4,

	.init_core_mask = 1,

	.host_managed_cores_mask = HDA_DSP_CORE_MASK(0),

	.host_managed_cores_mask = BIT(0),

	.ipc_req = CNL_DSP_REG_HIPCIDR,

	.ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,

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

	.cores_num = 2,

	.init_core_mask = 1,

	.host_managed_cores_mask = HDA_DSP_CORE_MASK(0) |

				HDA_DSP_CORE_MASK(1),

	.host_managed_cores_mask = GENMASK(1, 0),

	.ipc_req = CNL_DSP_REG_HIPCIDR,

	.ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,

	.ipc_ack = CNL_DSP_REG_HIPCIDA,

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

+2 −3
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag, int iteration) 
			  ((stream_tag - 1) << 9)));



	/* step 3: unset core 0 reset state & unstall/run core 0 */

	ret = hda_dsp_core_run(sdev, HDA_DSP_CORE_MASK(0));

	ret = hda_dsp_core_run(sdev, BIT(0));

	if (ret < 0) {

		if (iteration == HDA_FW_BOOT_ATTEMPTS)

			dev_err(sdev->dev,
@@ -146,8 +146,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag, int iteration) 
				       chip->ipc_ack_mask);



	/* step 5: power down corex */

	ret = hda_dsp_core_power_down(sdev,

				  chip->host_managed_cores_mask & ~(HDA_DSP_CORE_MASK(0)));

	ret = hda_dsp_core_power_down(sdev, chip->host_managed_cores_mask & ~(BIT(0)));

	if (ret < 0) {

		if (iteration == HDA_FW_BOOT_ATTEMPTS)

			dev_err(sdev->dev,

sound/soc/sof/intel/hda.h

+0 −3
Original line number Diff line number Diff line
@@ -305,9 +305,6 @@ 
#define HDA_DSP_ADSPCS_CPA_SHIFT	24

#define HDA_DSP_ADSPCS_CPA_MASK(cm)	((cm) << HDA_DSP_ADSPCS_CPA_SHIFT)



/* Mask for a given core index, c = 0.. number of supported cores - 1 */

#define HDA_DSP_CORE_MASK(c)		BIT(c)



/*

 * Mask for a given number of cores

 * nc = number of supported cores

sound/soc/sof/intel/tgl.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ const struct sof_intel_dsp_desc tgl_chip_info = { 
	/* Tigerlake */

	.cores_num = 4,

	.init_core_mask = 1,

	.host_managed_cores_mask = HDA_DSP_CORE_MASK(0),

	.host_managed_cores_mask = BIT(0),

	.ipc_req = CNL_DSP_REG_HIPCIDR,

	.ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,

	.ipc_ack = CNL_DSP_REG_HIPCIDA,

CRA Git | Maintained and supported by SUSTech CRA and CCSE