linux-toradex.git/sound/drivers/opl3, branch tegra

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30T13:02:32+00:00

percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files.  percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.

percpu.h -> slab.h dependency is about to be removed.  Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability.  As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.

  http://userweb.kernel.org/~tj/misc/slabh-sweep.py

The script does the followings.

* Scan files for gfp and slab usages and update includes such that
  only the necessary includes are there.  ie. if only gfp is used,
  gfp.h, if slab is used, slab.h.

* When the script inserts a new include, it looks at the include
  blocks and try to put the new include such that its order conforms
  to its surrounding.  It's put in the include block which contains
  core kernel includes, in the same order that the rest are ordered -
  alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
  doesn't seem to be any matching order.

* If the script can't find a place to put a new include (mostly
  because the file doesn't have fitting include block), it prints out
  an error message indicating which .h file needs to be added to the
  file.

The conversion was done in the following steps.

1. The initial automatic conversion of all .c files updated slightly
   over 4000 files, deleting around 700 includes and adding ~480 gfp.h
   and ~3000 slab.h inclusions.  The script emitted errors for ~400
   files.

2. Each error was manually checked.  Some didn't need the inclusion,
   some needed manual addition while adding it to implementation .h or
   embedding .c file was more appropriate for others.  This step added
   inclusions to around 150 files.

3. The script was run again and the output was compared to the edits
   from #2 to make sure no file was left behind.

4. Several build tests were done and a couple of problems were fixed.
   e.g. lib/decompress_*.c used malloc/free() wrappers around slab
   APIs requiring slab.h to be added manually.

5. The script was run on all .h files but without automatically
   editing them as sprinkling gfp.h and slab.h inclusions around .h
   files could easily lead to inclusion dependency hell.  Most gfp.h
   inclusion directives were ignored as stuff from gfp.h was usually
   wildly available and often used in preprocessor macros.  Each
   slab.h inclusion directive was examined and added manually as
   necessary.

6. percpu.h was updated not to include slab.h.

7. Build test were done on the following configurations and failures
   were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
   distributed build env didn't work with gcov compiles) and a few
   more options had to be turned off depending on archs to make things
   build (like ipr on powerpc/64 which failed due to missing writeq).

   * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
   * powerpc and powerpc64 SMP allmodconfig
   * sparc and sparc64 SMP allmodconfig
   * ia64 SMP allmodconfig
   * s390 SMP allmodconfig
   * alpha SMP allmodconfig
   * um on x86_64 SMP allmodconfig

8. percpu.h modifications were reverted so that it could be applied as
   a separate patch and serve as bisection point.

Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.

Signed-off-by: Tejun Heo 
Guess-its-ok-by: Christoph Lameter 
Cc: Ingo Molnar 
Cc: Lee Schermerhorn

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: clean up the logic for building sequencer modules

2009-05-29T09:49:42+00:00

Instead of mangling the CONFIG_* variables in the makefiles over and
over, set a few helper variables in Kconfig.

Signed-off-by: Michal Marek 
Signed-off-by: Takashi Iwai

ALSA: Add missing KERN_* prefix to printk in sound/drivers

2009-02-05T15:00:56+00:00

Signed-off-by: Takashi Iwai

ALSA: Kill snd_assert() in other places

2008-08-13T09:46:40+00:00

Kill snd_assert() in other places, either removed or replaced with
if () with snd_BUG_ON().

Signed-off-by: Takashi Iwai 
Signed-off-by: Jaroslav Kysela

[ALSA] opl3 - Fix compilation without sequencer support

2008-02-22T22:20:08+00:00

Add proper ifdef's to the patch loading code moved from the old instr
layer so that opl3 driver can be compiled without the sequencer support.

Signed-off-by: Takashi Iwai 
Signed-off-by: Linus Torvalds

[ALSA] opl3 - Fix build errors

2008-01-31T16:29:14+00:00

I applied a wrong patch for 'opl3 - simplify exclusive access lock'.
Fixed now.

Signed-off-by: Takashi Iwai 
Signed-off-by: Jaroslav Kysela

[ALSA] opl3 - simplify exclusive access lock

2008-01-31T16:29:13+00:00

Use the exclusive access lock in hwdep instead of the own one.

Signed-off-by: Takashi Iwai 
Signed-off-by: Jaroslav Kysela

[ALSA] opl3 - Use hwdep for patch loading

2008-01-31T16:29:13+00:00

Use the hwdep device for loading OPL2/3 patch data instead of the
messy sequencer instrument layer.
Due to this change, the sbiload program should be updated, too.

Signed-off-by: Takashi Iwai 
Signed-off-by: Jaroslav Kysela

Fix misspellings of "system", "controller", "interrupt" and "necessary".

2007-10-19T21:10:43+00:00

Fix the various misspellings of "system", controller", "interrupt" and
"[un]necessary".

Signed-off-by: Robert P. J. Day 
Signed-off-by: Adrian Bunk