|
@@ -185,6 +185,7 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx)
|
|
} else {
|
|
} else {
|
|
skl_dsp_set_state_locked(ctx, SKL_DSP_RUNNING);
|
|
skl_dsp_set_state_locked(ctx, SKL_DSP_RUNNING);
|
|
ret = 0;
|
|
ret = 0;
|
|
|
|
+ skl->fw_loaded = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -200,6 +201,14 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx)
|
|
|
|
|
|
skl->boot_complete = false;
|
|
skl->boot_complete = false;
|
|
|
|
|
|
|
|
+ if (skl->fw_loaded == false) {
|
|
|
|
+ dev_dbg(ctx->dev, "Re-loading fw\n");
|
|
|
|
+ ret = bxt_load_base_firmware(ctx);
|
|
|
|
+ if (ret < 0)
|
|
|
|
+ dev_err(ctx->dev, "reload fw failed: %d\n", ret);
|
|
|
|
+ return ret;
|
|
|
|
+ }
|
|
|
|
+
|
|
ret = skl_dsp_enable_core(ctx);
|
|
ret = skl_dsp_enable_core(ctx);
|
|
if (ret < 0) {
|
|
if (ret < 0) {
|
|
dev_err(ctx->dev, "enable dsp core failed ret: %d\n", ret);
|
|
dev_err(ctx->dev, "enable dsp core failed ret: %d\n", ret);
|