1 files changed, 118 insertions, 65 deletions

diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c
index 262c1de364d8..9cb4a80df98e 100644
--- a/sound/soc/blackfin/bf5xx-i2s-pcm.c
+++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c
@@ -39,8 +39,8 @@
 
 #include <asm/dma.h>
 
-#include "bf5xx-i2s-pcm.h"
 #include "bf5xx-sport.h"
+#include "bf5xx-i2s-pcm.h"
 
 static void bf5xx_dma_irq(void *data)
 {
@@ -50,7 +50,6 @@ static void bf5xx_dma_irq(void *data)
 
 static const struct snd_pcm_hardware bf5xx_pcm_hardware = {
         .info                   = SNDRV_PCM_INFO_INTERLEAVED |
-                                   SNDRV_PCM_INFO_MMAP |
                                    SNDRV_PCM_INFO_MMAP_VALID |
                                    SNDRV_PCM_INFO_BLOCK_TRANSFER,
         .formats                = SNDRV_PCM_FMTBIT_S16_LE |
@@ -67,10 +66,16 @@ static const struct snd_pcm_hardware bf5xx_pcm_hardware = {
 static int bf5xx_pcm_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
-        size_t size = bf5xx_pcm_hardware.buffer_bytes_max;
-        snd_pcm_lib_malloc_pages(substream, size);
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        unsigned int buffer_size = params_buffer_bytes(params);
+        struct bf5xx_i2s_pcm_data *dma_data;
 
-        return 0;
+        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+
+        if (dma_data->tdm_mode)
+                buffer_size = buffer_size / params_channels(params) * 8;
+
+        return snd_pcm_lib_malloc_pages(substream, buffer_size);
 }
 
 static int bf5xx_pcm_hw_free(struct snd_pcm_substream *substream)
@@ -82,9 +87,16 @@ static int bf5xx_pcm_hw_free(struct snd_pcm_substream *substream)
 
 static int bf5xx_pcm_prepare(struct snd_pcm_substream *substream)
 {
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct sport_device *sport = runtime->private_data;
         int period_bytes = frames_to_bytes(runtime, runtime->period_size);
+        struct bf5xx_i2s_pcm_data *dma_data;
+
+        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+
+        if (dma_data->tdm_mode)
+                period_bytes = period_bytes / runtime->channels * 8;
 
         pr_debug("%s enter\n", __func__);
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
@@ -131,10 +143,15 @@ static int bf5xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 
 static snd_pcm_uframes_t bf5xx_pcm_pointer(struct snd_pcm_substream *substream)
 {
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct sport_device *sport = runtime->private_data;
         unsigned int diff;
         snd_pcm_uframes_t frames;
+        struct bf5xx_i2s_pcm_data *dma_data;
+
+        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+
         pr_debug("%s enter\n", __func__);
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 diff = sport_curr_offset_tx(sport);
@@ -151,6 +168,8 @@ static snd_pcm_uframes_t bf5xx_pcm_pointer(struct snd_pcm_substream *substream)
                 diff = 0;
 
         frames = bytes_to_frames(substream->runtime, diff);
+        if (dma_data->tdm_mode)
+                frames = frames * runtime->channels / 8;
 
         return frames;
 }
@@ -162,11 +181,18 @@ static int bf5xx_pcm_open(struct snd_pcm_substream *substream)
         struct sport_device *sport_handle = snd_soc_dai_get_drvdata(cpu_dai);
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_dma_buffer *buf = &substream->dma_buffer;
+        struct bf5xx_i2s_pcm_data *dma_data;
         int ret;
 
+        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+
         pr_debug("%s enter\n", __func__);
 
         snd_soc_set_runtime_hwparams(substream, &bf5xx_pcm_hardware);
+        if (dma_data->tdm_mode)
+                runtime->hw.buffer_bytes_max /= 4;
+        else
+                runtime->hw.info |= SNDRV_PCM_INFO_MMAP;
 
         ret = snd_pcm_hw_constraint_integer(runtime,
                         SNDRV_PCM_HW_PARAM_PERIODS);
@@ -202,6 +228,88 @@ static int bf5xx_pcm_mmap(struct snd_pcm_substream *substream,
         return 0 ;
 }
 
+static int bf5xx_pcm_copy(struct snd_pcm_substream *substream, int channel,
+        snd_pcm_uframes_t pos, void *buf, snd_pcm_uframes_t count)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        unsigned int sample_size = runtime->sample_bits / 8;
+        struct bf5xx_i2s_pcm_data *dma_data;
+        unsigned int i;
+        void *src, *dst;
+
+        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+
+        if (dma_data->tdm_mode) {
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                        src = buf;
+                        dst = runtime->dma_area;
+                        dst += pos * sample_size * 8;
+
+                        while (count--) {
+                                for (i = 0; i < runtime->channels; i++) {
+                                        memcpy(dst + dma_data->map[i] *
+                                                sample_size, src, sample_size);
+                                        src += sample_size;
+                                }
+                                dst += 8 * sample_size;
+                        }
+                } else {
+                        src = runtime->dma_area;
+                        src += pos * sample_size * 8;
+                        dst = buf;
+
+                        while (count--) {
+                                for (i = 0; i < runtime->channels; i++) {
+                                        memcpy(dst, src + dma_data->map[i] *
+                                                sample_size, sample_size);
+                                        dst += sample_size;
+                                }
+                                src += 8 * sample_size;
+                        }
+                }
+        } else {
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                        src = buf;
+                        dst = runtime->dma_area;
+                        dst += frames_to_bytes(runtime, pos);
+                } else {
+                        src = runtime->dma_area;
+                        src += frames_to_bytes(runtime, pos);
+                        dst = buf;
+                }
+
+                memcpy(dst, src, frames_to_bytes(runtime, count));
+        }
+
+        return 0;
+}
+
+static int bf5xx_pcm_silence(struct snd_pcm_substream *substream,
+        int channel, snd_pcm_uframes_t pos, snd_pcm_uframes_t count)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        unsigned int sample_size = runtime->sample_bits / 8;
+        void *buf = runtime->dma_area;
+        struct bf5xx_i2s_pcm_data *dma_data;
+        unsigned int offset, size;
+
+        dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+
+        if (dma_data->tdm_mode) {
+                offset = pos * 8 * sample_size;
+                size = count * 8 * sample_size;
+        } else {
+                offset = frames_to_bytes(runtime, pos);
+                size = frames_to_bytes(runtime, count);
+        }
+
+        snd_pcm_format_set_silence(runtime->format, buf + offset, size);
+
+        return 0;
+}
+
 static struct snd_pcm_ops bf5xx_pcm_i2s_ops = {
         .open           = bf5xx_pcm_open,
         .ioctl          = snd_pcm_lib_ioctl,
@@ -211,57 +319,16 @@ static struct snd_pcm_ops bf5xx_pcm_i2s_ops = {
         .trigger        = bf5xx_pcm_trigger,
         .pointer        = bf5xx_pcm_pointer,
         .mmap           = bf5xx_pcm_mmap,
+        .copy           = bf5xx_pcm_copy,
+        .silence        = bf5xx_pcm_silence,
 };
 
-static int bf5xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
-{
-        struct snd_pcm_substream *substream = pcm->streams[stream].substream;
-        struct snd_dma_buffer *buf = &substream->dma_buffer;
-        size_t size = bf5xx_pcm_hardware.buffer_bytes_max;
-
-        buf->dev.type = SNDRV_DMA_TYPE_DEV;
-        buf->dev.dev = pcm->card->dev;
-        buf->private_data = NULL;
-        buf->area = dma_alloc_coherent(pcm->card->dev, size,
-                        &buf->addr, GFP_KERNEL);
-        if (!buf->area) {
-                pr_err("Failed to allocate dma memory - Please increase uncached DMA memory region\n");
-                return -ENOMEM;
-        }
-        buf->bytes = size;
-
-        pr_debug("%s, area:%p, size:0x%08lx\n", __func__,
-                buf->area, buf->bytes);
-
-        return 0;
-}
-
-static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm)
-{
-        struct snd_pcm_substream *substream;
-        struct snd_dma_buffer *buf;
-        int stream;
-
-        for (stream = 0; stream < 2; stream++) {
-                substream = pcm->streams[stream].substream;
-                if (!substream)
-                        continue;
-
-                buf = &substream->dma_buffer;
-                if (!buf->area)
-                        continue;
-                dma_free_coherent(NULL, buf->bytes, buf->area, 0);
-                buf->area = NULL;
-        }
-}
-
 static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
 
 static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_card *card = rtd->card->snd_card;
-        struct snd_pcm *pcm = rtd->pcm;
-        int ret = 0;
+        size_t size = bf5xx_pcm_hardware.buffer_bytes_max;
 
         pr_debug("%s enter\n", __func__);
         if (!card->dev->dma_mask)
@@ -269,27 +336,13 @@ static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)
         if (!card->dev->coherent_dma_mask)
                 card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
 
-        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
-                ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
-                        SNDRV_PCM_STREAM_PLAYBACK);
-                if (ret)
-                        goto out;
-        }
-
-        if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
-                ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
-                        SNDRV_PCM_STREAM_CAPTURE);
-                if (ret)
-                        goto out;
-        }
- out:
-        return ret;
+        return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
+                                SNDRV_DMA_TYPE_DEV, card->dev, size, size);
 }
 
 static struct snd_soc_platform_driver bf5xx_i2s_soc_platform = {
         .ops            = &bf5xx_pcm_i2s_ops,
         .pcm_new        = bf5xx_pcm_i2s_new,
-        .pcm_free       = bf5xx_pcm_free_dma_buffers,
 };
 
 static int bfin_i2s_soc_platform_probe(struct platform_device *pdev)