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>

diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c
index 2a2bb944cd40e2cf9e9f470a3cd0686aaa01f626..600d958919968a3a3add21fd99b0fd25e3f41f51 100644 (file)
--- 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 */