Commit a8e2c19e authored by Senthilnathan Veppur's avatar Senthilnathan Veppur Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: add additional args to module parsing 



For additional library parsing, we need to pass firmware to be
loaded and not use the pointer in context. Also, Library module
IDs are combination of library index and module ID in manifest.

So add the additional arguments of firmware and library offset to
snd_skl_parse_uuids().

Signed-off-by: default avatarSenthilnathan Veppur <senthilnathanx.veppur@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 15ecaba9

sound/soc/intel/skylake/bxt-sst.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx) 
	if (ctx->fw == NULL)

		goto sst_load_base_firmware_failed;



	ret = snd_skl_parse_uuids(ctx, BXT_ADSP_FW_BIN_HDR_OFFSET);

	ret = snd_skl_parse_uuids(ctx, ctx->fw, BXT_ADSP_FW_BIN_HDR_OFFSET, 0);

	if (ret < 0)

		goto sst_load_base_firmware_failed;

sound/soc/intel/skylake/skl-sst-dsp.h

+2 −1
Original line number Diff line number Diff line
@@ -210,7 +210,8 @@ void bxt_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx); 


int snd_skl_get_module_info(struct skl_sst *ctx, u8 *uuid,

		struct skl_dfw_module *dfw_config);

int snd_skl_parse_uuids(struct sst_dsp *ctx, unsigned int offset);

int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw,

		unsigned int offset, int index);

void skl_freeup_uuid_list(struct skl_sst *ctx);



int skl_dsp_strip_extended_manifest(struct firmware *fw);

sound/soc/intel/skylake/skl-sst-utils.c

+5 −4
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ EXPORT_SYMBOL_GPL(snd_skl_get_module_info); 
 * Parse the firmware binary to get the UUID, module id

 * and loadable flags

 */

int snd_skl_parse_uuids(struct sst_dsp *ctx, unsigned int offset)

int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw,

			unsigned int offset, int index)

{

	struct adsp_fw_hdr *adsp_hdr;

	struct adsp_module_entry *mod_entry;
@@ -153,8 +154,8 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, unsigned int offset) 
	unsigned int safe_file;



	/* Get the FW pointer to derive ADSP header */

	stripped_fw.data = ctx->fw->data;

	stripped_fw.size = ctx->fw->size;

	stripped_fw.data = fw->data;

	stripped_fw.size = fw->size;



	skl_dsp_strip_extended_manifest(&stripped_fw);
@@ -205,7 +206,7 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, unsigned int offset) 
		uuid_bin = (uuid_le *)mod_entry->uuid.id;

		memcpy(&module->uuid, uuid_bin, sizeof(module->uuid));



		module->id = i;

		module->id = (i | (index << 12));

		module->is_loadable = mod_entry->type.load_type;



		list_add_tail(&module->list, &skl->uuid_list);

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int skl_load_base_firmware(struct sst_dsp *ctx) 
		}

	}



	ret = snd_skl_parse_uuids(ctx, SKL_ADSP_FW_BIN_HDR_OFFSET);

	ret = snd_skl_parse_uuids(ctx, ctx->fw, SKL_ADSP_FW_BIN_HDR_OFFSET, 0);

	if (ret < 0) {

		dev_err(ctx->dev,

				"UUID parsing err: %d\n", ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE