Subject: [PATCH 071/104] ASoC: dsp - Add DSP support to core ASoC API/structures

Export inline DAI PCM operations to allow DSP core to individually call BE PCM
operations and ....

Allow machine drivers to specifify DSP FE and BE DAI links.
Add FE and BE state information to PCM rtd.

TODO: split out this into smaller patches.

Signed-off-by: Liam Girdwood <lrg@ti.com>

3 files changed, 133 insertions, 1 deletions

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 5ad5f3a50c6..f298f67b954 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -281,4 +281,98 @@ static inline void *snd_soc_dai_get_drvdata(struct snd_soc_dai *dai)
         return dev_get_drvdata(dai->dev);
 }
 
+/* Backend DAI PCM ops */
+static inline int snd_soc_dai_startup(struct snd_pcm_substream *substream,
+        struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        int ret = 0;
+
+        mutex_lock(&rtd->pcm_mutex);
+
+        if (dai->driver->ops->startup)
+                ret = dai->driver->ops->startup(substream, dai);
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                dai->playback_active++;
+        else
+                dai->capture_active++;
+
+        dai->active++;
+
+        mutex_unlock(&rtd->pcm_mutex);
+        return ret;
+}
+
+static inline void snd_soc_dai_shutdown(struct snd_pcm_substream *substream,
+        struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+
+        mutex_lock(&rtd->pcm_mutex);
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                dai->playback_active--;
+        else
+                dai->capture_active--;
+
+        dai->active--;
+
+        if (dai->driver->ops->shutdown)
+                dai->driver->ops->shutdown(substream, dai);
+        mutex_unlock(&rtd->pcm_mutex);
+}
+
+static inline int snd_soc_dai_hw_params(struct snd_pcm_substream * substream,
+                struct snd_pcm_hw_params *hw_params, struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        int ret = 0;
+
+        mutex_lock(&rtd->pcm_mutex);
+
+        if (dai->driver->ops->hw_params)
+                ret = dai->driver->ops->hw_params(substream, hw_params, dai);
+
+        mutex_unlock(&rtd->pcm_mutex);
+        return ret;
+}
+
+static inline int snd_soc_dai_hw_free(struct snd_pcm_substream *substream,
+        struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        int ret = 0;
+
+        mutex_lock(&rtd->pcm_mutex);
+
+        if (dai->driver->ops->hw_free)
+                ret = dai->driver->ops->hw_free(substream, dai);
+
+        mutex_unlock(&rtd->pcm_mutex);
+        return ret;
+}
+
+static inline int snd_soc_dai_prepare(struct snd_pcm_substream *substream,
+        struct snd_soc_dai *dai)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        int ret = 0;
+
+        mutex_lock(&rtd->pcm_mutex);
+
+        if (dai->driver->ops->prepare)
+                ret = dai->driver->ops->prepare(substream, dai);
+
+        mutex_unlock(&rtd->pcm_mutex);
+        return ret;
+}
+
+static inline int snd_soc_dai_trigger(struct snd_pcm_substream *substream,
+        int cmd, struct snd_soc_dai *dai)
+{
+        if (dai->driver->ops->trigger)
+                return dai->driver->ops->trigger(substream, cmd, dai);
+        return 0;
+}
 #endif
diff --git a/include/sound/soc.h b/include/sound/soc.h
index e52a2fae146..1f661a760ae 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -247,6 +247,7 @@ struct snd_soc_jack;
 struct snd_soc_jack_zone;
 struct snd_soc_jack_pin;
 struct snd_soc_cache_ops;
+struct snd_soc_dsp_link;
 #include <sound/soc-dapm.h>
 
 #ifdef CONFIG_GPIOLIB
@@ -317,6 +318,11 @@ int snd_soc_platform_read(struct snd_soc_platform *platform,
 int snd_soc_platform_write(struct snd_soc_platform *platform,
                                         unsigned int reg, unsigned int val);
 
+struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card,
+                const char *dai_link, int stream);
+struct snd_soc_pcm_runtime *snd_soc_get_pcm_runtime(struct snd_soc_card *card,
+                const char *dai_link);
+
 /* Utility functions to get clock rates from various things */
 int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
 int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);
@@ -701,15 +707,29 @@ struct snd_soc_dai_link {
         const char *cpu_dai_name;
         const char *codec_dai_name;
 
+        struct snd_soc_dsp_link *dsp_link;
+
         /* Keep DAI active over suspend */
         unsigned int ignore_suspend:1;
 
         /* Symmetry requirements */
         unsigned int symmetric_rates:1;
+        /* No PCM created for this DAI link */
+        unsigned int no_pcm:1;
+        /* This DAI link can change CODEC and platform at runtime*/
+        unsigned int dynamic:1;
+        /* This DAI link has no codec side driver*/
+        unsigned int no_codec:1;
+        /* This DAI has a Backend ID */
+        unsigned int be_id;
 
         /* codec/machine specific init - e.g. add machine controls */
         int (*init)(struct snd_soc_pcm_runtime *rtd);
 
+        /* hw_params re-writing for BE and FE sync */
+        int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
+                        struct snd_pcm_hw_params *params);
+
         /* machine stream operations */
         struct snd_soc_ops *ops;
 };
@@ -749,6 +769,7 @@ struct snd_soc_card {
 
         struct list_head list;
         struct mutex mutex;
+        struct mutex dsp_mutex;
 
         bool instantiated;
 
@@ -826,6 +847,16 @@ struct snd_soc_card {
         void *drvdata;
 };
 
+/* DSP runtime data */
+struct snd_soc_dsp_runtime {
+        struct list_head be_clients;
+        struct list_head fe_clients;
+        int users;
+        struct snd_pcm_runtime *runtime;
+        struct snd_pcm_hw_params params;
+        int runtime_update;
+};
+
 /* SoC machine DAI configuration, glues a codec and cpu DAI together */
 struct snd_soc_pcm_runtime  {
         struct device dev;
@@ -838,6 +869,9 @@ struct snd_soc_pcm_runtime  {
         unsigned int complete:1;
         unsigned int dev_registered:1;
 
+        /* DSP runtime data */
+        struct snd_soc_dsp_runtime dsp[2];
+
         /* Symmetry data - only valid if symmetry is being enforced */
         unsigned int rate;
         long pmdown_time;
@@ -850,6 +884,10 @@ struct snd_soc_pcm_runtime  {
         struct snd_soc_dai *cpu_dai;
 
         struct delayed_work delayed_work;
+
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_dsp_root;
+#endif
 };
 
 /* mixer control */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 726d24076e8..b46b8178eb6 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -782,7 +782,7 @@ find_codec:
 
                         /* CODEC found, so find CODEC DAI from registered DAIs from this CODEC*/
                         list_for_each_entry(codec_dai, &dai_list, list) {
-                                if (codec->dev == codec_dai->dev &&
+                                if ((codec->dev == codec_dai->dev || codec->driver == &null_codec_drv) &&
                                                 !strcmp(codec_dai->name, dai_link->codec_dai_name)) {
                                         rtd->codec_dai = codec_dai;
                                         goto find_platform;