Commit e280823c authored by Vinod Koul's avatar Vinod Koul Committed by Mark Brown

ASoC: Intel: Skylake: Parse UUIDs once

The firmware manifest contains UUIDs which needs to be passed only once.

So use the newly introduced is_first_boot flag to distinguish and parse
these only once.
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a8e2c19e
...@@ -88,14 +88,16 @@ static int skl_load_base_firmware(struct sst_dsp *ctx) ...@@ -88,14 +88,16 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)
} }
} }
/* prase uuids on first boot */
if (skl->is_first_boot) {
ret = snd_skl_parse_uuids(ctx, ctx->fw, SKL_ADSP_FW_BIN_HDR_OFFSET, 0); ret = snd_skl_parse_uuids(ctx, ctx->fw, SKL_ADSP_FW_BIN_HDR_OFFSET, 0);
if (ret < 0) { if (ret < 0) {
dev_err(ctx->dev, dev_err(ctx->dev, "UUID parsing err: %d\n", ret);
"UUID parsing err: %d\n", ret);
release_firmware(ctx->fw); release_firmware(ctx->fw);
skl_dsp_disable_core(ctx, SKL_DSP_CORE0_MASK); skl_dsp_disable_core(ctx, SKL_DSP_CORE0_MASK);
return ret; return ret;
} }
}
/* check for extended manifest */ /* check for extended manifest */
stripped_fw.data = ctx->fw->data; stripped_fw.data = ctx->fw->data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment