ASoC: Intel: Skylake: Strip manifest for Skylake platform

Future firmware updates may comes with extended manifest so invoke
skl_dsp_strip_extended_manifest() to check and strip

Signed-off-by: Shreyas NC <shreyas.nc@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c
index 13ec8d53b526d49e57c50e069fdc5ca076ec5fd1..be2c42b815b7dd821c36ca01e0ecd4e3e26de0f7 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst.c
+++ b/sound/soc/intel/skylake/skl-sst.c
@@ -72,6 +72,7 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)
 {
        int ret = 0, i;
        struct skl_sst *skl = ctx->thread_context;
+       struct firmware stripped_fw;
        u32 reg;
 
        skl->boot_complete = false;
@@ -86,6 +87,12 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)
                }
        }
 
+       /* check for extended manifest */
+       stripped_fw.data = ctx->fw->data;
+       stripped_fw.size = ctx->fw->size;
+
+       skl_dsp_strip_extended_manifest(&stripped_fw);
+
        ret = skl_dsp_boot(ctx);
        if (ret < 0) {
                dev_err(ctx->dev, "Boot dsp core failed ret: %d", ret);
@@ -119,7 +126,7 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)
                goto transfer_firmware_failed;
        }
 
-       ret = skl_transfer_firmware(ctx, ctx->fw->data, ctx->fw->size);
+       ret = skl_transfer_firmware(ctx, stripped_fw.data, stripped_fw.size);
        if (ret < 0) {
                dev_err(ctx->dev, "Transfer firmware failed%d\n", ret);
                goto transfer_firmware_failed;