Unverified Commit 320f4d86 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

ASoC: Intel: avs: Fix avs_path_module::instance_id size 



All IPCs using instance_id use 8 bit value. Original commit used 16 bit
value because FW reports possible max value in 16 bit field, but in
practice FW limits the value to 8 bits.

Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230519201711.4073845-7-amadeuszx.slawinski@linux.intel.com


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

sound/soc/intel/avs/avs.h

+2 −2
Original line number Diff line number Diff line
@@ -283,8 +283,8 @@ void avs_release_firmwares(struct avs_dev *adev); 


int avs_dsp_init_module(struct avs_dev *adev, u16 module_id, u8 ppl_instance_id,

			u8 core_id, u8 domain, void *param, u32 param_size,

			u16 *instance_id);

void avs_dsp_delete_module(struct avs_dev *adev, u16 module_id, u16 instance_id,

			u8 *instance_id);

void avs_dsp_delete_module(struct avs_dev *adev, u16 module_id, u8 instance_id,

			   u8 ppl_instance_id, u8 core_id);

int avs_dsp_create_pipeline(struct avs_dev *adev, u16 req_size, u8 priority,

			    bool lp, u16 attributes, u8 *instance_id);

sound/soc/intel/avs/dsp.c

+2 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static int avs_dsp_put_core(struct avs_dev *adev, u32 core_id) 


int avs_dsp_init_module(struct avs_dev *adev, u16 module_id, u8 ppl_instance_id,

			u8 core_id, u8 domain, void *param, u32 param_size,

			u16 *instance_id)

			u8 *instance_id)

{

	struct avs_module_entry mentry;

	bool was_loaded = false;
@@ -272,7 +272,7 @@ int avs_dsp_init_module(struct avs_dev *adev, u16 module_id, u8 ppl_instance_id, 
	return ret;

}



void avs_dsp_delete_module(struct avs_dev *adev, u16 module_id, u16 instance_id,

void avs_dsp_delete_module(struct avs_dev *adev, u16 module_id, u8 instance_id,

			   u8 ppl_instance_id, u8 core_id)

{

	struct avs_module_entry mentry;

sound/soc/intel/avs/path.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct avs_path_pipeline { 


struct avs_path_module {

	u16 module_id;

	u16 instance_id;

	u8 instance_id;

	union avs_gtw_attributes gtw_attrs;



	struct avs_tplg_module *template;

sound/soc/intel/avs/probes.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static int avs_dsp_init_probe(struct avs_dev *adev, union avs_connector_node_id 
{

	struct avs_probe_cfg cfg = {{0}};

	struct avs_module_entry mentry;

	u16 dummy;

	u8 dummy;



	avs_get_module_entry(adev, &AVS_PROBE_MOD_UUID, &mentry);