ASoC: Intel: Skylake: Add DSP muti-core infrastructure

[deliverable/linux.git] / sound / soc / intel / skylake / skl-sst.c

diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c
index 13ec8d53b526d49e57c50e069fdc5ca076ec5fd1..ecaca94d2a968c8af4eb0e3b1005d0b02863fd8a 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst.c
+++ b/sound/soc/intel/skylake/skl-sst.c
@@ -68,10 +68,13 @@ static int skl_transfer_firmware(struct sst_dsp *ctx,
        return ret;
 }
 
+#define SKL_ADSP_FW_BIN_HDR_OFFSET 0x284
+
 static int skl_load_base_firmware(struct sst_dsp *ctx)
 {
        int ret = 0, i;
        struct skl_sst *skl = ctx->thread_context;
+       struct firmware stripped_fw;
        u32 reg;
 
        skl->boot_complete = false;
@@ -81,11 +84,25 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)
                ret = request_firmware(&ctx->fw, ctx->fw_name, ctx->dev);
                if (ret < 0) {
                        dev_err(ctx->dev, "Request firmware failed %d\n", ret);
-                       skl_dsp_disable_core(ctx);
                        return -EIO;
                }
        }
 
+       ret = snd_skl_parse_uuids(ctx, SKL_ADSP_FW_BIN_HDR_OFFSET);
+       if (ret < 0) {
+               dev_err(ctx->dev,
+                               "UUID parsing err: %d\n", ret);
+               release_firmware(ctx->fw);
+               skl_dsp_disable_core(ctx, SKL_DSP_CORE0_MASK);
+               return ret;
+       }
+
+       /* check for extended manifest */
+       stripped_fw.data = ctx->fw->data;
+       stripped_fw.size = ctx->fw->size;
+
+       skl_dsp_strip_extended_manifest(&stripped_fw);
+
        ret = skl_dsp_boot(ctx);
        if (ret < 0) {
                dev_err(ctx->dev, "Boot dsp core failed ret: %d", ret);
@@ -119,7 +136,7 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)
                goto transfer_firmware_failed;
        }
 
-       ret = skl_transfer_firmware(ctx, ctx->fw->data, ctx->fw->size);
+       ret = skl_transfer_firmware(ctx, stripped_fw.data, stripped_fw.size);
        if (ret < 0) {
                dev_err(ctx->dev, "Transfer firmware failed%d\n", ret);
                goto transfer_firmware_failed;
@@ -134,18 +151,19 @@ static int skl_load_base_firmware(struct sst_dsp *ctx)
 
                dev_dbg(ctx->dev, "Download firmware successful%d\n", ret);
                skl_dsp_set_state_locked(ctx, SKL_DSP_RUNNING);
+               skl->fw_loaded = true;
        }
        return 0;
 transfer_firmware_failed:
        ctx->cl_dev.ops.cl_cleanup_controller(ctx);
 skl_load_base_firmware_failed:
-       skl_dsp_disable_core(ctx);
+       skl_dsp_disable_core(ctx, SKL_DSP_CORE0_MASK);
        release_firmware(ctx->fw);
        ctx->fw = NULL;
        return ret;
 }
 
-static int skl_set_dsp_D0(struct sst_dsp *ctx)
+static int skl_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id)
 {
        int ret;
 
@@ -160,7 +178,7 @@ static int skl_set_dsp_D0(struct sst_dsp *ctx)
        return ret;
 }
 
-static int skl_set_dsp_D3(struct sst_dsp *ctx)
+static int skl_set_dsp_D3(struct sst_dsp *ctx, unsigned int core_id)
 {
        int ret;
        struct skl_ipc_dxstate_info dx;
@@ -187,7 +205,7 @@ static int skl_set_dsp_D3(struct sst_dsp *ctx)
        skl_ipc_op_int_disable(ctx);
        skl_ipc_int_disable(ctx);
 
-       ret = skl_dsp_disable_core(ctx);
+       ret = skl_dsp_disable_core(ctx, core_id);
        if (ret < 0) {
                dev_err(ctx->dev, "disable dsp core failed ret: %d\n", ret);
                ret = -EIO;
@@ -360,6 +378,19 @@ static int skl_unload_module(struct sst_dsp *ctx, u16 mod_id)
        return ret;
 }
 
+void skl_clear_module_cnt(struct sst_dsp *ctx)
+{
+       struct skl_module_table *module;
+
+       if (list_empty(&ctx->module_list))
+               return;
+
+       list_for_each_entry(module, &ctx->module_list, list) {
+               module->usage_cnt = 0;
+       }
+}
+EXPORT_SYMBOL_GPL(skl_clear_module_cnt);
+
 static void skl_clear_module_table(struct sst_dsp *ctx)
 {
        struct skl_module_table *module, *tmp;
@@ -409,6 +440,7 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
 
        skl->dev = dev;
        skl_dev.thread_context = skl;
+       INIT_LIST_HEAD(&skl->uuid_list);
 
        skl->dsp = skl_dsp_ctx_init(dev, &skl_dev, irq);
        if (!skl->dsp) {
@@ -432,12 +464,16 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
        if (ret)
                return ret;
 
+       skl->cores.count = 2;
+
        ret = sst->fw_ops.load_fw(sst);
        if (ret < 0) {
                dev_err(dev, "Load base fw failed : %d", ret);
                goto cleanup;
        }
 
+       skl_dsp_init_core_state(sst);
+
        if (dsp)
                *dsp = skl;
 
@@ -452,6 +488,7 @@ EXPORT_SYMBOL_GPL(skl_sst_dsp_init);
 void skl_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx)
 {
        skl_clear_module_table(ctx->dsp);
+       skl_freeup_uuid_list(ctx);
        skl_ipc_free(&ctx->ipc);
        ctx->dsp->ops->free(ctx->dsp);
        if (ctx->boot_complete) {