linux-toradex.git/sound/drivers, branch v2.6.32.35

ALSA: dummy - Fix descriptions of pcm_substreams parameter

2009-11-02T13:11:55+00:00

Now up to 128 substreams are supported.

Reported-by: Adrian Bridgett 
Signed-off-by: Takashi Iwai

ALSA: sound: Move dereference after NULL test and drop unnecessary NULL tests

2009-10-30T11:01:27+00:00

In pcm.c, if the NULL test on pcm is needed, then the dereference should be
after the NULL test.

In dummy.c and ali5451.c, the context of the calls to
snd_card_dummy_new_mixer and snd_ali_free_voice show that dummy and pvoice,
respectively cannot be NULL.

A simplified version of the semantic match that detects this problem is as
follows (http://coccinelle.lip6.fr/):

// 
@match exists@
expression x, E;
identifier fld;
@@

* x->fld
  ... when != \(x = E\|&x\)
* x == NULL
// 

Signed-off-by: Julia Lawall 
Signed-off-by: Takashi Iwai

ALSA: pcsp - Fix nforce workaround

2009-10-30T10:55:22+00:00

The attached patch fixes the problems introduced in this commit:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=eea0579fc85e64e9f05361d5aacf496fe7a151aa

- Fix nForce workaround by honouring the pointer_update var
- Revert "ns" to u64, as per the hrtimer API
- Revert to the zero-delay timer startup, since I can't reproduce any
  problem with it (please, give me the hint!)

Signed-off-by: Stas Sergeev 
Signed-off-by: Takashi Iwai

ALSA: opl3: circular locking in the snd_opl3_note_on() and snd_opl3_note_off()

2009-10-08T09:48:10+00:00

Fix following circular locking in the opl3 driver.

=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.32-rc3 #87
-------------------------------------------------------
swapper/0 is trying to acquire lock:
 (&opl3->voice_lock){..-...}, at: [] snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth]

but task is already holding lock:
 (&opl3->sys_timer_lock){..-...}, at: [] snd_opl3_timer_func+0x19/0xc0 [snd_opl3_synth]

which lock already depends on the new lock.

the existing dependency chain (in reverse order) is:

-> #1 (&opl3->sys_timer_lock){..-...}:
       [] validate_chain+0xa25/0x1040
       [] __lock_acquire+0x2da/0xab0
       [] lock_acquire+0x7a/0xa0
       [] _spin_lock_irqsave+0x40/0x60
       [] snd_opl3_note_on+0x686/0x790 [snd_opl3_synth]
       [] snd_midi_process_event+0x322/0x590 [snd_seq_midi_emul]
       [] snd_opl3_synth_event_input+0x15/0x20 [snd_opl3_synth]
       [] snd_seq_deliver_single_event+0x100/0x200 [snd_seq]
       [] snd_seq_deliver_event+0x47/0x1f0 [snd_seq]
       [] snd_seq_dispatch_event+0x3b/0x140 [snd_seq]
       [] snd_seq_check_queue+0x10c/0x120 [snd_seq]
       [] snd_seq_enqueue_event+0x6b/0xe0 [snd_seq]
       [] snd_seq_client_enqueue_event+0xdd/0x100 [snd_seq]
       [] snd_seq_write+0xea/0x190 [snd_seq]
       [] vfs_write+0x96/0x160
       [] sys_write+0x3d/0x70
       [] syscall_call+0x7/0xb

-> #0 (&opl3->voice_lock){..-...}:
       [] validate_chain+0x1036/0x1040
       [] __lock_acquire+0x2da/0xab0
       [] lock_acquire+0x7a/0xa0
       [] _spin_lock_irqsave+0x40/0x60
       [] snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth]
       [] snd_opl3_timer_func+0xa0/0xc0 [snd_opl3_synth]
       [] run_timer_softirq+0x166/0x1e0
       [] __do_softirq+0x78/0x110
       [] do_softirq+0x46/0x50
       [] irq_exit+0x36/0x40
       [] do_IRQ+0x42/0xb0
       [] common_interrupt+0x2e/0x40
       [] apm_cpu_idle+0x10f/0x290
       [] cpu_idle+0x21/0x40
       [] rest_init+0x4d/0x60
       [] start_kernel+0x235/0x280
       [] i386_start_kernel+0x66/0x70

other info that might help us debug this:

2 locks held by swapper/0:
 #0:  (&opl3->tlist){+.-...}, at: [] run_timer_softirq+0xf0/0x1e0
 #1:  (&opl3->sys_timer_lock){..-...}, at: [] snd_opl3_timer_func+0x19/0xc0 [snd_opl3_synth]

stack backtrace:
Pid: 0, comm: swapper Not tainted 2.6.32-rc3 #87
Call Trace:
 [] print_circular_bug+0xc8/0xd0
 [] validate_chain+0x1036/0x1040
 [] ? check_usage_forwards+0x54/0xd0
 [] __lock_acquire+0x2da/0xab0
 [] lock_acquire+0x7a/0xa0
 [] ? snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth]
 [] _spin_lock_irqsave+0x40/0x60
 [] ? snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth]
 [] snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth]
 [] ? _spin_lock_irqsave+0x47/0x60
 [] snd_opl3_timer_func+0xa0/0xc0 [snd_opl3_synth]
 [] run_timer_softirq+0x166/0x1e0
 [] ? run_timer_softirq+0xf0/0x1e0
 [] ? snd_opl3_timer_func+0x0/0xc0 [snd_opl3_synth]
 [] __do_softirq+0x78/0x110
 [] ? _spin_unlock+0x1d/0x20
 [] ? handle_level_irq+0xaf/0xe0
 [] do_softirq+0x46/0x50
 [] irq_exit+0x36/0x40
 [] do_IRQ+0x42/0xb0
 [] ? trace_hardirqs_on_caller+0x12c/0x180
 [] common_interrupt+0x2e/0x40
 [] ? default_idle+0x38/0x50
 [] apm_cpu_idle+0x10f/0x290
 [] cpu_idle+0x21/0x40
 [] rest_init+0x4d/0x60
 [] start_kernel+0x235/0x280
 [] ? unknown_bootoption+0x0/0x210
 [] i386_start_kernel+0x66/0x70

Signed-off-by: Krzysztof Helt 
Signed-off-by: Takashi Iwai

ALSA: dummy - Increase MAX_PCM_SUBSTREAMS to 128

2009-09-08T16:15:17+00:00

Increase the limit of PCM substreams to 128.  The default value is
unchanged; only the max accept value is increased.

Signed-off-by: Takashi Iwai

ALSA: dummy - Add debug proc file

2009-09-08T12:46:49+00:00

Added the debug proc file to see or change the snd_pcm_hardware fields
to emulate.  The parameters can be changed by writing to a proc file like:

    # echo periods_min 4 > /proc/asound/card1/dummy_pcm

Signed-off-by: Takashi Iwai

ALSA: dummy - Fake buffer allocations

2009-09-07T07:01:10+00:00

Instead of allocating the real buffers, use a fake buffer and ignore
read/write in the dummy driver so that we can save the resources.
For mmap, a single page (unique to the direction, though) is reused
to all buffers.

When the app requires to read/write the real buffers, pass fake_buffer=0
module option at loading time.  This will get back to the old behavior.

Signed-off-by: Takashi Iwai

ALSA: dummy - Fix the timer calculation in systimer mode

2009-09-04T06:45:11+00:00

Fix the expire-time calculation in the systimer mode when the buffer
size isn't aligned to the period size.

Signed-off-by: Takashi Iwai

ALSA: dummy - Better jiffies handling

2009-09-03T14:01:06+00:00

In the system-timer mode, snd-dummy driver issues each tick to update
the position.  This is highly inefficient and even inaccurate if the
timer can't be triggered at each tick.

Now rewritten to wake up only at the period boundary.  The position
is calculated from the current jiffies.

Signed-off-by: Takashi Iwai

ALSA: dummy - Support high-res timer mode

2009-09-03T13:59:26+00:00

Allow snd-dummy driver to use high-res timer as its timing source
instead of the system timer.  The new module option "hrtimer" is added
to turn on/off the high-res timer support.  It can be switched even
dynamically via sysfs.

Signed-off-by: Takashi Iwai