ASoC: Intel: Skylake: Remove MCPS available check

The entire logic for MCPS calculation and DSP scheduling is found
within DSP firmware. Currently driver implements simplistic, inaccurate
logic itself which may prevent pipeline creation despite firmware being
completely fine its parameters.

Remove that logic and leave the MCPS calculation to DSP alone.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20190723145854.8527-4-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index abf8601096070d17765efbe70bcbd16d00f6b3af..2af311150543a03d7d07485782ad3be16d0edbf6 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -142,54 +142,6 @@ static void skl_tplg_alloc_pipe_mem(struct skl_dev *skl,
        skl->resource.mem += mconfig->pipe->memory_pages;
 }
 
-/*
- * Pipeline needs needs DSP CPU resources for computation, this is
- * quantified in MCPS (Million Clocks Per Second) required for module/pipe
- *
- * Each pipelines needs mcps to be allocated. Check if we have mcps for this
- * pipe.
- */
-
-static bool skl_is_pipe_mcps_avail(struct skl_dev *skl,
-                               struct skl_module_cfg *mconfig)
-{
-       u8 res_idx = mconfig->res_idx;
-       struct skl_module_res *res = &mconfig->module->resources[res_idx];
-
-       if (skl->resource.mcps + res->cps > skl->resource.max_mcps) {
-               dev_err(skl->dev,
-                       "%s: module_id %d instance %d\n", __func__,
-                       mconfig->id.module_id, mconfig->id.instance_id);
-               dev_err(skl->dev,
-                       "exceeds ppl mcps available %d > mem %d\n",
-                       skl->resource.max_mcps, skl->resource.mcps);
-               return false;
-       } else {
-               return true;
-       }
-}
-
-static void skl_tplg_alloc_pipe_mcps(struct skl_dev *skl,
-                               struct skl_module_cfg *mconfig)
-{
-       u8 res_idx = mconfig->res_idx;
-       struct skl_module_res *res = &mconfig->module->resources[res_idx];
-
-       skl->resource.mcps += res->cps;
-}
-
-/*
- * Free the mcps when tearing down
- */
-static void
-skl_tplg_free_pipe_mcps(struct skl_dev *skl, struct skl_module_cfg *mconfig)
-{
-       u8 res_idx = mconfig->res_idx;
-       struct skl_module_res *res = &mconfig->module->resources[res_idx];
-
-       skl->resource.mcps -= res->cps;
-}
-
 /*
  * Free the memory when tearing down
  */
@@ -582,10 +534,6 @@ skl_tplg_init_pipe_modules(struct skl_dev *skl, struct skl_pipe *pipe)
                mconfig->fmt_idx = mconfig->mod_cfg[cfg_idx].fmt_idx;
                mconfig->res_idx = mconfig->mod_cfg[cfg_idx].res_idx;
 
-               /* check resource available */
-               if (!skl_is_pipe_mcps_avail(skl, mconfig))
-                       return -ENOMEM;
-
                if (mconfig->module->loadable && skl->dsp->fw_ops.load_mod) {
                        ret = skl->dsp->fw_ops.load_mod(skl->dsp,
                                mconfig->id.module_id, mconfig->guid);
@@ -627,7 +575,7 @@ skl_tplg_init_pipe_modules(struct skl_dev *skl, struct skl_pipe *pipe)
                        skl_put_pvt_id(skl, uuid_mod, &mconfig->id.pvt_id);
                        goto err;
                }
-               skl_tplg_alloc_pipe_mcps(skl, mconfig);
+
                ret = skl_tplg_set_module_params(w, skl);
                if (ret < 0)
                        goto err;
@@ -752,10 +700,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,
        if (ret < 0)
                return ret;
 
-       /* check resource available */
-       if (!skl_is_pipe_mcps_avail(skl, mconfig))
-               return -EBUSY;
-
        if (!skl_is_pipe_mem_avail(skl, mconfig))
                return -ENOMEM;
 
@@ -768,7 +712,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,
                return ret;
 
        skl_tplg_alloc_pipe_mem(skl, mconfig);
-       skl_tplg_alloc_pipe_mcps(skl, mconfig);
 
        /* Init all pipe modules from source to sink */
        ret = skl_tplg_init_pipe_modules(skl, s_pipe);
@@ -1264,7 +1207,6 @@ static int skl_tplg_mixer_dapm_pre_pmd_event(struct snd_soc_dapm_widget *w,
 
 /*
  * in the Post-PMD event of mixer we need to do following:
- *   - Free the mcps used
  *   - Free the mem used
  *   - Unbind the modules within the pipeline
  *   - Delete the pipeline (modules are not required to be explicitly
@@ -1282,7 +1224,6 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w,
        if (s_pipe->state == SKL_PIPE_INVALID)
                return -EINVAL;
 
-       skl_tplg_free_pipe_mcps(skl, mconfig);
        skl_tplg_free_pipe_mem(skl, mconfig);
 
        list_for_each_entry(w_module, &s_pipe->w_list, node) {
@@ -1317,8 +1258,6 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w,
        list_for_each_entry(w_module, &s_pipe->w_list, node) {
                dst_module = w_module->w->priv;
 
-               if (mconfig->m_state >= SKL_MODULE_INIT_DONE)
-                       skl_tplg_free_pipe_mcps(skl, dst_module);
                if (src_module == NULL) {
                        src_module = dst_module;
                        continue;
@@ -1340,7 +1279,6 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w,
 
 /*
  * in the Post-PMD event of PGA we need to do following:
- *   - Free the mcps used
  *   - Stop the pipeline
  *   - In source pipe is connected, unbind with source pipelines
  */
@@ -2984,7 +2922,6 @@ void skl_cleanup_resources(struct skl_dev *skl)
                return;
 
        skl->resource.mem = 0;
-       skl->resource.mcps = 0;
 
        list_for_each_entry(w, &card->widgets, list) {
                if (is_skl_dsp_widget_type(w, skl->dev) && w->priv != NULL)
@@ -3683,7 +3620,6 @@ static void skl_tplg_set_pipe_type(struct skl_dev *skl, struct skl_pipe *pipe)
 }
 
 /* This will be read from topology manifest, currently defined here */
-#define SKL_MAX_MCPS 30000000
 #define SKL_FW_MAX_MEM 1000000
 
 /*
@@ -3720,7 +3656,6 @@ int skl_tplg_init(struct snd_soc_component *component, struct hdac_bus *bus)
                return -EINVAL;
        }
 
-       skl->resource.max_mcps = SKL_MAX_MCPS;
        skl->resource.max_mem = SKL_FW_MAX_MEM;
 
        skl->tplg = fw;

diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index d3d84f4125d9e70d05fc1f0332aa8515f6061ad0..21c33c1af934e913ba5b03bba49d74510260d0df 100644 (file)
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -42,9 +42,7 @@
 #define AZX_REG_VS_EM2_L1SEN           BIT(13)
 
 struct skl_dsp_resource {
-       u32 max_mcps;
        u32 max_mem;
-       u32 mcps;
        u32 mem;
 };