ASoC: davinci: replace private sram api with genalloc
Subsystems (5)
PATCH RESEND 1/2 ASoC: davinci: replace private sram api with genalloc
From: Matt Porter <[email protected]>
Removes the DaVinci private SRAM API and replaces it with the genalloc API. The SRAM gen_pool is passed in pdata since DaVinci is in the early stages of DT conversion.
[[email protected]: stub out gen_pool functions for
!CONFIG_GENERIC_ALLOCATOR]
--- include/linux/platform_data/davinci_asp.h | 3 +++ sound/soc/davinci/davinci-mcasp.c | 2 ++ sound/soc/davinci/davinci-pcm.c | 37 ++++++++++++++++++++++++++----- sound/soc/davinci/davinci-pcm.h | 2 ++ 4 files changed, 38 insertions(+), 6 deletions(-)
include/linux/platform_data/davinci_asp.h +3 -0
@@ -16,6 +16,8 @@ #ifndef __DAVINCI_ASP_H #define __DAVINCI_ASP_H +#include <linux/genalloc.h> + struct snd_platform_data { u32 tx_dma_offset; u32 rx_dma_offset;
@@ -30,6 +32,7 @@ struct snd_platform_data { unsigned enable_channel_combine:1;unsigned sram_size_playback;unsigned sram_size_capture; +struct gen_pool *sram_pool;/* * If McBSP peripheral gets the clock from an external pin,
sound/soc/davinci/davinci-mcasp.c +2 -0
@@ -1098,6 +1098,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) dma_data = &dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK ]; dma_data->asp_chan_q = pdata->asp_chan_q; dma_data->ram_chan_q = pdata->ram_chan_q; + dma_data->sram_pool = pdata->sram_pool; dma_data->sram_size = pdata->sram_size_playback; dma_data->dma_addr = (dma_addr_t) (pdata->tx_dma_offset + mem->start);
@@ -1115,6 +1116,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) dma_data = &dev->dma_params[SNDRV_PCM_STREAM_CAPTURE ]; dma_data->asp_chan_q = pdata->asp_chan_q; dma_data->ram_chan_q = pdata->ram_chan_q; + dma_data->sram_pool = pdata->sram_pool; dma_data->sram_size = pdata->sram_size_capture; dma_data->dma_addr = (dma_addr_t)(pdata->rx_dma_offset + mem->start);
sound/soc/davinci/davinci-pcm.c +31 -6
@@ -16,6 +16,7 @@#include <linux/slab.h> #include <linux/dma-mapping.h> #include <linux/kernel.h> +#include <linux/genalloc.h> #include <sound/core.h> #include <sound/pcm.h>
@@ -23,7 +24,6 @@#include <sound/soc.h> #include <asm/dma.h> -#include <mach/sram.h> #include "davinci-pcm.h"
@@ -259,7 +259,9 @@ static void davinci_pcm_dma_irq(unsigned link, u16 ch_status, void *data) } } -static int allocate_sram (struct snd_pcm_substream *substream,unsigned size, +#ifdef CONFIG_GENERIC_ALLOCATOR +static int allocate_sram (struct snd_pcm_substream *substream, +struct gen_pool *sram_pool,unsigned size,struct snd_pcm_hardware *ppcm) {struct snd_dma_buffer *buf = &substream->dma_buffer;
@@ -271,9 +273,10 @@ static int allocate_sram(struct snd_pcm_substream *substream, unsigned size,return 0 ; ppcm->period_bytes_max = size; - iram_virt =sram_alloc (size, &iram_phys); + iram_virt = (void *)gen_pool_alloc (sram_pool, size);if (!iram_virt) goto exit1; + iram_phys =gen_pool_virt_to_phys (sram_pool, (unsigned )iram_virt); iram_dma =kzalloc (sizeof (*iram_dma),GFP_KERNEL );if (!iram_dma) goto exit2;
@@ -285,11 +288,33 @@ static int allocate_sram(struct snd_pcm_substream *substream, unsigned size,return 0 ; exit2:if (iram_virt) -sram_free (iram_virt, size); +gen_pool_free (sram_pool, (unsigned )iram_virt, size); exit1: return -ENOMEM; } +static void davinci_free_sram (struct snd_pcm_substream *substream, +struct snd_dma_buffer *iram_dma) +{ +struct davinci_runtime_data *prtd = substream->runtime->private_data; +struct gen_pool *sram_pool = prtd->params->sram_pool; + +gen_pool_free (sram_pool, (unsigned ) iram_dma->area, iram_dma->bytes); +} +#else +static int allocate_sram (struct snd_pcm_substream *substream, +struct gen_pool *sram_pool,unsigned size, +struct snd_pcm_hardware *ppcm) +{ +return 0 ; +} + +static void davinci_free_sram (struct snd_pcm_substream *substream, +struct snd_dma_buffer *iram_dma) +{ +} +#endif +/* * Only used with ping/pong. * This is called after runtime->dma_addr, period_bytes and data_type are valid
@@ -676,7 +701,7 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream) ppcm = (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) ? &pcm_hardware_playback : &pcm_hardware_capture; -allocate_sram (substream, params->sram_size, ppcm); +allocate_sram (substream, params->sram_pool, params->sram_size, ppcm);snd_soc_set_runtime_hwparams (substream, ppcm);/* ensure that buffer size is a multiple of period size */ ret = snd_pcm_hw_constraint_integer(runtime,
@@ -819,7 +844,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm) buf->area =NULL ; iram_dma = buf->private_data;if (iram_dma) { -sram_free (iram_dma->area, iram_dma->bytes); +davinci_free_sram (substream, iram_dma);kfree (iram_dma); } }
sound/soc/davinci/davinci-pcm.h +2 -0
@@ -12,6 +12,7 @@#ifndef _DAVINCI_PCM_H#define _DAVINCI_PCM_H +#include <linux/genalloc.h> #include <linux/platform_data/davinci_asp.h> #include <mach/edma.h>
@@ -20,6 +21,7 @@ struct davinci_pcm_dma_params {unsigned short acnt;dma_addr_t dma_addr;/* device physical address for DMA */ unsigned sram_size; +struct gen_pool *sram_pool;/* SRAM gen_pool for ping pong */ enum dma_event_q asp_chan_q;/* event queue number for ASP channel */ enum dma_event_q ram_chan_q;/* event queue number for RAM channel */ unsigned char data_type;/* xfer data type */
Signature · 1 line
1.7.11.7
PATCH RESEND 2/2 ARM: davinci: enable SRAM ping ping buffering on DA850
From: Matt Porter <[email protected]>
Passes the DA850 shared SRAM gen_pool to the McASP driver and enables the ping-pong buffer DMA support.
--- arch/arm/mach-davinci/board-da850-evm.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
arch/arm/mach-davinci/board-da850-evm.c +14 -10
@@ -762,16 +762,19 @@ static u8 da850_iis_serializer_direction[] = { };static struct snd_platform_data da850_evm_snd_data = { - .tx_dma_offset =0x2000 , - .rx_dma_offset =0x2000 , - .op_mode =DAVINCI_MCASP_IIS_MODE , - .num_serializer =ARRAY_SIZE (da850_iis_serializer_direction), - .tdm_slots =2 , - .serial_dir = da850_iis_serializer_direction, - .asp_chan_q =EVENTQ_0 , - .version =MCASP_VERSION_2 , - .txnumevt =1 , - .rxnumevt =1 , + .tx_dma_offset =0x2000 , + .rx_dma_offset =0x2000 , + .op_mode =DAVINCI_MCASP_IIS_MODE , + .num_serializer =ARRAY_SIZE (da850_iis_serializer_direction), + .tdm_slots =2 , + .serial_dir = da850_iis_serializer_direction, + .asp_chan_q =EVENTQ_0 , + .ram_chan_q =EVENTQ_1 , + .version =MCASP_VERSION_2 , + .txnumevt =1 , + .rxnumevt =1 , + .sram_size_playback =SZ_8K , + .sram_size_capture =SZ_8K , };static const short da850_evm_mcasp_pins[]__initconst = {
@@ -1509,6 +1512,7 @@ static __init void da850_evm_init(void)pr_warning ("da850_evm_init: mcasp mux setup failed: %d\n" , ret); + da850_evm_snd_data.sram_pool =sram_get_gen_pool ();da8xx_register_mcasp (0 , &da850_evm_snd_data); ret =davinci_cfg_reg_list (da850_lcdcntl_pins);
Signature · 1 line
1.7.11.7
Mark Brown
AppliedQuoted 5 lines · Daniel Mack
From: Matt Porter <[email protected]>
Removes the DaVinci private SRAM API and replaces it with the genalloc API. The SRAM
gen_poolis passed in pdata since DaVinci is in the early stages of DT conversion.
Applied both, thanks.