aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-07-26 08:36:46 -0400
committerMark Brown <broonie@kernel.org>2016-08-08 06:54:59 -0400
commit0bdd6d8bedffdb33586455302b6543ca3f157cc1 (patch)
tree2bba014e903a76235fa86133619ce6261449d108
parente280823c23f9ccc5f3bbd0fb2fa458cd96c1a881 (diff)
ASoC: Intel: Bxt: 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 on bxt platform as well. Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/intel/skylake/bxt-sst.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c
index d6bf32405b3b..90702cef8b64 100644
--- a/sound/soc/intel/skylake/bxt-sst.c
+++ b/sound/soc/intel/skylake/bxt-sst.c
@@ -175,9 +175,12 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx)
175 if (ctx->fw == NULL) 175 if (ctx->fw == NULL)
176 goto sst_load_base_firmware_failed; 176 goto sst_load_base_firmware_failed;
177 177
178 ret = snd_skl_parse_uuids(ctx, ctx->fw, BXT_ADSP_FW_BIN_HDR_OFFSET, 0); 178 /* prase uuids on first boot */
179 if (ret < 0) 179 if (skl->is_first_boot) {
180 goto sst_load_base_firmware_failed; 180 ret = snd_skl_parse_uuids(ctx, ctx->fw, BXT_ADSP_FW_BIN_HDR_OFFSET, 0);
181 if (ret < 0)
182 goto sst_load_base_firmware_failed;
183 }
181 184
182 stripped_fw.data = ctx->fw->data; 185 stripped_fw.data = ctx->fw->data;
183 stripped_fw.size = ctx->fw->size; 186 stripped_fw.size = ctx->fw->size;