ASoC: Intel: Skylake: Update FW purge for Broxton

Broxton needs to send Purge firmware IPC to DSP before downloading the
firmware. The DMA id needs to be updated for that.

While at it also update Broxton boot sequence to send purge request after
power up and before yanking off reset.

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>

3 files changed, 17 insertions, 5 deletions

diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c
index e50bac74f4a8..622da5d3e3b3 100644
--- a/sound/soc/intel/skylake/bxt-sst.c
+++ b/sound/soc/intel/skylake/bxt-sst.c
@@ -58,13 +58,19 @@ static int sst_bxt_prepare_fw(struct sst_dsp *ctx,
         ctx->dsp_ops.stream_tag = stream_tag;
         memcpy(ctx->dmab.area, fwdata, fwsize);
 
+        ret = skl_dsp_core_power_up(ctx);
+        if (ret < 0) {
+                dev_err(ctx->dev, "Boot dsp core failed ret: %d\n", ret);
+                goto base_fw_load_failed;
+        }
+
         /* Purge FW request */
         sst_dsp_shim_write(ctx, SKL_ADSP_REG_HIPCI, SKL_ADSP_REG_HIPCI_BUSY |
-                                         BXT_IPC_PURGE_FW | (stream_tag - 1));
+                                (BXT_IPC_PURGE_FW | ((stream_tag - 1) << 9)));
 
-        ret = skl_dsp_enable_core(ctx);
+        ret = skl_dsp_start_core(ctx);
         if (ret < 0) {
-                dev_err(ctx->dev, "Boot dsp core failed ret: %d\n", ret);
+                dev_err(ctx->dev, "Start dsp core failed ret: %d\n", ret);
                 ret = -EIO;
                 goto base_fw_load_failed;
         }
@@ -161,6 +167,10 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx)
         if (ret < 0) {
                 ret = sst_bxt_prepare_fw(ctx, stripped_fw.data, stripped_fw.size);
                 if (ret < 0) {
+                        dev_err(ctx->dev, "Error code=0x%x: FW status=0x%x\n",
+                        sst_dsp_shim_read(ctx, BXT_ADSP_ERROR_CODE),
+                        sst_dsp_shim_read(ctx, BXT_ADSP_FW_STATUS));
+
                         dev_err(ctx->dev, "Core En/ROM load fail:%d\n", ret);
                         goto sst_load_base_firmware_failed;
                 }
diff --git a/sound/soc/intel/skylake/skl-sst-dsp.c b/sound/soc/intel/skylake/skl-sst-dsp.c
index 13c19855ee1a..37b1d24a9a9d 100644
--- a/sound/soc/intel/skylake/skl-sst-dsp.c
+++ b/sound/soc/intel/skylake/skl-sst-dsp.c
@@ -114,7 +114,7 @@ static int skl_dsp_reset_core(struct sst_dsp *ctx)
         return skl_dsp_core_set_reset_state(ctx);
 }
 
-static int skl_dsp_start_core(struct sst_dsp *ctx)
+int skl_dsp_start_core(struct sst_dsp *ctx)
 {
         int ret;
 
@@ -140,7 +140,7 @@ static int skl_dsp_start_core(struct sst_dsp *ctx)
         return ret;
 }
 
-static int skl_dsp_core_power_up(struct sst_dsp *ctx)
+int skl_dsp_core_power_up(struct sst_dsp *ctx)
 {
         int ret;
 
diff --git a/sound/soc/intel/skylake/skl-sst-dsp.h b/sound/soc/intel/skylake/skl-sst-dsp.h
index 7efaf642c10a..22fbe1075cb5 100644
--- a/sound/soc/intel/skylake/skl-sst-dsp.h
+++ b/sound/soc/intel/skylake/skl-sst-dsp.h
@@ -182,5 +182,7 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, unsigned int offset);
 void skl_freeup_uuid_list(struct skl_sst *ctx);
 
 int skl_dsp_strip_extended_manifest(struct firmware *fw);
+int skl_dsp_start_core(struct sst_dsp *ctx);
+int skl_dsp_core_power_up(struct sst_dsp *ctx);
 
 #endif /*__SKL_SST_DSP_H__*/