Commit 77a23f26 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

ALSA: Clean up SG-buffer helper functions and macros 



Clean up SG-buffer helper functions and macros.  Helpers take substream
as arguments now.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 46480b3a

include/sound/memalloc.h

+12 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ struct snd_dma_buffer { 
/*

 * Scatter-Gather generic device pages

 */

void *snd_malloc_sgbuf_pages(struct device *device,

			     size_t size, struct snd_dma_buffer *dmab,

			     size_t *res_size);

int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab);



struct snd_sg_page {

	void *buf;

	dma_addr_t addr;
@@ -95,6 +100,13 @@ static inline dma_addr_t snd_sgbuf_get_addr(struct snd_sg_buf *sgbuf, size_t off 
	return sgbuf->table[offset >> PAGE_SHIFT].addr + offset % PAGE_SIZE;

}



/*

 * return the virtual address at the corresponding offset

 */

static inline void *snd_sgbuf_get_ptr(struct snd_sg_buf *sgbuf, size_t offset)

{

	return sgbuf->table[offset >> PAGE_SHIFT].buf + offset % PAGE_SIZE;

}



/* allocate/release a buffer */

int snd_dma_alloc_pages(int type, struct device *dev, size_t size,

include/sound/pcm.h

+23 −4
Original line number Diff line number Diff line
@@ -974,10 +974,29 @@ int snd_pcm_lib_preallocate_pages_for_all(struct snd_pcm *pcm, 
int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size);

int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream);



#define snd_pcm_substream_sgbuf(substream) ((substream)->runtime->dma_buffer_p->private_data)

#define snd_pcm_sgbuf_pages(size) snd_sgbuf_aligned_pages(size)

#define snd_pcm_sgbuf_get_addr(sgbuf,ofs) snd_sgbuf_get_addr(sgbuf,ofs)

struct page *snd_pcm_sgbuf_ops_page(struct snd_pcm_substream *substream, unsigned long offset);

/*

 * SG-buffer handling

 */

#define snd_pcm_substream_sgbuf(substream) \

	((substream)->runtime->dma_buffer_p->private_data)



static inline dma_addr_t

snd_pcm_sgbuf_get_addr(struct snd_pcm_substream *substream, unsigned int ofs)

{

	struct snd_sg_buf *sg = snd_pcm_substream_sgbuf(substream);

	return snd_sgbuf_get_addr(sg, ofs);

}



static inline void *

snd_pcm_sgbuf_get_ptr(struct snd_pcm_substream *substream, unsigned int ofs)

{

	struct snd_sg_buf *sg = snd_pcm_substream_sgbuf(substream);

	return snd_sgbuf_get_ptr(sg, ofs);

}



struct page *snd_pcm_sgbuf_ops_page(struct snd_pcm_substream *substream,

				    unsigned long offset);





/* handle mmap counter - PCM mmap callback should handle this counter properly */

static inline void snd_pcm_mmap_data_open(struct vm_area_struct *area)

sound/core/memalloc.c

+0 −8
Original line number Diff line number Diff line
@@ -43,14 +43,6 @@ MODULE_DESCRIPTION("Memory allocator for ALSA system."); 
MODULE_LICENSE("GPL");





/*

 */



void *snd_malloc_sgbuf_pages(struct device *device,

                             size_t size, struct snd_dma_buffer *dmab,

			     size_t *res_size);

int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab);



/*

 */

sound/pci/au88x0/au88x0.h

+2 −5
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ typedef struct { 
	/* Virtual page extender stuff */

	int nr_periods;

	int period_bytes;

	struct snd_sg_buf *sgbuf;	/* DMA Scatter Gather struct */

	int period_real;

	int period_virt;
@@ -195,16 +194,14 @@ static void vortex_adb_setsrc(vortex_t * vortex, int adbdma, 


/* DMA Engines. */

static void vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,

				     struct snd_sg_buf * sgbuf, int size,

				     int count);

				     int size, int count);

static void vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie,

				  int dir, int fmt, int d,

				  u32 offset);

static void vortex_adbdma_setstartbuffer(vortex_t * vortex, int adbdma, int sb);

#ifndef CHIP_AU8810

static void vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma,

				    struct snd_sg_buf * sgbuf, int size,

				    int count);

				    int size, int count);

static void vortex_wtdma_setmode(vortex_t * vortex, int wtdma, int ie, int fmt, int d,	/*int e, */

				 u32 offset);

static void vortex_wtdma_setstartbuffer(vortex_t * vortex, int wtdma, int sb);

sound/pci/au88x0/au88x0_core.c

+17 −21
Original line number Diff line number Diff line
@@ -1097,19 +1097,12 @@ static void vortex_adbdma_setstartbuffer(vortex_t * vortex, int adbdma, int sb) 


static void

vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,

			 struct snd_sg_buf * sgbuf, int psize, int count)

			 int psize, int count)

{

	stream_t *dma = &vortex->dma_adb[adbdma];



	if (sgbuf == NULL) {

		printk(KERN_INFO "vortex: FATAL: sgbuf is NULL!\n");

		return;

	}

	//printk(KERN_INFO "vortex: page count = %d, tblcount = %d\n", count, sgbuf->tblsize);



	dma->period_bytes = psize;

	dma->nr_periods = count;

	dma->sgbuf = sgbuf;



	dma->cfg0 = 0;

	dma->cfg1 = 0;
@@ -1120,26 +1113,26 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma, 
		dma->cfg1 |= 0x88000000 | 0x44000000 | 0x30000000 | (psize - 1);

		hwwrite(vortex->mmio,

			VORTEX_ADBDMA_BUFBASE + (adbdma << 4) + 0xc,

			snd_sgbuf_get_addr(sgbuf, psize * 3));

			snd_pcm_sgbuf_get_addr(dma->substream, psize * 3));

		/* 3 pages */

	case 3:

		dma->cfg0 |= 0x12000000;

		dma->cfg1 |= 0x80000000 | 0x40000000 | ((psize - 1) << 0xc);

		hwwrite(vortex->mmio,

			VORTEX_ADBDMA_BUFBASE + (adbdma << 4) + 0x8,

			snd_sgbuf_get_addr(sgbuf, psize * 2));

			snd_pcm_sgbuf_get_addr(dma->substream, psize * 2));

		/* 2 pages */

	case 2:

		dma->cfg0 |= 0x88000000 | 0x44000000 | 0x10000000 | (psize - 1);

		hwwrite(vortex->mmio,

			VORTEX_ADBDMA_BUFBASE + (adbdma << 4) + 0x4,

			snd_sgbuf_get_addr(sgbuf, psize));

			snd_pcm_sgbuf_get_addr(dma->substream, psize));

		/* 1 page */

	case 1:

		dma->cfg0 |= 0x80000000 | 0x40000000 | ((psize - 1) << 0xc);

		hwwrite(vortex->mmio,

			VORTEX_ADBDMA_BUFBASE + (adbdma << 4),

			snd_sgbuf_get_addr(sgbuf, 0));

			snd_pcm_sgbuf_get_addr(dma->substream, 0));

		break;

	}

	//printk("vortex: cfg0 = 0x%x\nvortex: cfg1=0x%x\n", dma->cfg0, dma->cfg1);
@@ -1205,7 +1198,7 @@ static int vortex_adbdma_bufshift(vortex_t * vortex, int adbdma) 
			//hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFBASE+(((adbdma << 2)+pp) << 2), dma->table[p].addr);

			hwwrite(vortex->mmio,

				VORTEX_ADBDMA_BUFBASE + (((adbdma << 2) + pp) << 2),

				snd_sgbuf_get_addr(dma->sgbuf,

				snd_pcm_sgbuf_get_addr(dma->substream,

				dma->period_bytes * p));

			/* Force write thru cache. */

			hwread(vortex->mmio, VORTEX_ADBDMA_BUFBASE +
@@ -1244,7 +1237,10 @@ static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma) { 
			if (pp >= 4)

				pp -= 4;

		}

		hwwrite(vortex->mmio, VORTEX_ADBDMA_BUFBASE+(((adbdma << 2)+pp) << 2), snd_sgbuf_get_addr(dma->sgbuf, dma->period_bytes * p));

		hwwrite(vortex->mmio,

			VORTEX_ADBDMA_BUFBASE + (((adbdma << 2) + pp) << 2),

			snd_pcm_sgbuf_get_addr(dma->substream,

					       dma->period_bytes * p));

		/* Force write thru cache. */

		hwread(vortex->mmio, VORTEX_ADBDMA_BUFBASE + (((adbdma << 2)+pp) << 2));

	}
@@ -1367,13 +1363,12 @@ static void vortex_wtdma_setstartbuffer(vortex_t * vortex, int wtdma, int sb) 


static void

vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma,

			struct snd_sg_buf * sgbuf, int psize, int count)

			int psize, int count)

{

	stream_t *dma = &vortex->dma_wt[wtdma];



	dma->period_bytes = psize;

	dma->nr_periods = count;

	dma->sgbuf = sgbuf;



	dma->cfg0 = 0;

	dma->cfg1 = 0;
@@ -1383,23 +1378,23 @@ vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma, 
	case 4:

		dma->cfg1 |= 0x88000000 | 0x44000000 | 0x30000000 | (psize-1);

		hwwrite(vortex->mmio, VORTEX_WTDMA_BUFBASE + (wtdma << 4) + 0xc,

			snd_sgbuf_get_addr(sgbuf, psize * 3));

			snd_pcm_sgbuf_get_addr(dma->substream, psize * 3));

		/* 3 pages */

	case 3:

		dma->cfg0 |= 0x12000000;

		dma->cfg1 |= 0x80000000 | 0x40000000 | ((psize-1) << 0xc);

		hwwrite(vortex->mmio, VORTEX_WTDMA_BUFBASE + (wtdma << 4)  + 0x8,

			snd_sgbuf_get_addr(sgbuf, psize * 2));

			snd_pcm_sgbuf_get_addr(dma->substream, psize * 2));

		/* 2 pages */

	case 2:

		dma->cfg0 |= 0x88000000 | 0x44000000 | 0x10000000 | (psize-1);

		hwwrite(vortex->mmio, VORTEX_WTDMA_BUFBASE + (wtdma << 4) + 0x4,

			snd_sgbuf_get_addr(sgbuf, psize));

			snd_pcm_sgbuf_get_addr(dma->substream, psize));

		/* 1 page */

	case 1:

		dma->cfg0 |= 0x80000000 | 0x40000000 | ((psize-1) << 0xc);

		hwwrite(vortex->mmio, VORTEX_WTDMA_BUFBASE + (wtdma << 4),

			snd_sgbuf_get_addr(sgbuf, 0));

			snd_pcm_sgbuf_get_addr(dma->substream, 0));

		break;

	}

	hwwrite(vortex->mmio, VORTEX_WTDMA_BUFCFG0 + (wtdma << 3), dma->cfg0);
@@ -1465,7 +1460,8 @@ static int vortex_wtdma_bufshift(vortex_t * vortex, int wtdma) 
			hwwrite(vortex->mmio,

				VORTEX_WTDMA_BUFBASE +

				(((wtdma << 2) + pp) << 2),

				snd_sgbuf_get_addr(dma->sgbuf, dma->period_bytes * p));

				snd_pcm_sgbuf_get_addr(dma->substream,

						       dma->period_bytes * p));

			/* Force write thru cache. */

			hwread(vortex->mmio, VORTEX_WTDMA_BUFBASE +

			       (((wtdma << 2) + pp) << 2));