Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d65a1458 authored by Daniel Mack's avatar Daniel Mack Committed by Mark Brown
Browse files

ASoC: pxa: use snd_dmaengine_dai_dma_data 



Use snd_dmaengine_dai_dma_data for passing the dma parameters from
clients to the pxa pcm lib. This does no functional change, it's just an
intermedia step to migrate the pxa bits over to dmaengine.

The calculation of dcmd is a transition hack which will be removed again
in a later patch. It's just there to make the transition more readable.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Acked-by: default avatarMark Brown <broonie@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 2023c90c

include/sound/pxa2xx-lib.h

+0 −7
Original line number Diff line number Diff line
@@ -6,13 +6,6 @@ 


/* PCM */



struct pxa2xx_pcm_dma_params {

	char *name;			/* stream identifier */

	u32 dcmd;			/* DMA descriptor dcmd field */

	volatile u32 *drcmr;		/* the DMA request channel to use */

	u32 dev_addr;			/* device physical address for DMA */

};



extern int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,

				struct snd_pcm_hw_params *params);

extern int __pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream);

sound/arm/pxa2xx-ac97.c

+14 −12
Original line number Diff line number Diff line
@@ -14,12 +14,14 @@ 
#include <linux/io.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/dmaengine.h>



#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/ac97_codec.h>

#include <sound/initval.h>

#include <sound/pxa2xx-lib.h>

#include <sound/dmaengine_pcm.h>



#include <mach/regs-ac97.h>

#include <mach/audio.h>
@@ -41,20 +43,20 @@ static struct snd_ac97_bus_ops pxa2xx_ac97_ops = { 
	.reset	= pxa2xx_ac97_reset,

};



static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_out = {

	.name			= "AC97 PCM out",

	.dev_addr		= __PREG(PCDR),

	.drcmr			= &DRCMR(12),

	.dcmd			= DCMD_INCSRCADDR | DCMD_FLOWTRG |

				  DCMD_BURST32 | DCMD_WIDTH4,

static unsigned long pxa2xx_ac97_pcm_out_req = 12;

static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_out = {

	.addr		= __PREG(PCDR),

	.addr_width	= DMA_SLAVE_BUSWIDTH_4_BYTES,

	.maxburst	= 32,

	.filter_data	= &pxa2xx_ac97_pcm_out_req,

};



static struct pxa2xx_pcm_dma_params pxa2xx_ac97_pcm_in = {

	.name			= "AC97 PCM in",

	.dev_addr		= __PREG(PCDR),

	.drcmr			= &DRCMR(11),

	.dcmd			= DCMD_INCTRGADDR | DCMD_FLOWSRC |

				  DCMD_BURST32 | DCMD_WIDTH4,

static unsigned long pxa2xx_ac97_pcm_in_req = 11;

static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_in = {

	.addr		= __PREG(PCDR),

	.addr_width	= DMA_SLAVE_BUSWIDTH_4_BYTES,

	.maxburst	= 32,

	.filter_data	= &pxa2xx_ac97_pcm_in_req,

};



static struct snd_pcm *pxa2xx_ac97_pcm;

sound/arm/pxa2xx-pcm-lib.c

+43 −9
Original line number Diff line number Diff line
@@ -7,11 +7,13 @@ 
#include <linux/slab.h>

#include <linux/module.h>

#include <linux/dma-mapping.h>

#include <linux/dmaengine.h>



#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/pxa2xx-lib.h>

#include <sound/dmaengine_pcm.h>



#include <mach/dma.h>
@@ -43,6 +45,35 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, 
	size_t period = params_period_bytes(params);

	pxa_dma_desc *dma_desc;

	dma_addr_t dma_buff_phys, next_desc_phys;

	u32 dcmd = DCMD_INCSRCADDR | DCMD_FLOWTRG;



	/* temporary transition hack */

	switch (rtd->params->addr_width) {

	case DMA_SLAVE_BUSWIDTH_1_BYTE:

		dcmd |= DCMD_WIDTH1;

		break;

	case DMA_SLAVE_BUSWIDTH_2_BYTES:

		dcmd |= DCMD_WIDTH2;

		break;

	case DMA_SLAVE_BUSWIDTH_4_BYTES:

		dcmd |= DCMD_WIDTH4;

		break;

	default:

		/* can't happen */

		break;

	}



	switch (rtd->params->maxburst) {

	case 8:

		dcmd |= DCMD_BURST8;

		break;

	case 16:

		dcmd |= DCMD_BURST16;

		break;

	case 32:

		dcmd |= DCMD_BURST32;

		break;

	}



	snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);

	runtime->dma_bytes = totsize;
@@ -55,14 +86,14 @@ int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, 
		dma_desc->ddadr = next_desc_phys;

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

			dma_desc->dsadr = dma_buff_phys;

			dma_desc->dtadr = rtd->params->dev_addr;

			dma_desc->dtadr = rtd->params->addr;

		} else {

			dma_desc->dsadr = rtd->params->dev_addr;

			dma_desc->dsadr = rtd->params->addr;

			dma_desc->dtadr = dma_buff_phys;

		}

		if (period > totsize)

			period = totsize;

		dma_desc->dcmd = rtd->params->dcmd | period | DCMD_ENDIRQEN;

		dma_desc->dcmd = dcmd | period | DCMD_ENDIRQEN;

		dma_desc++;

		dma_buff_phys += period;

	} while (totsize -= period);
@@ -76,8 +107,10 @@ int __pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream) 
{

	struct pxa2xx_runtime_data *rtd = substream->runtime->private_data;



	if (rtd && rtd->params && rtd->params->drcmr)

		*rtd->params->drcmr = 0;

	if (rtd && rtd->params && rtd->params->filter_data) {

		unsigned long req = *(unsigned long *) rtd->params->filter_data;

		DRCMR(req) = 0;

	}



	snd_pcm_set_runtime_buffer(substream, NULL);

	return 0;
@@ -136,6 +169,7 @@ EXPORT_SYMBOL(pxa2xx_pcm_pointer); 
int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)

{

	struct pxa2xx_runtime_data *prtd = substream->runtime->private_data;

	unsigned long req;



	if (!prtd || !prtd->params)

		return 0;
@@ -146,7 +180,8 @@ int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream) 
	DCSR(prtd->dma_ch) &= ~DCSR_RUN;

	DCSR(prtd->dma_ch) = 0;

	DCMD(prtd->dma_ch) = 0;

	*prtd->params->drcmr = prtd->dma_ch | DRCMR_MAPVLD;

	req = *(unsigned long *) prtd->params->filter_data;

	DRCMR(req) = prtd->dma_ch | DRCMR_MAPVLD;



	return 0;

}
@@ -155,7 +190,6 @@ EXPORT_SYMBOL(__pxa2xx_pcm_prepare); 
void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id)

{

	struct snd_pcm_substream *substream = dev_id;

	struct pxa2xx_runtime_data *rtd = substream->runtime->private_data;

	int dcsr;



	dcsr = DCSR(dma_ch);
@@ -164,8 +198,8 @@ void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id) 
	if (dcsr & DCSR_ENDINTR) {

		snd_pcm_period_elapsed(substream);

	} else {

		printk(KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n",

			rtd->params->name, dma_ch, dcsr);

		printk(KERN_ERR "DMA error on channel %d (DCSR=%#x)\n",

			dma_ch, dcsr);

		snd_pcm_stream_lock(substream);

		snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);

		snd_pcm_stream_unlock(substream);

sound/arm/pxa2xx-pcm.c

+4 −1
Original line number Diff line number Diff line
@@ -11,8 +11,11 @@ 
 */



#include <linux/module.h>

#include <linux/dmaengine.h>



#include <sound/core.h>

#include <sound/pxa2xx-lib.h>

#include <sound/dmaengine_pcm.h>



#include "pxa2xx-pcm.h"
@@ -40,7 +43,7 @@ static int pxa2xx_pcm_open(struct snd_pcm_substream *substream) 


	rtd->params = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?

		      client->playback_params : client->capture_params;

	ret = pxa_request_dma(rtd->params->name, DMA_PRIO_LOW,

	ret = pxa_request_dma("dma", DMA_PRIO_LOW,

			      pxa2xx_pcm_dma_irq, substream);

	if (ret < 0)

		goto err2;

sound/arm/pxa2xx-pcm.h

+3 −3
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ 


struct pxa2xx_runtime_data {

	int dma_ch;

	struct pxa2xx_pcm_dma_params *params;

	struct snd_dmaengine_dai_dma_data *params;

	pxa_dma_desc *dma_desc_array;

	dma_addr_t dma_desc_array_phys;

};



struct pxa2xx_pcm_client {

	struct pxa2xx_pcm_dma_params *playback_params;

	struct pxa2xx_pcm_dma_params *capture_params;

	struct snd_dmaengine_dai_dma_data *playback_params;

	struct snd_dmaengine_dai_dma_data *capture_params;

	int (*startup)(struct snd_pcm_substream *);

	void (*shutdown)(struct snd_pcm_substream *);

	int (*prepare)(struct snd_pcm_substream *);