Unverified Commit 1b3c63ac authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: multi core support for 5.10" from Kai Vehmanen... 

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

This series extends the multi-core support in SOF. Capability
to specify which core to use, on a per component basis, is added
to topology. The topology load functionality in SOF is modified to
power up/down host controlled cores based on the topology
description.

Guennadi Liakhovetski (2):
  ASoC: SOF: add a "core" parameter to widget loading functions
  ASoC: SOF: support topology components on secondary cores

Ranjani Sridharan (1):
  ASoC: SOF: topology: fix core enable sequence

 include/uapi/sound/sof/tokens.h |   1 +
 sound/soc/sof/pm.c              |   1 +
 sound/soc/sof/sof-audio.c       |  25 ++++
 sound/soc/sof/sof-audio.h       |   5 +
 sound/soc/sof/sof-priv.h        |   3 +
 sound/soc/sof/topology.c        | 210 ++++++++++++++++++++++----------
 6 files changed, 184 insertions(+), 61 deletions(-)

--
2.27.0
parents 0c5f8ca4 8c9ff121

include/uapi/sound/sof/tokens.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
/* Token retired with ABI 3.2, do not use for new capabilities

 * #define SOF_TKN_COMP_PRELOAD_COUNT		403

 */

#define SOF_TKN_COMP_CORE_ID			404



/* SSP */

#define SOF_TKN_INTEL_SSP_CLKS_CONTROL		500

sound/soc/sof/pm.c

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ suspend: 


	/* reset FW state */

	sdev->fw_state = SOF_FW_BOOT_NOT_STARTED;

	sdev->enabled_cores_mask = 0;



	return ret;

}

sound/soc/sof/sof-audio.c

+25 −0
Original line number Diff line number Diff line
@@ -142,6 +142,22 @@ static int sof_restore_kcontrols(struct device *dev) 
	return 0;

}



const struct sof_ipc_pipe_new *snd_sof_pipeline_find(struct snd_sof_dev *sdev,

						     int pipeline_id)

{

	const struct snd_sof_widget *swidget;



	list_for_each_entry(swidget, &sdev->widget_list, list)

		if (swidget->id == snd_soc_dapm_scheduler) {

			const struct sof_ipc_pipe_new *pipeline =

				swidget->private;

			if (pipeline->pipeline_id == pipeline_id)

				return pipeline;

		}



	return NULL;

}



int sof_restore_pipelines(struct device *dev)

{

	struct snd_sof_dev *sdev = dev_get_drvdata(dev);
@@ -161,6 +177,15 @@ int sof_restore_pipelines(struct device *dev) 
		if (!swidget->private)

			continue;



		ret = sof_pipeline_core_enable(sdev, swidget);

		if (ret < 0) {

			dev_err(dev,

				"error: failed to enable target core: %d\n",

				ret);



			return ret;

		}



		switch (swidget->id) {

		case snd_soc_dapm_dai_in:

		case snd_soc_dapm_dai_out:

sound/soc/sof/sof-audio.h

+5 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ struct snd_sof_widget { 
	int comp_id;

	int pipeline_id;

	int complete;

	int core;

	int id;



	struct snd_soc_dapm_widget *widget;
@@ -151,6 +152,8 @@ int snd_sof_complete_pipeline(struct device *dev, 
int sof_load_pipeline_ipc(struct device *dev,

			  struct sof_ipc_pipe_new *pipeline,

			  struct sof_ipc_comp_reply *r);

int sof_pipeline_core_enable(struct snd_sof_dev *sdev,

			     const struct snd_sof_widget *swidget);



/*

 * Stream IPC
@@ -190,6 +193,8 @@ struct snd_sof_pcm *snd_sof_find_spcm_comp(struct snd_soc_component *scomp, 
					   int *direction);

struct snd_sof_pcm *snd_sof_find_spcm_pcm_id(struct snd_soc_component *scomp,

					     unsigned int pcm_id);

const struct sof_ipc_pipe_new *snd_sof_pipeline_find(struct snd_sof_dev *sdev,

						     int pipeline_id);

void snd_sof_pcm_period_elapsed(struct snd_pcm_substream *substream);

void snd_sof_pcm_period_elapsed_work(struct work_struct *work);

sound/soc/sof/sof-priv.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ extern int sof_core_debug; 
	(IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_ENABLE_DEBUGFS_CACHE) || \

	 IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST))



/* So far the primary core on all DSPs has ID 0 */

#define SOF_DSP_PRIMARY_CORE 0



/* DSP power state */

enum sof_dsp_power_states {

	SOF_DSP_PM_D0,

CRA Git | Maintained and supported by SUSTech CRA and CCSE