ASoC: Intel: Skylake: Await purge request ack on CNL

Each purge request is sent by driver after master core is powered up and
unresetted but before it is unstalled. On unstall, ROM begins processing
the request and initializing environment for FW load. Host should await
ROM's ack before moving forward. Without doing so, ROM init poll may
start too early and false timeouts can occur.

Fixes: cb6a55284629 ("ASoC: Intel: cnl: Add sst library functions for cnl platform")
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200305145314.32579-8-cezary.rojewski@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 cdafade8abd67222ae11e3b1900c66edf71d63cf..38b9d74940835913e3796cef48331a1f0f0b5072 100644 (file)
--- a/sound/soc/intel/skylake/bxt-sst.c
+++ b/sound/soc/intel/skylake/bxt-sst.c
@@ -17,7 +17,6 @@
 #include "skl.h"
 
 #define BXT_BASEFW_TIMEOUT     3000
-#define BXT_INIT_TIMEOUT       300
 #define BXT_ROM_INIT_TIMEOUT   70
 #define BXT_IPC_PURGE_FW       0x01004000
 

diff --git a/sound/soc/intel/skylake/cnl-sst.c b/sound/soc/intel/skylake/cnl-sst.c
index 060e47ae339149f760f0b4178ee5dbb157d4575f..c6abcd5aa67b96201d2d8a9dcb611e6dafb31c09 100644 (file)
--- a/sound/soc/intel/skylake/cnl-sst.c
+++ b/sound/soc/intel/skylake/cnl-sst.c
@@ -57,18 +57,34 @@ static int cnl_prepare_fw(struct sst_dsp *ctx, const void *fwdata, u32 fwsize)
        ctx->dsp_ops.stream_tag = stream_tag;
        memcpy(ctx->dmab.area, fwdata, fwsize);
 
+       ret = skl_dsp_core_power_up(ctx, SKL_DSP_CORE0_MASK);
+       if (ret < 0) {
+               dev_err(ctx->dev, "dsp core0 power up failed\n");
+               ret = -EIO;
+               goto base_fw_load_failed;
+       }
+
        /* purge FW request */
        sst_dsp_shim_write(ctx, CNL_ADSP_REG_HIPCIDR,
                           CNL_ADSP_REG_HIPCIDR_BUSY | (CNL_IPC_PURGE |
                           ((stream_tag - 1) << CNL_ROM_CTRL_DMA_ID)));
 
-       ret = cnl_dsp_enable_core(ctx, SKL_DSP_CORE0_MASK);
+       ret = skl_dsp_start_core(ctx, SKL_DSP_CORE0_MASK);
        if (ret < 0) {
-               dev_err(ctx->dev, "dsp boot 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;
        }
 
+       ret = sst_dsp_register_poll(ctx, CNL_ADSP_REG_HIPCIDA,
+                                   CNL_ADSP_REG_HIPCIDA_DONE,
+                                   CNL_ADSP_REG_HIPCIDA_DONE,
+                                   BXT_INIT_TIMEOUT, "HIPCIDA Done");
+       if (ret < 0) {
+               dev_err(ctx->dev, "timeout for purge request: %d\n", ret);
+               goto base_fw_load_failed;
+       }
+
        /* enable interrupt */
        cnl_ipc_int_enable(ctx);
        cnl_ipc_op_int_enable(ctx);

diff --git a/sound/soc/intel/skylake/skl-sst-dsp.h b/sound/soc/intel/skylake/skl-sst-dsp.h
index 067d1ea11cde4f56dfea18108b7846f960a3915c..1df9ef422f61df24f90dafaec112cf3099507e1b 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst-dsp.h
+++ b/sound/soc/intel/skylake/skl-sst-dsp.h
@@ -68,6 +68,7 @@ struct skl_dev;
 #define SKL_FW_INIT                    0x1
 #define SKL_FW_RFW_START               0xf
 #define BXT_FW_ROM_INIT_RETRY          3
+#define BXT_INIT_TIMEOUT               300
 
 #define SKL_ADSPIC_IPC                 1
 #define SKL_ADSPIS_IPC                 1