Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 260eb73a authored by Dharageswari R's avatar Dharageswari R Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Avoid freeing up of unallocated memory/mcps 



When DSP pipe/module is not initialized successfully, memory/mcps
is not allocated. So check the pipe/module state to avoid freeing
up of unallocated memory/mcps. And allocate resources when pipe/
module is initialized successfully.

Signed-off-by: default avatarDharageswari R <dharageswari.r@intel.com>
Signed-off-by: default avatarJeeja KP <jeeja.kp@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 51a01b8c

sound/soc/intel/skylake/skl-topology.c

+9 −6
Original line number Diff line number Diff line
@@ -514,8 +514,6 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe) 
		if (!skl_is_pipe_mcps_avail(skl, mconfig))

			return -ENOMEM;



		skl_tplg_alloc_pipe_mcps(skl, mconfig);



		if (mconfig->is_loadable && ctx->dsp->fw_ops.load_mod) {

			ret = ctx->dsp->fw_ops.load_mod(ctx->dsp,

				mconfig->id.module_id, mconfig->guid);
@@ -539,6 +537,7 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe) 
		if (ret < 0)

			return ret;



		skl_tplg_alloc_pipe_mcps(skl, mconfig);

		ret = skl_tplg_set_module_params(w, ctx);

		if (ret < 0)

			return ret;
@@ -591,9 +590,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w, 
	if (!skl_is_pipe_mem_avail(skl, mconfig))

		return -ENOMEM;



	skl_tplg_alloc_pipe_mem(skl, mconfig);

	skl_tplg_alloc_pipe_mcps(skl, mconfig);



	/*

	 * Create a list of modules for pipe.

	 * This list contains modules from source to sink
@@ -602,6 +598,9 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w, 
	if (ret < 0)

		return ret;



	skl_tplg_alloc_pipe_mem(skl, mconfig);

	skl_tplg_alloc_pipe_mcps(skl, mconfig);



	/*

	 * we create a w_list of all widgets in that pipe. This list is not

	 * freed on PMD event as widgets within a pipe are static. This
@@ -949,12 +948,16 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w, 
	struct skl_pipe *s_pipe = mconfig->pipe;

	int ret = 0;



	if (s_pipe->state == SKL_PIPE_INVALID)

		return -EINVAL;



	skl_tplg_free_pipe_mcps(skl, mconfig);

	skl_tplg_free_pipe_mem(skl, mconfig);



	list_for_each_entry(w_module, &s_pipe->w_list, node) {

		dst_module = w_module->w->priv;



		if (mconfig->m_state >= SKL_MODULE_INIT_DONE)

			skl_tplg_free_pipe_mcps(skl, dst_module);

		if (src_module == NULL) {

			src_module = dst_module;