- Alsa-devel - mailman.alsa-project.org

[alsa-devel] ALSA fixes for non-coherent archs (Re: [PATCH] Sam440ep support)
by Takashi Iwai 20 May '08

20 May '08

At Tue, 06 May 2008 11:16:22 +0200, Gerhard Pircher wrote: > > -------- Original-Nachricht -------- > > Datum: Tue, 06 May 2008 18:48:39 +1000 > > Von: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> > > An: Gerhard Pircher <gerhard_pircher(a)gmx.net> > > CC: linuxppc-dev(a)ozlabs.org, Takashi Iwai <tiwai(a)suse.de>, cjg(a)cruxppc.org, galak(a)kernel.crashing.org > > Betreff: Re: [PATCH] Sam440ep support > > > > > On Tue, 2008-05-06 at 09:51 +0200, Gerhard Pircher wrote: > > > Takashi Iwai posted a preliminary patch a long time ago. I tested it > > > on my machine and it failed with non coherent scatter-gather DMA > > > allocations (I guess almost all ALSA PCI drivers use SG DMA?). > > > > How does Alsa allocate such SG ? > I can't answer this question. *ducked* :-) Takashi? > > FYI: I posted the results of the test with Takashi's dma_mmap_coherent > patch here: > http://ozlabs.org/pipermail/linuxppc-dev/2006-June/024078.html > > On the other side it looks like this problem does not only affect ALSA. > As far as I can tell also some V4L(2) drivers have a problem with mmaping > non coherent DMA allocations, but I'm not sure (it's a long time since I > did some tests with video cards on my AmigaOne). > > Naturally I can do some tests, if you or Takashi come up with a new > patch. OK, here is another patch for testing. Since I lost my old patch somewhere (and it's not worth to dig the archive), I wrote it up quickly from scratch. This version should cover both SG and non-SG buffers. It's against the latest git tree. The patch adds a hackish verison of dma_mmap_coherent() for some architectures in sound/core/pcm_native.c. I'm not sure whether this works. I just tested it on X86. It'd be appreciated if someone can test this. Also, this disables HDSPM driver for non-X86/IA64 since the driver has own copy and silence methods that are incompatible with the new SG-buffer data. And, yes, I know we need to clean up huge messes in ALSA memory handling routines. But, let's fix obvious bugs before starting a big rewrite... thanks, Takashi --- diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h index ae2921d..ccf3dfa 100644 --- a/include/sound/memalloc.h +++ b/include/sound/memalloc.h @@ -62,6 +62,18 @@ struct snd_dma_buffer { void *private_data; /* private for allocator; don't touch */ }; +/* needs to use dma_mmap_coherent() for pages allocated via + * dma_alloc_coherent() + */ +#ifdef CONFIG_HAS_DMA +#if (defined(CONFIG_PPC32) && !defined(CONFIG_CONFIG_NOT_COHERENT_CACHE)) || \ + defined(CONFIG_ARM) || \ + defined(CONFIG_MIPS) || \ + defined(CONFIG_PARISC) +#define SND_NEEDS_DMA_MMAP_COHERENT +#endif /* archs */ +#endif /* CONFIG_HAS_DMA */ + /* * Scatter-Gather generic device pages */ @@ -75,7 +87,9 @@ struct snd_sg_buf { int pages; /* allocated pages */ int tblsize; /* allocated table size */ struct snd_sg_page *table; /* address table */ +#ifndef SND_NEEDS_DMA_MMAP_COHERENT struct page **page_table; /* page table (for vmap/vunmap) */ +#endif struct device *dev; }; diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 51d58cc..2e68420 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -969,10 +969,25 @@ 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); +/* + * SG-buffer + */ #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) + +#ifdef SND_NEEDS_DMA_MMAP_COHERENT +int snd_pcm_sgbuf_ops_copy(struct snd_pcm_substream *substream, + int channel, snd_pcm_uframes_t pos, + void __user *buf, snd_pcm_uframes_t count); +int snd_pcm_sgbuf_ops_silence(struct snd_pcm_substream *substream, int channel, + snd_pcm_uframes_t pos, snd_pcm_uframes_t count); +#define snd_pcm_sgbuf_ops_page NULL +#else +#define snd_pcm_sgbuf_ops_copy NULL +#define snd_pcm_sgbuf_ops_silence NULL struct page *snd_pcm_sgbuf_ops_page(struct snd_pcm_substream *substream, unsigned long offset); +#endif /* handle mmap counter - PCM mmap callback should handle this counter properly */ static inline void snd_pcm_mmap_data_open(struct vm_area_struct *area) diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c index ff07b4a..9e57032 100644 --- a/sound/core/pcm_memory.c +++ b/sound/core/pcm_memory.c @@ -306,6 +306,126 @@ int snd_pcm_lib_preallocate_pages_for_all(struct snd_pcm *pcm, EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages_for_all); +#ifdef SND_NEEDS_DMA_MMAP_COHERENT +/* + * snd_pcm_sgbuf_ops_copy - copy callback for DMA SG-buffer + */ +int snd_pcm_sgbuf_ops_copy(struct snd_pcm_substream *substream, + int channel, snd_pcm_uframes_t pos, + void __user *buf, snd_pcm_uframes_t count) +{ + struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + unsigned int ofs, idx; + char *ptr; + + if (channel < 0) { + pos = frames_to_bytes(runtime, pos); + count = frames_to_bytes(runtime, count); + } else { + pos = channel * (runtime->dma_bytes / runtime->channels) + + samples_to_bytes(runtime, pos); + count = samples_to_bytes(runtime, count); + } + + idx = pos >> PAGE_SHIFT; + ofs = pos & (PAGE_SIZE - 1); + ptr = sgbuf->table[idx].buf + ofs; + + for (;;) { + unsigned int size, ret; + size = count; + if (ofs + size > PAGE_SIZE) + size = PAGE_SIZE - ofs; + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + ret = copy_from_user(ptr, buf, size); + else + ret = copy_to_user(buf, ptr, size); + if (ret) + return -EFAULT; + count -= size; + if (!count) + return 0; + ofs = 0; + idx++; + ptr = sgbuf->table[idx].buf; + buf += size; + } +} +EXPORT_SYMBOL(snd_pcm_sgbuf_ops_copy); + +/* + * snd_pcm_sgbuf_ops_silence - fill with silence data + */ +int snd_pcm_sgbuf_ops_silence(struct snd_pcm_substream *substream, int channel, + snd_pcm_uframes_t pos, snd_pcm_uframes_t count) +{ + struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + unsigned int idx, ofs, width; + const char *silence; + char *ptr; + + if (channel < 0) { + pos = frames_to_bytes(runtime, pos); + count = frames_to_bytes(runtime, count); + } else { + pos = channel * (runtime->dma_bytes / runtime->channels) + + samples_to_bytes(runtime, pos); + count = samples_to_bytes(runtime, count); + } + + idx = pos >> PAGE_SHIFT; + if (idx >= (unsigned int)sgbuf->pages) + return -EFAULT; + ofs = pos & (PAGE_SIZE - 1); + ptr = sgbuf->table[idx].buf + ofs; + + width = snd_pcm_format_physical_width(runtime->format); + if (width < 8) { + count /= 2; + width = 8; + } + width /= 8; + silence = snd_pcm_format_silence_64(runtime->format); + + if (PAGE_SIZE % width) { + unsigned int pat = 0; + for (;;) { + *ptr = silence[pat]; + pat = (pat + 1) % width; + count--; + if (!count) + return 0; + ofs++; + if (ofs == PAGE_SIZE) { + ofs = 0; + idx++; + ptr = sgbuf->table[idx].buf; + } else + ptr++; + } + } else { + for (;;) { + unsigned int size, samples; + size = count; + if (ofs + size > PAGE_SIZE) + size = PAGE_SIZE - ofs; + samples = bytes_to_samples(runtime, size); + snd_pcm_format_set_silence(runtime->format, ptr, + samples); + count -= size; + if (!count) + return 0; + ofs = 0; + idx++; + ptr = sgbuf->table[idx].buf; + } + } +} +EXPORT_SYMBOL(snd_pcm_sgbuf_ops_silence); + +#else /* !SND_NEEDS_DMA_MMAP_COHERENT */ /** * snd_pcm_sgbuf_ops_page - get the page struct at the given offset * @substream: the pcm substream instance @@ -323,9 +443,10 @@ struct page *snd_pcm_sgbuf_ops_page(struct snd_pcm_substream *substream, unsigne return NULL; return sgbuf->page_table[idx]; } - EXPORT_SYMBOL(snd_pcm_sgbuf_ops_page); +#endif /* SND_NEEDS_DMA_MMAP_COHERENT */ + /** * snd_pcm_lib_malloc_pages - allocate the DMA buffer * @substream: the substream to allocate the DMA buffer to diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 61f5d42..e3f68d2 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3124,19 +3124,96 @@ static struct vm_operations_struct snd_pcm_vm_ops_data = { .open = snd_pcm_mmap_data_open, .close = snd_pcm_mmap_data_close, +}; + +static struct vm_operations_struct snd_pcm_vm_ops_data_fault = +{ + .open = snd_pcm_mmap_data_open, + .close = snd_pcm_mmap_data_close, .fault = snd_pcm_mmap_data_fault, }; +#ifdef SND_NEEDS_DMA_MMAP_COHERENT + +/* + * FIXME!! + * dma_mmap_coherent is missing on most architectures... + */ +#ifndef CONFIG_ARM +static int dma_mmap_coherent(struct device *dev, struct vm_area_struct *vma, + void *cpu_addr, dma_addr_t handle, size_t size) +{ +#if defined(CONFIG_PPC32) && !defined(CONFIG_CONFIG_NOT_COHERENT_CACHE) + cpu_addr = bus_to_virt(handle); +#elif defined(CONFIG_MIPS) + cpu_addr = phys_to_virt(plat_dma_addr_to_phys(handle)); +#elif defined(CONFIG_PARISC) + cpu_addr = __va(handle); +#endif + return remap_pfn_range(vma, vma->vm_start, + page_to_pfn(virt_to_page(cpu_addr)), + size, vma->vm_page_prot); +} +#endif /* !ARM */ + +/* + * snd_pcm_sgbuf_ops_mmap - mmap SG DMA pages + */ +static int snd_pcm_mmap_sgbuf(struct snd_pcm_substream *substream, + struct vm_area_struct *area) +{ + struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream); + unsigned long start, offset, offset_saved, size; + int err = 0; + + start = area->vm_start; + offset_saved = offset = area->vm_pgoff; + size = area->vm_end - area->vm_start; + size = PAGE_ALIGN(size); + while (size > 0) { + if (offset >= sgbuf->pages) { + err = -EFAULT; + break; + } + err = dma_mmap_coherent(sgbuf->dev, area, + sgbuf->table[offset].buf, + sgbuf->table[offset].addr, + PAGE_SIZE); + if (err < 0) + break; + offset++; + area->vm_start += PAGE_SIZE; + size -= PAGE_SIZE; + } + area->vm_start = start; + area->vm_pgoff = offset_saved; + return err; +} +#endif /* SND_NEEDS_DMA_MMAP_COHERENT */ + /* * mmap the DMA buffer on RAM */ static int snd_pcm_default_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *area) { - area->vm_ops = &snd_pcm_vm_ops_data; - area->vm_private_data = substream; area->vm_flags |= VM_RESERVED; - atomic_inc(&substream->mmap_count); +#ifdef SND_NEEDS_DMA_MMAP_COHERENT + if (!substream->ops->page) { + switch (substream->dma_buffer.dev.type) { + case SNDRV_DMA_TYPE_DEV: + return dma_mmap_coherent(substream->dma_buffer.dev.dev, + area, + substream->runtime->dma_area, + substream->runtime->dma_addr, + area->vm_end - area->vm_start); + case SNDRV_DMA_TYPE_DEV_SG: + return snd_pcm_mmap_sgbuf(substream, area); + } + } +#endif /* SND_NEEDS_DMA_MMAP_COHERENT */ + /* mmap with fault handler */ + area->vm_ops = &snd_pcm_vm_ops_data_fault; return 0; } @@ -3144,12 +3221,6 @@ static int snd_pcm_default_mmap(struct snd_pcm_substream *substream, * mmap the DMA buffer on I/O memory area */ #if SNDRV_PCM_INFO_MMAP_IOMEM -static struct vm_operations_struct snd_pcm_vm_ops_data_mmio = -{ - .open = snd_pcm_mmap_data_open, - .close = snd_pcm_mmap_data_close, -}; - int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_struct *area) { @@ -3159,8 +3230,6 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, #ifdef pgprot_noncached area->vm_page_prot = pgprot_noncached(area->vm_page_prot); #endif - area->vm_ops = &snd_pcm_vm_ops_data_mmio; - area->vm_private_data = substream; area->vm_flags |= VM_IO; size = area->vm_end - area->vm_start; offset = area->vm_pgoff << PAGE_SHIFT; @@ -3168,7 +3237,6 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, (substream->runtime->dma_addr + offset) >> PAGE_SHIFT, size, area->vm_page_prot)) return -EAGAIN; - atomic_inc(&substream->mmap_count); return 0; } @@ -3185,6 +3253,7 @@ int snd_pcm_mmap_data(struct snd_pcm_substream *substream, struct file *file, long size; unsigned long offset; size_t dma_bytes; + int err; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (!(area->vm_flags & (VM_WRITE|VM_READ))) @@ -3210,10 +3279,15 @@ int snd_pcm_mmap_data(struct snd_pcm_substream *substream, struct file *file, if (offset > dma_bytes - size) return -EINVAL; + area->vm_ops = &snd_pcm_vm_ops_data; + area->vm_private_data = substream; if (substream->ops->mmap) - return substream->ops->mmap(substream, area); + err = substream->ops->mmap(substream, area); else - return snd_pcm_default_mmap(substream, area); + err = snd_pcm_default_mmap(substream, area); + if (!err) + atomic_inc(&substream->mmap_count); + return err; } EXPORT_SYMBOL(snd_pcm_mmap_data); diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c index cefd228..67c6631 100644 --- a/sound/core/sgbuf.c +++ b/sound/core/sgbuf.c @@ -46,12 +46,14 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab) tmpb.bytes = PAGE_SIZE; snd_dma_free_pages(&tmpb); } +#ifndef SND_NEEDS_DMA_MMAP_COHERENT if (dmab->area) vunmap(dmab->area); + kfree(sgbuf->page_table); +#endif dmab->area = NULL; kfree(sgbuf->table); - kfree(sgbuf->page_table); kfree(sgbuf); dmab->private_data = NULL; @@ -77,9 +79,11 @@ void *snd_malloc_sgbuf_pages(struct device *device, sgbuf->table = kcalloc(sgbuf->tblsize, sizeof(*sgbuf->table), GFP_KERNEL); if (! sgbuf->table) goto _failed; +#ifndef SND_NEEDS_DMA_MMAP_COHERENT sgbuf->page_table = kcalloc(sgbuf->tblsize, sizeof(*sgbuf->page_table), GFP_KERNEL); if (! sgbuf->page_table) goto _failed; +#endif /* allocate each page */ for (i = 0; i < pages; i++) { @@ -91,14 +95,20 @@ void *snd_malloc_sgbuf_pages(struct device *device, } sgbuf->table[i].buf = tmpb.area; sgbuf->table[i].addr = tmpb.addr; +#ifndef SND_NEEDS_DMA_MMAP_COHERENT sgbuf->page_table[i] = virt_to_page(tmpb.area); +#endif sgbuf->pages++; } sgbuf->size = size; +#ifndef SND_NEEDS_DMA_MMAP_COHERENT dmab->area = vmap(sgbuf->page_table, sgbuf->pages, VM_MAP, PAGE_KERNEL); if (! dmab->area) goto _failed; +#else + dmab->area = sgbuf->table[0].buf; +#endif return dmab->area; _failed: diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 7e47421..09af3f5 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -651,6 +651,7 @@ config SND_HDSP config SND_HDSPM tristate "RME Hammerfall DSP MADI" depends on SND + depends on X86 || ALPHA || IA64 select SND_HWDEP select SND_RAWMIDI select SND_PCM diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c index f9a58b4..222e599 100644 --- a/sound/pci/au88x0/au88x0_pcm.c +++ b/sound/pci/au88x0/au88x0_pcm.c @@ -409,6 +409,8 @@ static struct snd_pcm_ops snd_vortex_playback_ops = { .prepare = snd_vortex_pcm_prepare, .trigger = snd_vortex_pcm_trigger, .pointer = snd_vortex_pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 4ecdd63..49b8ebc 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c @@ -548,6 +548,7 @@ static struct snd_pcm_ops snd_bt87x_pcm_ops = { .prepare = snd_bt87x_prepare, .trigger = snd_bt87x_trigger, .pointer = snd_bt87x_pointer, + .copy = snd_pcm_sgbuf_ops_copy, .page = snd_pcm_sgbuf_ops_page, }; diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index e16dc92..e2c3f3d 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -801,6 +801,8 @@ static struct snd_pcm_ops analog_playback_ops = { .prepare = pcm_prepare, .trigger = pcm_trigger, .pointer = pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; static struct snd_pcm_ops analog_capture_ops = { @@ -812,6 +814,7 @@ static struct snd_pcm_ops analog_capture_ops = { .prepare = pcm_prepare, .trigger = pcm_trigger, .pointer = pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, .page = snd_pcm_sgbuf_ops_page, }; #ifdef ECHOCARD_HAS_DIGITAL_IO @@ -825,6 +828,8 @@ static struct snd_pcm_ops digital_playback_ops = { .prepare = pcm_prepare, .trigger = pcm_trigger, .pointer = pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; #endif /* !ECHOCARD_HAS_VMIXER */ @@ -837,6 +842,7 @@ static struct snd_pcm_ops digital_capture_ops = { .prepare = pcm_prepare, .trigger = pcm_trigger, .pointer = pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, .page = snd_pcm_sgbuf_ops_page, }; #endif /* ECHOCARD_HAS_DIGITAL_IO */ diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index cf9276d..2d72959 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -1323,6 +1323,8 @@ static struct snd_pcm_ops snd_emu10k1_playback_ops = { .prepare = snd_emu10k1_playback_prepare, .trigger = snd_emu10k1_playback_trigger, .pointer = snd_emu10k1_playback_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; @@ -1347,6 +1349,8 @@ static struct snd_pcm_ops snd_emu10k1_efx_playback_ops = { .prepare = snd_emu10k1_efx_playback_prepare, .trigger = snd_emu10k1_efx_playback_trigger, .pointer = snd_emu10k1_efx_playback_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b3a618e..e5ac9e1 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1461,6 +1461,8 @@ static struct snd_pcm_ops azx_pcm_ops = { .prepare = azx_pcm_prepare, .trigger = azx_pcm_trigger, .pointer = azx_pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 979f7da..7fcb3d7 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1696,6 +1696,8 @@ static struct snd_pcm_ops snd_riptide_playback_ops = { .hw_params = snd_riptide_hw_params, .hw_free = snd_riptide_hw_free, .prepare = snd_riptide_prepare, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, .trigger = snd_riptide_trigger, .pointer = snd_riptide_pointer, @@ -1707,6 +1709,7 @@ static struct snd_pcm_ops snd_riptide_capture_ops = { .hw_params = snd_riptide_hw_params, .hw_free = snd_riptide_hw_free, .prepare = snd_riptide_prepare, + .copy = snd_pcm_sgbuf_ops_copy, .page = snd_pcm_sgbuf_ops_page, .trigger = snd_riptide_trigger, .pointer = snd_riptide_pointer, diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index bbcee2c..156e457 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c @@ -2081,6 +2081,8 @@ static struct snd_pcm_ops snd_trident_nx_playback_ops = { .prepare = snd_trident_playback_prepare, .trigger = snd_trident_trigger, .pointer = snd_trident_playback_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; @@ -2126,6 +2128,8 @@ static struct snd_pcm_ops snd_trident_nx_foldback_ops = { .prepare = snd_trident_foldback_prepare, .trigger = snd_trident_trigger, .pointer = snd_trident_playback_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index b585cc3..4a9f132 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c @@ -1304,6 +1304,8 @@ static struct snd_pcm_ops snd_via686_playback_ops = { .prepare = snd_via686_playback_prepare, .trigger = snd_via82xx_pcm_trigger, .pointer = snd_via686_pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; @@ -1317,6 +1319,7 @@ static struct snd_pcm_ops snd_via686_capture_ops = { .prepare = snd_via686_capture_prepare, .trigger = snd_via82xx_pcm_trigger, .pointer = snd_via686_pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, .page = snd_pcm_sgbuf_ops_page, }; @@ -1330,6 +1333,8 @@ static struct snd_pcm_ops snd_via8233_playback_ops = { .prepare = snd_via8233_playback_prepare, .trigger = snd_via82xx_pcm_trigger, .pointer = snd_via8233_pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; @@ -1343,6 +1348,8 @@ static struct snd_pcm_ops snd_via8233_multi_ops = { .prepare = snd_via8233_multi_prepare, .trigger = snd_via82xx_pcm_trigger, .pointer = snd_via8233_pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; @@ -1356,6 +1363,7 @@ static struct snd_pcm_ops snd_via8233_capture_ops = { .prepare = snd_via8233_capture_prepare, .trigger = snd_via82xx_pcm_trigger, .pointer = snd_via8233_pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, .page = snd_pcm_sgbuf_ops_page, }; diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index 31f64ee..1431b08 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c @@ -803,6 +803,8 @@ static struct snd_pcm_ops snd_via686_playback_ops = { .prepare = snd_via82xx_pcm_prepare, .trigger = snd_via82xx_pcm_trigger, .pointer = snd_via686_pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, + .silence = snd_pcm_sgbuf_ops_silence, .page = snd_pcm_sgbuf_ops_page, }; @@ -816,6 +818,7 @@ static struct snd_pcm_ops snd_via686_capture_ops = { .prepare = snd_via82xx_pcm_prepare, .trigger = snd_via82xx_pcm_trigger, .pointer = snd_via686_pcm_pointer, + .copy = snd_pcm_sgbuf_ops_copy, .page = snd_pcm_sgbuf_ops_page, };

3 5

[alsa-devel] [PATCH] snd-usb-us122l v0.2 for US-122L
by Karsten Wiese 20 May '08

20 May '08

Hi, attached is a fresh US-122L linux(test-)driver. If everything is installed on top a kernel 2.6.25-rc5 and alsa-lib 1.0.16, everything works, erm at least here. Without the ehci patch, it still works when connected to the uhci-hcd. (Maybe the ehci-patch makes it into .26) alsa-lib < 1.0.16 lets the plugin misbehave. PCM access needs an ~/.asoundrc containing whats in .asoundrc. Its established by patching/compiling/installing alsa-plugins. You need to adjust the path to the kernel's sound/usb/usx2y/usb_stream.h Only S24_3LE, 2 channels interleaved, 2 periods is supported. The userspace pcm devicename then is forexample "usb_stream:1" (To let alsa convert to other formats, use forexample "plug:usb_stream:1") Tested with aplay, arecord, amidi & jackd using alsa driver. Propably doesn't do 32bit PCM access on x86_64, tested on x86_64 only. Karsten

2 19

Re: [alsa-devel] problems compiling alsa-drivers-1.0.16 into 2.6.25.4 kernel
by Takashi Iwai 20 May '08

20 May '08

At Tue, 20 May 2008 03:03:44 +0200, Dragan Noveski wrote: > > hallo list, > steven rostedt asked me to pass this problem to this list, so here it goes. No, it should be alsa-devel ML. > when running make in the alsa-driver source i get this error: > > ..... > make[1]: Entering directory `/usr/src/linux-2.6.25' ALSA 1.0.16 doesn't work for 2.6.25 kernel. Get the latest HG version. Takashi

2 1

[alsa-devel] Fwd: Re: Incorrect model selection for HDA Intel based card.
by Travis Place 19 May '08

19 May '08

Below (as well as attached) is my patch, for the 0x814e variant of the ASUS P5GD1 w/SPDIF. diff -r e2b60934d1c8 pci/hda/patch_realtek.c --- a/pci/hda/patch_realtek.c Mon May 19 12:32:25 2008 +0200 +++ b/pci/hda/patch_realtek.c Tue May 20 01:50:04 2008 +1000 @@ -2981,7 +2981,7 @@ static struct snd_pci_quirk alc880_cfg_t /* SND_PCI_QUIRK(0x1043, 0x1964, "ASUS", ALC880_ASUS_DIG), */ SND_PCI_QUIRK(0x1043, 0x1973, "ASUS", ALC880_ASUS_DIG), SND_PCI_QUIRK(0x1043, 0x19b3, "ASUS", ALC880_ASUS_DIG), - SND_PCI_QUIRK(0x1043, 0x814e, "ASUS", ALC880_ASUS), + SND_PCI_QUIRK(0x1043, 0x814e, "ASUS P5GD1 w/SPDIF", ALC880_6ST_DIG), SND_PCI_QUIRK(0x1043, 0x8181, "ASUS P4GPL", ALC880_ASUS_DIG), SND_PCI_QUIRK(0x1043, 0x8196, "ASUS P5GD1", ALC880_6ST), SND_PCI_QUIRK(0x1043, 0x81b4, "ASUS", ALC880_6ST), Changelog: Corrected the model assignment for the ASUS P5GD1 w/SPDIF after reports of surround sound not being possible. Signed-off-by: Travis Place <wishie at wishie dot net>

1 0

[alsa-devel] Incorrect model selection for HDA Intel based card.
by Travis Place 19 May '08

19 May '08

Just had a user in #alsa on freenode, with an Asus P5GD1 mainboard. They couldnt seem to get surround sound working at all. It has an ALC880 based HDA-Intel sound device on board. Now, the problem lies in the Susbsystem ID's (1043:814e). These match in patch_realtek.c as follows: SND_PCI_QUIRK(0x1043, 0x814e, "ASUS", ALC880_ASUS) The users mainboard (The ASUS P5GD1) actually has 6 output jacks, aswell as SPDIF, not the standard 3-jacks that the "ASUS" model quirk implies. I talked this user through forcing the driver to use '6stack-digout' for his sound device, and things all work fine now. Below is a link to his alsa-info output, with the problem fixed. (so you can check IDs etc) http://pastebin.ca/1022042 Up until this point, i hadnt come across a wrong detection like that. Is there anyway to differentiate this users card from the normal "3stack" model that actually requires the "ASUS" model quirk ? Thanks, Travis Place -- Happiness is like peeing your pants. Everyone can see it, but only you can feel its warmth

2 8

[alsa-devel] [PATCH] Support for Roland SonicCell sound module
by Chris Mennie 19 May '08

19 May '08

I'm not sure if this is the right place for it, but I've added support for the Roland SonicCell sound module. Patches were made against alsa-driver-1.0.16 source. Please let me know if there's a better place to post this: --- usbquirks.h 2008-02-05 04:23:24.000000000 -0500 +++ usbquirks.h 2008-05-18 13:02:32.000000000 -0400 @@ -1367,6 +1367,39 @@ } }, +{ + /* Roland SonicCell */ + USB_DEVICE(0x0582, 0x00c2), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .vendor_name = "Roland", + .product_name = "SonicCell", + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 1, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 2, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = & (const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0001, + .in_cables = 0x0001 + } + }, + { + .ifnum = -1 + } + } + } +}, + + /* Guillemot devices */ { /*

2 4

[alsa-devel] [ALC262_FUJITSU patch_realtek.c] Use jack sense for both headphone outputs
by Tony Vroon 19 May '08

19 May '08

Good morning, Could you please consider the following patch for 2.6.27. The driver starts up with the jacks in an inconsistent state (speakers on, laptop headphone output enabled, dock headphone output enabled) and does not consider their state until the first unsolicited event arrives. In some cases it takes *headphone insert* *headphone removal* *headphone insert* to get the driver to mute the speakers successfully. Also, both HP outputs are enabled together, rather then individually enabled based on jack sense results. This patch addresses both problems. Open to comments as usual & sign-off in diff. Regards, Tony V. LINX sysadmin

2 5

[alsa-devel] pyalsa with threads allowed for python (Py_BEGIN_ALLOW_THREADS & Py_END_ALLOW_THREADS)
by ki.ber.kom.uni.st 19 May '08

19 May '08

i develop my app iterating ipython interactive sessions with pasting the good code into files (which eventually being loaded back to ipython sessions)... for that kind of development i need pyalsa to run in python threads... when i did (as it is now) alsaseq.Sequencer.receive_events(100) in infinite loop of pyqt4 thread it always steal interaction from ipython and it makes interaction unusable... it gets back every now and then almost randomly and definitively not frequent enough to be usable.. hope this description explained enough of what's happening... the solution was to make time.sleep(.001) at the end of while True: loop... it took me several hours to find out the solution... i was quite happy with the solution but my guru friends told me that's dirty and i'm lame... the other solution is in particular case of receive_events to put Py_*_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS; ret = poll(self->receive_fds, self->receive_max, timeout); Py_END_ALLOW_THREADS; around poll... this url should explain this strange phenomena (to me) to the real programmers: http://www.python.org/doc/1.5.2/api/threads.html in my case my programming guru akapav sort it out after couple of minuts checking the code... hope this is of some interest to pyalsa devs... i definitively would need most of the functions being ready to run in threads.... thanx.. keep up the good work...

2 1

[alsa-devel] Application doing forward/rewind
by Aggarwal, Anuj 18 May '08

18 May '08

Hi, I am new to ALSA framework and currently working on an embedded platform. My ALSA driver works fine with APLAY and ARECORD utilities, which are coming along with the alsa-utils package. But they don't support forward and rewind. I wrote my own app for the same but the APIs are returning me 0, although some frames have been forwarded. I searched a lot for some simple command line based audio player which can provide me this sort of functionality but I could not find one. Can someone help? If I have missed something, please let me know. Thanks & Regards, Anuj Aggarwal

2 6

[alsa-devel] [patch] snd-pcsp: silent misleading warning
by Stas Sergeev 18 May '08

18 May '08

Hello. Roberto Oppedisano wrote: > I noticed that when I run > aplay -D plughw:2,0 /usr/share/sounds/KDE_Logout.wav > I get a flood of: > [ 417.338143] PCSP: playback_ptr inconsistent (4642 4661 18645) It turns out that the buffer size you get, is not evenly devided by period size. 18645 % 4661 = 1. That (wrongly) triggers the warning. This may very well be an alsa bug, or may not, but the code in the driver is handling that properly, so there is no need for such a verbose warning. The attached patch shuts down the warning. Takashi, could you please apply?

2 4