ASoC: add compress stream support

This patch adds the support to parse the compress dai's and then also adds the
soc-compress.c file while handles the compress stream operations, mostly analogus
to what is done in the soc-pcm.c and aditional handling of the compress
opertaions

Signed-off-by: Namarta Kohli <namartax.kohli@intel.com>
Signed-off-by: Ramesh Babu K V <ramesh.babu@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index c5de0a84566f14ae2a3da251d25441c546640f74..c24de902f5f5c4fd4df0c8a81001f557d49fdfb8 100644 (file)
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -9,6 +9,7 @@ menuconfig SND_SOC
        select SND_JACK if INPUT=y || INPUT=SND
        select REGMAP_I2C if I2C
        select REGMAP_SPI if SPI_MASTER
+       select SND_COMPRESS_OFFLOAD
        ---help---
 
          If you want ASoC support, you should say Y here and also to the

diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 00a555a743b6a0f013de0a57737b49c880244bf0..c1264007b4ee7eb0bd90228edc322b687e0f27e7 100644 (file)
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,5 +1,5 @@
 snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
-snd-soc-core-objs += soc-pcm.o soc-io.o
+snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o
 
 snd-soc-dmaengine-pcm-objs := soc-dmaengine-pcm.o
 obj-$(CONFIG_SND_SOC_DMAENGINE_PCM) += snd-soc-dmaengine-pcm.o

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
new file mode 100644 (file)
index 0000000..88d85ba
--- /dev/null
+++ b/sound/soc/soc-compress.c
@@ -0,0 +1,295 @@
+/*
+ * soc-compress.c  --  ALSA SoC Compress
+ *
+ * Copyright (C) 2012 Intel Corp.
+ *
+ * Authors: Namarta Kohli <namartax.kohli@intel.com>
+ *          Ramesh Babu K V <ramesh.babu@linux.intel.com>
+ *          Vinod Koul <vinod.koul@linux.intel.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+#include <sound/core.h>
+#include <sound/compress_params.h>
+#include <sound/compress_driver.h>
+#include <sound/soc.h>
+#include <sound/initval.h>
+
+static int soc_compr_open(struct snd_compr_stream *cstream)
+{
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_platform *platform = rtd->platform;
+       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       int ret = 0;
+
+       if (platform->driver->compr_ops && platform->driver->compr_ops->open) {
+               ret = platform->driver->compr_ops->open(cstream);
+               if (ret < 0) {
+                       pr_err("compress asoc: can't open platform %s\n", platform->name);
+                       goto out;
+               }
+       }
+
+       if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->startup) {
+               ret = rtd->dai_link->compr_ops->startup(cstream);
+               if (ret < 0) {
+                       pr_err("compress asoc: %s startup failed\n", rtd->dai_link->name);
+                       goto machine_err;
+               }
+       }
+
+       if (cstream->direction == SND_COMPRESS_PLAYBACK) {
+               cpu_dai->playback_active++;
+               codec_dai->playback_active++;
+       } else {
+               cpu_dai->capture_active++;
+               codec_dai->capture_active++;
+       }
+
+       cpu_dai->active++;
+       codec_dai->active++;
+       rtd->codec->active++;
+
+       return 0;
+
+machine_err:
+       if (platform->driver->compr_ops && platform->driver->compr_ops->free)
+               platform->driver->compr_ops->free(cstream);
+out:
+       return ret;
+}
+
+static int soc_compr_free(struct snd_compr_stream *cstream)
+{
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_platform *platform = rtd->platform;
+       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       struct snd_soc_codec *codec = rtd->codec;
+
+       if (cstream->direction == SND_COMPRESS_PLAYBACK) {
+               cpu_dai->playback_active--;
+               codec_dai->playback_active--;
+       } else {
+               cpu_dai->capture_active--;
+               codec_dai->capture_active--;
+       }
+
+       snd_soc_dai_digital_mute(codec_dai, 1);
+
+       cpu_dai->active--;
+       codec_dai->active--;
+       codec->active--;
+
+       if (!cpu_dai->active)
+               cpu_dai->rate = 0;
+
+       if (!codec_dai->active)
+               codec_dai->rate = 0;
+
+
+       if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->shutdown)
+               rtd->dai_link->compr_ops->shutdown(cstream);
+
+       if (platform->driver->compr_ops && platform->driver->compr_ops->free)
+               platform->driver->compr_ops->free(cstream);
+               cpu_dai->runtime = NULL;
+
+       if (cstream->direction == SND_COMPRESS_PLAYBACK) {
+               if (!rtd->pmdown_time || codec->ignore_pmdown_time ||
+                   rtd->dai_link->ignore_pmdown_time) {
+                       snd_soc_dapm_stream_event(rtd,
+                                       SNDRV_PCM_STREAM_PLAYBACK,
+                                       SND_SOC_DAPM_STREAM_STOP);
+               } else
+                       codec_dai->pop_wait = 1;
+                       schedule_delayed_work(&rtd->delayed_work,
+                               msecs_to_jiffies(rtd->pmdown_time));
+       } else {
+               /* capture streams can be powered down now */
+               snd_soc_dapm_stream_event(rtd,
+                       SNDRV_PCM_STREAM_CAPTURE,
+                       SND_SOC_DAPM_STREAM_STOP);
+       }
+
+       return 0;
+}
+
+static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
+{
+
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_platform *platform = rtd->platform;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       int ret = 0;
+
+       if (platform->driver->compr_ops && platform->driver->compr_ops->trigger) {
+               ret = platform->driver->compr_ops->trigger(cstream, cmd);
+               if (ret < 0)
+                       return ret;
+       }
+
+       if (cmd == SNDRV_PCM_TRIGGER_START)
+               snd_soc_dai_digital_mute(codec_dai, 0);
+       else if (cmd == SNDRV_PCM_TRIGGER_STOP)
+               snd_soc_dai_digital_mute(codec_dai, 1);
+
+       return ret;
+}
+
+static int soc_compr_set_params(struct snd_compr_stream *cstream,
+                                       struct snd_compr_params *params)
+{
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_platform *platform = rtd->platform;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       int ret = 0;
+
+       /* first we call set_params for the platform driver
+        * this should configure the soc side
+        * if the machine has compressed ops then we call that as well
+        * expectation is that platform and machine will configure everything
+        * for this compress path, like configuring pcm port for codec
+        */
+       if (platform->driver->compr_ops && platform->driver->compr_ops->set_params) {
+               ret = platform->driver->compr_ops->set_params(cstream, params);
+               if (ret < 0)
+                       return ret;
+       }
+
+       if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->set_params) {
+               ret = rtd->dai_link->compr_ops->set_params(cstream);
+               if (ret < 0)
+                       return ret;
+       }
+
+       snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
+                               SND_SOC_DAPM_STREAM_START);
+
+       return ret;
+}
+
+static int soc_compr_get_params(struct snd_compr_stream *cstream,
+                                       struct snd_codec *params)
+{
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_platform *platform = rtd->platform;
+       int ret = 0;
+
+       if (platform->driver->compr_ops && platform->driver->compr_ops->get_params)
+               ret = platform->driver->compr_ops->get_params(cstream, params);
+
+       return ret;
+}
+
+static int soc_compr_get_caps(struct snd_compr_stream *cstream,
+                               struct snd_compr_caps *caps)
+{
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_platform *platform = rtd->platform;
+       int ret = 0;
+
+       if (platform->driver->compr_ops && platform->driver->compr_ops->get_caps)
+               ret = platform->driver->compr_ops->get_caps(cstream, caps);
+
+       return ret;
+}
+
+static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream,
+                               struct snd_compr_codec_caps *codec)
+{
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_platform *platform = rtd->platform;
+       int ret = 0;
+
+       if (platform->driver->compr_ops && platform->driver->compr_ops->get_codec_caps)
+               ret = platform->driver->compr_ops->get_codec_caps(cstream, codec);
+
+       return ret;
+}
+
+static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
+{
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_platform *platform = rtd->platform;
+       int ret = 0;
+
+       if (platform->driver->compr_ops && platform->driver->compr_ops->ack)
+               ret = platform->driver->compr_ops->ack(cstream, bytes);
+
+       return ret;
+}
+
+static int soc_compr_pointer(struct snd_compr_stream *cstream,
+                       struct snd_compr_tstamp *tstamp)
+{
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_platform *platform = rtd->platform;
+
+       if (platform->driver->compr_ops && platform->driver->compr_ops->pointer)
+                platform->driver->compr_ops->pointer(cstream, tstamp);
+
+       return 0;
+}
+
+/* ASoC Compress operations */
+static struct snd_compr_ops soc_compr_ops = {
+       .open           = soc_compr_open,
+       .free           = soc_compr_free,
+       .set_params     = soc_compr_set_params,
+       .get_params     = soc_compr_get_params,
+       .trigger        = soc_compr_trigger,
+       .pointer        = soc_compr_pointer,
+       .ack            = soc_compr_ack,
+       .get_caps       = soc_compr_get_caps,
+       .get_codec_caps = soc_compr_get_codec_caps
+};
+
+/* create a new compress */
+int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
+{
+       struct snd_soc_codec *codec = rtd->codec;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+       struct snd_compr *compr;
+       char new_name[64];
+       int ret = 0, direction = 0;
+
+       /* check client and interface hw capabilities */
+       snprintf(new_name, sizeof(new_name), "%s %s-%d",
+                       rtd->dai_link->stream_name, codec_dai->name, num);
+       direction = SND_COMPRESS_PLAYBACK;
+       compr = kzalloc(sizeof(*compr), GFP_KERNEL);
+       if (compr == NULL) {
+               snd_printk(KERN_ERR "Cannot allocate compr\n");
+               return -ENOMEM;
+       }
+
+       compr->ops = &soc_compr_ops;
+       mutex_init(&compr->lock);
+       ret = snd_compress_new(rtd->card->snd_card, num, direction, compr);
+       if (ret < 0) {
+               pr_err("compress asoc: can't create compress for codec %s\n",
+                       codec->name);
+               kfree(compr);
+               return ret;
+       }
+
+       rtd->compr = compr;
+       compr->private_data = rtd;
+
+       printk(KERN_INFO "compress asoc: %s <-> %s mapping ok\n", codec_dai->name,
+               cpu_dai->name);
+       return ret;
+}

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index f585d023955110fcfe7a5fff28e2a6d9badfa204..c7a00fd8cc6677996d89121467bb63db435f0296 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1388,37 +1388,48 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
        if (ret < 0)
                pr_warn("asoc: failed to add pmdown_time sysfs:%d\n", ret);
 
-       if (!dai_link->params) {
-               /* create the pcm */
-               ret = soc_new_pcm(rtd, num);
+       if (cpu_dai->driver->compress_dai) {
+               /*create compress_device"*/
+               ret = soc_new_compress(rtd, num);
                if (ret < 0) {
-                       pr_err("asoc: can't create pcm %s :%d\n",
-                              dai_link->stream_name, ret);
+                       pr_err("asoc: can't create compress %s\n",
+                                        dai_link->stream_name);
                        return ret;
                }
        } else {
-               /* link the DAI widgets */
-               play_w = codec_dai->playback_widget;
-               capture_w = cpu_dai->capture_widget;
-               if (play_w && capture_w) {
-                       ret = snd_soc_dapm_new_pcm(card, dai_link->params,
-                                                  capture_w, play_w);
-                       if (ret != 0) {
-                               dev_err(card->dev, "Can't link %s to %s: %d\n",
-                                       play_w->name, capture_w->name, ret);
+
+               if (!dai_link->params) {
+                       /* create the pcm */
+                       ret = soc_new_pcm(rtd, num);
+                       if (ret < 0) {
+                               pr_err("asoc: can't create pcm %s :%d\n",
+                                      dai_link->stream_name, ret);
                                return ret;
                        }
-               }
+               } else {
+                       /* link the DAI widgets */
+                       play_w = codec_dai->playback_widget;
+                       capture_w = cpu_dai->capture_widget;
+                       if (play_w && capture_w) {
+                               ret = snd_soc_dapm_new_pcm(card, dai_link->params,
+                                                  capture_w, play_w);
+                               if (ret != 0) {
+                                       dev_err(card->dev, "Can't link %s to %s: %d\n",
+                                               play_w->name, capture_w->name, ret);
+                                       return ret;
+                               }
+                       }
 
-               play_w = cpu_dai->playback_widget;
-               capture_w = codec_dai->capture_widget;
-               if (play_w && capture_w) {
-                       ret = snd_soc_dapm_new_pcm(card, dai_link->params,
+                       play_w = cpu_dai->playback_widget;
+                       capture_w = codec_dai->capture_widget;
+                       if (play_w && capture_w) {
+                               ret = snd_soc_dapm_new_pcm(card, dai_link->params,
                                                   capture_w, play_w);
-                       if (ret != 0) {
-                               dev_err(card->dev, "Can't link %s to %s: %d\n",
-                                       play_w->name, capture_w->name, ret);
-                               return ret;
+                               if (ret != 0) {
+                                       dev_err(card->dev, "Can't link %s to %s: %d\n",
+                                               play_w->name, capture_w->name, ret);
+                                       return ret;
+                               }
                        }
                }
        }