p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Vinod Koul 2016-05-30 17:42:57 +05:30 committed by Mark Brown
parent fdfa82ee14
commit cd63655e80
1 changed files with 8 additions and 1 deletions
sound/soc/intel/skylake
skl-sst.c

9
sound/soc/intel/skylake/skl-sst.c
View File

@ -72,6 +72,7 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)
{ {
int ret = 0, i; int ret = 0, i;
struct skl_sst *skl = ctx->thread_context; struct skl_sst *skl = ctx->thread_context;
struct firmware stripped_fw;
u32 reg; u32 reg;
skl->boot_complete = false; 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); ret = skl_dsp_boot(ctx);
if (ret < 0) { if (ret < 0) {
dev_err(ctx->dev, "Boot dsp core failed ret: %d", ret); 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; 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) { if (ret < 0) {
dev_err(ctx->dev, "Transfer firmware failed%d\n", ret); dev_err(ctx->dev, "Transfer firmware failed%d\n", ret);
goto transfer_firmware_failed; goto transfer_firmware_failed;