ASoC: Intel: Skylake: Clean up of driver resources in suspend

On suspend firmware is re-initialized so resources are reset inside
firmware. Driver should also clear the firmware counters at this time.

Signed-off-by: Dharageswari R <dharageswari.r@intel.com>
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index ff0491716e06401394f00361169462d1c3e2d6aa..1590beff644df9d4f03e5ec58dfd8e5e78e76549 100644 (file)
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -1197,9 +1197,17 @@ static int skl_pcm_new(struct snd_soc_pcm_runtime *rtd)
 static int skl_platform_soc_probe(struct snd_soc_platform *platform)
 {
        struct hdac_ext_bus *ebus = dev_get_drvdata(platform->dev);
+       struct skl *skl = ebus_to_skl(ebus);
+       int ret;
 
-       if (ebus->ppcap)
-               return skl_tplg_init(platform, ebus);
+       if (ebus->ppcap) {
+               ret = skl_tplg_init(platform, ebus);
+               if (ret < 0) {
+                       dev_err(platform->dev, "Failed to init topology!\n");
+                       return ret;
+               }
+               skl->platform = platform;
+       }
 
        return 0;
 }

diff --git a/sound/soc/intel/skylake/skl-sst-ipc.h b/sound/soc/intel/skylake/skl-sst-ipc.h
index 7b55182b78953c7dc438fef66f83e0e576d67423..9f24261abf3eb3be225dad499982345360afcacf 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst-ipc.h
+++ b/sound/soc/intel/skylake/skl-sst-ipc.h
@@ -139,5 +139,6 @@ void skl_ipc_int_disable(struct sst_dsp *dsp);
 bool skl_ipc_int_status(struct sst_dsp *dsp);
 void skl_ipc_free(struct sst_generic_ipc *ipc);
 int skl_ipc_init(struct device *dev, struct skl_sst *skl);
+void skl_clear_module_cnt(struct sst_dsp *ctx);
 
 #endif /* __SKL_IPC_H */

diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c
index 6021fa6ed80d7042b1a00e246806871b6c07b9f9..4cabae54a71e271b85a882bbcf763529107d7063 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst.c
+++ b/sound/soc/intel/skylake/skl-sst.c
@@ -379,6 +379,16 @@ 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;
+
+       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;

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 67b1ab5019189788a5eff34a15a82c6d715957ac..263c03df9a2a7e9881913f676b023fc3e6e99cd4 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1557,6 +1557,55 @@ static void skl_tplg_fill_fmt(struct skl_module_fmt *dst_fmt,
        }
 }
 
+static void skl_clear_pin_config(struct snd_soc_platform *platform,
+                               struct snd_soc_dapm_widget *w)
+{
+       int i;
+       struct skl_module_cfg *mconfig;
+       struct skl_pipe *pipe;
+
+       if (!strncmp(w->dapm->component->name, platform->component.name,
+                                       strlen(platform->component.name))) {
+               mconfig = w->priv;
+               pipe = mconfig->pipe;
+               for (i = 0; i < mconfig->max_in_queue; i++) {
+                       mconfig->m_in_pin[i].in_use = false;
+                       mconfig->m_in_pin[i].pin_state = SKL_PIN_UNBIND;
+               }
+               for (i = 0; i < mconfig->max_out_queue; i++) {
+                       mconfig->m_out_pin[i].in_use = false;
+                       mconfig->m_out_pin[i].pin_state = SKL_PIN_UNBIND;
+               }
+               pipe->state = SKL_PIPE_INVALID;
+               mconfig->m_state = SKL_MODULE_UNINIT;
+       }
+}
+
+void skl_cleanup_resources(struct skl *skl)
+{
+       struct skl_sst *ctx = skl->skl_sst;
+       struct snd_soc_platform *soc_platform = skl->platform;
+       struct snd_soc_dapm_widget *w;
+       struct snd_soc_card *card;
+
+       if (soc_platform == NULL)
+               return;
+
+       card = soc_platform->component.card;
+       if (!card || !card->instantiated)
+               return;
+
+       skl->resource.mem = 0;
+       skl->resource.mcps = 0;
+
+       list_for_each_entry(w, &card->widgets, list) {
+               if (is_skl_dsp_widget_type(w) && (w->priv != NULL))
+                       skl_clear_pin_config(soc_platform, w);
+       }
+
+       skl_clear_module_cnt(ctx->dsp);
+}
+
 /*
  * Topology core widget load callback
  *

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index cb3eb41524ecbbe1f7174dad3ce642500e47dd46..c0f5d5565deafefbd41242422789c03f84117d20 100644 (file)
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -201,6 +201,7 @@ static int _skl_suspend(struct hdac_ext_bus *ebus)
        skl_enable_miscbdcge(bus->dev, false);
        snd_hdac_bus_enter_link_reset(bus);
        skl_enable_miscbdcge(bus->dev, true);
+       skl_cleanup_resources(skl);
 
        return 0;
 }

diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index 25b8d4897ff57cd3c7991ff93750ccc69635981a..9064e5b0d67689be97299d5f5ae2f9a361a547f6 100644 (file)
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -67,6 +67,7 @@ struct skl {
        unsigned int init_failed:1; /* delayed init failed */
        struct platform_device *dmic_dev;
        struct platform_device *i2s_dev;
+       struct snd_soc_platform *platform;
 
        struct nhlt_acpi_table *nhlt; /* nhlt ptr */
        struct skl_sst *skl_sst; /* sst skl ctx */
@@ -121,4 +122,5 @@ int skl_init_dsp(struct skl *skl);
 int skl_free_dsp(struct skl *skl);
 int skl_suspend_dsp(struct skl *skl);
 int skl_resume_dsp(struct skl *skl);
+void skl_cleanup_resources(struct skl *skl);
 #endif /* __SOUND_SOC_SKL_H */