diff options
| author | Jeeja KP <jeeja.kp@intel.com> | 2017-03-13 17:41:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-03-15 18:28:04 +0100 |
| commit | 03de8c2ef82fae29d53de7eb86b0ca10501499fc (patch) | |
| tree | 5b1b41807c408de944df8aa038c4ca814b19805b /sound/soc/intel/skylake/bxt-sst.c | |
| parent | ASoC: Intel: bxtn: Update DSP core state in D0 (diff) | |
| download | linux-03de8c2ef82fae29d53de7eb86b0ca10501499fc.tar.xz linux-03de8c2ef82fae29d53de7eb86b0ca10501499fc.zip | |
ASoC: Intel: bxtn: Reload the firmware in case of D3 failure
If D3 IPC fails or times out, firmware needs to be reloaded as driver
continues the reset.
So set the fw_load flag to false to reload the firmware in D0.
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Acked-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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index 2a2bb944cd40..600d95891996 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -533,10 +533,16 @@ static int bxt_set_dsp_D3(struct sst_dsp *ctx, unsigned int core_id) ret = skl_ipc_set_dx(&skl->ipc, BXT_INSTANCE_ID, BXT_BASE_FW_MODULE_ID, &dx); - if (ret < 0) + if (ret < 0) { dev_err(ctx->dev, "Failed to set DSP to D3:core id = %d;Continue reset\n", core_id); + /* + * In case of D3 failure, re-download the firmware, so set + * fw_loaded to false. + */ + skl->fw_loaded = false; + } if (core_id == SKL_DSP_CORE0_ID) { /* disable Interrupt */ |