Unverified Commit d70a4412 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: DSP core management fixes for 5.10" from Kai Vehmanen... 

Merge series "ASoC: SOF: DSP core management fixes for 5.10" from Kai Vehmanen <kai.vehmanen@linux.intel.com>:

This series contains some improvements to how DSP core management
is done in SOF, and adds a distinction between cores managed by
the host versus cores managed by the DSP.

Pierre-Louis Bossart (1):
  ASoC: SOF: Intel: hda-loader: s/master/primary

Ranjani Sridharan (3):
  ASoC: SOF: rename cores_mask to host_managed_cores_mask
  ASoC: SOF: Intel: hda: modify core_power_up/down op
  ASoC: SOF: Intel: remove the  HDA_DSP_CORE_MASK() macro

 sound/soc/sof/intel/apl.c        |  2 +-
 sound/soc/sof/intel/bdw.c        |  2 +-
 sound/soc/sof/intel/byt.c        |  6 +++---
 sound/soc/sof/intel/cnl.c        | 15 ++++-----------
 sound/soc/sof/intel/hda-dsp.c    | 20 +++++++++++++++++---
 sound/soc/sof/intel/hda-loader.c | 11 +++++------
 sound/soc/sof/intel/hda.c        |  2 +-
 sound/soc/sof/intel/hda.h        |  3 ---
 sound/soc/sof/intel/shim.h       |  2 +-
 sound/soc/sof/intel/tgl.c        |  2 +-
 10 files changed, 34 insertions(+), 31 deletions(-)

--
2.27.0
parents 2b7d52a9 52e4d0ae

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 = 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/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 −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,

	.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,

	.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,

	.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,

	.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-dsp.c

+17 −3
Original line number Diff line number Diff line
@@ -239,10 +239,15 @@ bool hda_dsp_core_is_enabled(struct snd_sof_dev *sdev, 


int hda_dsp_enable_core(struct snd_sof_dev *sdev, unsigned int core_mask)

{

	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;

	const struct sof_intel_dsp_desc *chip = hda->desc;

	int ret;



	/* return if core is already enabled */

	if (hda_dsp_core_is_enabled(sdev, core_mask))

	/* restrict core_mask to host managed cores mask */

	core_mask &= chip->host_managed_cores_mask;



	/* return if core_mask is not valid or cores are already enabled */

	if (!core_mask || hda_dsp_core_is_enabled(sdev, core_mask))

		return 0;



	/* power up */
@@ -259,8 +264,17 @@ int hda_dsp_enable_core(struct snd_sof_dev *sdev, unsigned int core_mask) 
int hda_dsp_core_reset_power_down(struct snd_sof_dev *sdev,

				  unsigned int core_mask)

{

	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;

	const struct sof_intel_dsp_desc *chip = hda->desc;

	int ret;



	/* restrict core_mask to host managed cores mask */

	core_mask &= chip->host_managed_cores_mask;



	/* return if core_mask is not valid */

	if (!core_mask)

		return 0;



	/* place core in reset prior to power down */

	ret = hda_dsp_core_stall_reset(sdev, core_mask);

	if (ret < 0) {
@@ -610,7 +624,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