diff options
| author | Senthilnathan Veppur <senthilnathanx.veppur@intel.com> | 2016-07-14 09:05:25 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-14 16:32:51 +0100 |
| commit | c78722676e92dd434de35c7569d6c3f25879621b (patch) | |
| tree | 523b43b034c0b7874cf669161106fc098b1a84f1 /sound | |
| parent | 894a16db293c5383f1d9c819909a27bd6738efde (diff) | |
| download | linux-c78722676e92dd434de35c7569d6c3f25879621b.tar.bz2 | |
ASoC: Intel: Skylake: Fix fw reload failure
FW reload had two issues:
- We need to disable the core 0 on when fw fails
- Before loading firmware mark boot flag as false
This patch fixes these two
Signed-off-by: Senthilnathan Veppur <senthilnathanx.veppur@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/skylake/bxt-sst.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index 9c3750f49c21..16e2ed97d71a 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -139,7 +139,7 @@ static int sst_bxt_prepare_fw(struct sst_dsp *ctx, base_fw_load_failed: ctx->dsp_ops.cleanup(ctx->dev, &ctx->dmab, stream_tag); skl_dsp_core_power_down(ctx, SKL_DSP_CORE_MASK(1)); - skl_dsp_disable_core(ctx, SKL_DSP_CORE_MASK(1)); + skl_dsp_disable_core(ctx, SKL_DSP_CORE0_MASK); return ret; } @@ -232,6 +232,7 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id) unsigned int core_mask = SKL_DSP_CORE_MASK(core_id); if (skl->fw_loaded == false) { + skl->boot_complete = false; ret = bxt_load_base_firmware(ctx); if (ret < 0) dev_err(ctx->dev, "reload fw failed: %d\n", ret); |