diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-07-26 18:06:46 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-08 11:54:59 +0100 |
| commit | 0bdd6d8bedffdb33586455302b6543ca3f157cc1 (patch) | |
| tree | 2bba014e903a76235fa86133619ce6261449d108 /sound/soc/intel/skylake/bxt-sst.c | |
| parent | e280823c23f9ccc5f3bbd0fb2fa458cd96c1a881 (diff) | |
| download | linux-stable-0bdd6d8bedffdb33586455302b6543ca3f157cc1.tar.gz linux-stable-0bdd6d8bedffdb33586455302b6543ca3f157cc1.tar.bz2 linux-stable-0bdd6d8bedffdb33586455302b6543ca3f157cc1.zip | |
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>
Diffstat (limited to 'sound/soc/intel/skylake/bxt-sst.c')
| -rw-r--r-- | sound/soc/intel/skylake/bxt-sst.c | 9 |
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) if (ctx->fw == NULL) goto sst_load_base_firmware_failed; - ret = snd_skl_parse_uuids(ctx, ctx->fw, BXT_ADSP_FW_BIN_HDR_OFFSET, 0); - if (ret < 0) - goto sst_load_base_firmware_failed; + /* prase uuids on first boot */ + if (skl->is_first_boot) { + ret = snd_skl_parse_uuids(ctx, ctx->fw, BXT_ADSP_FW_BIN_HDR_OFFSET, 0); + if (ret < 0) + goto sst_load_base_firmware_failed; + } stripped_fw.data = ctx->fw->data; stripped_fw.size = ctx->fw->size; |