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

[alsa-devel] [PATCH][ASoC V2] Fix null-pointer dereference in soc_create_pcm()
by Timur Tabi 21 May '08

21 May '08

When soc_create_pcm() finds all four components it needs, it displays a status message. This message references the local variables 'codec_dai' and 'cpu_dai', but these variables are initialized only when the codec DAI and the cpu DAI are the last to be registered. This patch changes the code to use the stored values instead of the local variables. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- sound/soc/soc-core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7dc6d68..520469b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -921,8 +921,8 @@ check: } pcm->private_free = platform->pcm_free; - printk(KERN_INFO "asoc: %s <-> %s mapping ok\n", codec_dai->name, - cpu_dai->name); + printk(KERN_INFO "asoc: %s <-> %s mapping ok\n", + pcm_runtime->codec_dai->name, pcm_runtime->cpu_dai->name); list_add(&pcm_runtime->list, &soc_card->pcm_list); return 1; err: -- 1.5.5

3 4

[alsa-devel] MIDI on ice1724 - preliminary findings and questions
by Pavel Hofman 20 May '08

20 May '08

Hi, I am trying to fix the ancient MIDI problem with ice1724 cards. I applied Takashi's patch from http://mailman.alsa-project.org/pipermail/alsa-devel/2007-April/000641.html and made some minor changes (MPU401_INFO_INPUT | MPU401_INFO_OUTPUT to mpu401_uart info_flags, added a few debugs for testing). I can test only MIDI input using my MIDI keyboard, I have no MIDI output device available. The input works fine now, the output most probably too since the method snd_vt1724_mpu401_write gets called when transmitting some data with amidi. But here is the problem I do not understand: When no MIDI input/output is used, the interrupt handler snd_vt1724_interrupt gets called with interrupt status 0x10 which correctly refers to the audio data interrupt (VT1724_IRQ_MTPCM). However, when MIDI input or output is used (opened) even for a short time after the module is loaded, any subsequent audio playback generates interrupt status of 0x30 which refers to VT1724_IRQ_MTPCM AND VT1724_IRQ_MPU_TX. I have no idea why VT1724_IRQ_MPU_TX gets generated. The first run of the snd_vt1724_interrupt loop tries to handle the MPU TX status, calling uart_interrupt_tx in mpu401_uart.c: if (test_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode) && test_bit(MPU401_MODE_BIT_OUTPUT_TRIGGER, &mpu->mode)) { spin_lock_irqsave(&mpu->output_lock, flags); snd_mpu401_uart_output_write(mpu); spin_unlock_irqrestore(&mpu->output_lock, flags); } However, since the MPU output is not open at this time (no MIDI is being transmitted), the call to snd_mpu401_uart_output_write is skipped. Even though I think the interrupt status should get cleared by outb(status, ICEREG1724(ice, IRQSTAT)) the loop repeats with the MPU TX interrupt status enabled until the timeout check breaks the while loop, returning to the interrupt handler the next moment again. Apr 19 22:20:47 nahore kernel: [ 2402.938245] uart interrupt: status 0x30 Apr 19 22:20:47 nahore kernel: [ 2402.938260] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.938267] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.938274] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.938281] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.938288] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.938295] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.938302] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.938309] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.938316] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.938323] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.938326] ice1724: Too long irq loop, status = 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961247] uart interrupt: status 0x30 Apr 19 22:20:47 nahore kernel: [ 2402.961278] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961285] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961292] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961299] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961306] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961313] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961320] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961327] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961334] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961341] uart interrupt: status 0x20 Apr 19 22:20:47 nahore kernel: [ 2402.961344] ice1724: Too long irq loop, status = 0x20 After the playback stops, the interrupts are gone too. It seems as if the playback interrupt initiates the MPU TX interrupt. If we could avoid generating the MPU TX interrupt during regular playback, I believe the major problem would be resolved. Even if I mask the interrupts (CCS01) and do not explicitly unmask them (according to proc ice1724 the CCS01 register stays at 0xa0), the interrupt gets generated. I am enclosing the testing patch producing the above given results. Thanks a lot for any suggestion or help. Regards, Pavel.

3 19

[alsa-devel] Addition to soundcard vendor matrix
by Joshua Boyd 20 May '08

20 May '08

http://www.alsa-project.org/main/index.php/Matrix:Main Could someone with proper permissions add Marian (their web site is www.marian.de) to the vendor section? While there is no support in ALSA for any of their stuff yet, there is some information that seems like it would be worth adding, plus there is a guy working on a driver for one of their cards.

2 1

[alsa-devel] ca0106 Digital Output at 44.1kHz
by Ben Stanley 20 May '08

20 May '08

Dear List, Hello. I'm new here. This is my first attempt to hack an alsa driver. I recently purchased a "Sound Blaster Audigy Value!" card for use in a MythTV box. As I have a digital receiver, I was mainly concerned with getting a working S/PDIF output (coax or optical) and not too much more. Summary: I can make 44.1kHz digital output work, but I think that the driver model of the card having 3 or 4 digital output channels is incorrect. I believe the card only has 1 digital output channel. Details: The card I have is characterised by the following: http://www.soundblaster.com/products/product.asp?category=1&subcategory=205… Model: SB0570 serial: 100a1102 Also known as: Sound Blaster Audigy SE During initial testing, I noticed that 44.1kHz playback was not implemented. Subsequent testing shows that speaker-test works fine with 48kHz, 96kHz and 192kHz. (I only tested 16bit output so far.) I noticed in the source code that 44.1k was explicitly disabled. I added code in snd_ca0106_pcm_prepare_playback to set up this rate for S/PDIF output as per the comments in ca0106.h . Initial tests using hw:0,0 at 44.1kHz produced recognisable signals with some noisy corruption. Later I accidentally discovered that serially opening hw:0,2 , hw:0,1 and hw:0,0 at 44.1kHz then produces perfectly good 44.1kHz sampled digital audio output. Removing hw:0,1 or hw:0,2 from this sequence causes noisy corruption. It seems that channels 0-2 in reg40 must all be set to the same sampling frequency for S/PDIF to work where 44.1kHz is concerned. Conversely, to sucessfully output 48kHz again, I have to open hw:0,2 , hw:0,1 and hw:0,0 at 48kHz to restore proper output. I do not have such troubles with 96kHz and 192kHz, for which it suffices to just open hw:0,0 at the relevant sampling rate. Using these tricks, I can successfully output 44.1kHz encoded Dolby Digital and DTS signals (found at http://www.sr.se/cgi-bin/mall/index.asp?programid=2445 , as mentioned at http://alsa.opensrc.org/DigitalOut . ) Later, I examined the product manual (from a Windows compressed helpfile on the CD), and noticed that Creative instruct you to connect to the blue socket in only two ways: 1) with a mono 3.5mm jack plug to RCA plug -> S/PDIF input to external device, and 2) a proprietary digital I/O module (see http://www.soundblaster.com/products/product.asp?category=1&subcategory=16&… ) The digital I/O module only has one input and one output (the optical/coaxial pairs are duplicates of each other). The manual does not say how to connect a S/PDIF input signal other than through the digital I/O module. This suggests to me that the following comment near the top of ca0106_main.c is incorrect for the SB0570: * ( In theory one could output 3 different AC3 streams at once, to 3 different SPDIF outputs. ) I think you can only output one AC3 stream, and that there is only one S/PDIF output. Given this knowledge of the digital I/O module, I suggest that the pinout *may* possibly be: 1 (tip): S/PDIF output 2 : S/PDIF input 3 : power to digital I/O module 4 : gnd I have not been able to get any S/PDIF signal out of pin 2 (I only have a stereo cable to test with at the moment). I will attempt to test pin 2 as an input at some point. I think that this card can only output one S/PDIF channel, given the discovery of the required clock settings above, and that Creative's own hardware only gives you access to one output. Anyway, I don't have access to documentation. From reading around, I believe James has the docs under NDA from Creative Labs. Perhaps James could confirm these suspicions? Anyway, this is speculation. I'd love to have the docs. I haven't tried to get them. Is it likely/unlikely that I would get them? I'm currently working on kernel 2.6.22 from Ubuntu. They don't seem to have changed the ca0106 driver, and not much has happened there (for output) in the newer kernels. Please find attached my current patch, which is only suitable for the purposes of discussion. I need to clarify some things about channel arrangements with those who have the documentation before I begin to try to fix things up. This patch was written with a faulty understanding of the interaction between the channel model and the spdif_enable. I don't know how any of this affects other models in the ca0106 range. So, I think that before I go any further here, I need some feedback, and access to some documentation would be useful. Ben Stanley.

2 4

[alsa-devel] [PATCH] alsa-info.sh - Add another distro to search for
by Travis Place 20 May '08

20 May '08

Just allows finding of "Pardus" distro. diff -r e167861901c7 alsa-info.sh --- a/alsa-info.sh Tue Feb 26 10:55:47 2008 +0100 +++ b/alsa-info.sh Tue Apr 29 00:09:20 2008 +1000 @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION=0.4.41 +SCRIPT_VERSION=0.4.42 CHANGELOG="http://hg.alsa-project.org/alsa/log/tip/alsa-info.sh" ################################################################################# @@ -270,7 +270,7 @@ mkdir $TEMPDIR 2>/dev/null mkdir $TEMPDIR 2>/dev/null #Fetch the info and store in temp files/variables -DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\| Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\| Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\| Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\| SystemRescue\|Novell\|Solaris\|BackTrack\| KateOS" /etc/{issue,*release,*version}` +DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\| Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\| Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\| Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\| SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\| Pardus" /etc/{issue,*release,*version}` KERNEL_VERSION=`uname -r` KERNEL_PROCESSOR=`uname -p` KERNEL_MACHINE=`uname -m` -- Happiness is like peeing your pants. Everyone can see it, but only you can feel its warmth

3 6

[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