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

Commit d643678b authored by Jeeja KP's avatar Jeeja KP Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Fix for unloading module only when it is loaded 



Module needs to be unloaded only when it is loaded successfully.
To fix this, first correct the module state sequence and set module
state to LOADED if module is loaded successfully.
When unloading the module check if module state is not in UNINIT,
then unload it.

Signed-off-by: default avatarJeeja KP <jeeja.kp@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c3efb42b

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

+4 −1
Original line number Diff line number Diff line
@@ -490,6 +490,8 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe) 
				mconfig->id.module_id, mconfig->guid);

			if (ret < 0)

				return ret;



			mconfig->m_state = SKL_MODULE_LOADED;

		}



		/* update blob if blob is null for be with default value */
@@ -524,7 +526,8 @@ static int skl_tplg_unload_pipe_modules(struct skl_sst *ctx, 
	list_for_each_entry(w_module, &pipe->w_list, node) {

		mconfig  = w_module->w->priv;



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

		if (mconfig->is_loadable && ctx->dsp->fw_ops.unload_mod &&

			mconfig->m_state > SKL_MODULE_UNINIT)

			return ctx->dsp->fw_ops.unload_mod(ctx->dsp,

						mconfig->id.module_id);

	}

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

+4 −4
Original line number Diff line number Diff line
@@ -274,10 +274,10 @@ struct skl_pipe { 


enum skl_module_state {

	SKL_MODULE_UNINIT = 0,

	SKL_MODULE_INIT_DONE = 1,

	SKL_MODULE_LOADED = 2,

	SKL_MODULE_UNLOADED = 3,

	SKL_MODULE_BIND_DONE = 4

	SKL_MODULE_LOADED = 1,

	SKL_MODULE_INIT_DONE = 2,

	SKL_MODULE_BIND_DONE = 3,

	SKL_MODULE_UNLOADED = 4,

};



struct skl_module_cfg {