3 files changed, 194 insertions, 0 deletions

diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt
index 07301de12cc4..7fcd1ad96fcc 100644
--- a/Documentation/sound/alsa/Procfile.txt
+++ b/Documentation/sound/alsa/Procfile.txt
@@ -103,6 +103,8 @@ card*/pcm*/xrun_debug
           bit 2 = Enable additional jiffies check
           bit 3 = Log hwptr update at each period interrupt
           bit 4 = Log hwptr update at each snd_pcm_update_hw_ptr()
+          bit 5 = Show last 10 positions on error
+          bit 6 = Do above only once
 
         When the bit 0 is set, the driver will show the messages to
         kernel log when an xrun is detected.  The debug message is
@@ -122,6 +124,12 @@ card*/pcm*/xrun_debug
         Bits 3 and 4 are for logging the hwptr records.  Note that
         these will give flood of kernel messages.
 
+        When bit 5 is set, the driver logs the last 10 xrun errors and
+        the proc file shows each jiffies, position, period_size,
+        buffer_size, old_hw_ptr, and hw_ptr_base values.
+
+        When bit 6 is set, the full xrun log is shown only once.
+
 card*/pcm*/sub*/info
         The general information of this PCM sub-stream.
 
diff --git a/Documentation/sound/alsa/alsa-parameters.txt b/Documentation/sound/alsa/alsa-parameters.txt
new file mode 100644
index 000000000000..0fa40679b080
--- /dev/null
+++ b/Documentation/sound/alsa/alsa-parameters.txt
@@ -0,0 +1,135 @@
+                          ALSA Kernel Parameters
+                          ~~~~~~~~~~~~~~~~~~~~~~
+
+See Documentation/kernel-parameters.txt for general information on
+specifying module parameters.
+
+This document may not be entirely up to date and comprehensive. The command
+"modinfo -p ${modulename}" shows a current list of all parameters of a loadable
+module. Loadable modules, after being loaded into the running kernel, also
+reveal their parameters in /sys/module/${modulename}/parameters/. Some of these
+parameters may be changed at runtime by the command
+"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".
+
+
+        snd-ad1816a=    [HW,ALSA]
+
+        snd-ad1848=     [HW,ALSA]
+
+        snd-ali5451=    [HW,ALSA]
+
+        snd-als100=     [HW,ALSA]
+
+        snd-als4000=    [HW,ALSA]
+
+        snd-azt2320=    [HW,ALSA]
+
+        snd-cmi8330=    [HW,ALSA]
+
+        snd-cmipci=     [HW,ALSA]
+
+        snd-cs4231=     [HW,ALSA]
+
+        snd-cs4232=     [HW,ALSA]
+
+        snd-cs4236=     [HW,ALSA]
+
+        snd-cs4281=     [HW,ALSA]
+
+        snd-cs46xx=     [HW,ALSA]
+
+        snd-dt019x=     [HW,ALSA]
+
+        snd-dummy=      [HW,ALSA]
+
+        snd-emu10k1=    [HW,ALSA]
+
+        snd-ens1370=    [HW,ALSA]
+
+        snd-ens1371=    [HW,ALSA]
+
+        snd-es968=      [HW,ALSA]
+
+        snd-es1688=     [HW,ALSA]
+
+        snd-es18xx=     [HW,ALSA]
+
+        snd-es1938=     [HW,ALSA]
+
+        snd-es1968=     [HW,ALSA]
+
+        snd-fm801=      [HW,ALSA]
+
+        snd-gusclassic= [HW,ALSA]
+
+        snd-gusextreme= [HW,ALSA]
+
+        snd-gusmax=     [HW,ALSA]
+
+        snd-hdsp=       [HW,ALSA]
+
+        snd-ice1712=    [HW,ALSA]
+
+        snd-intel8x0=   [HW,ALSA]
+
+        snd-interwave=  [HW,ALSA]
+
+        snd-interwave-stb=
+                        [HW,ALSA]
+
+        snd-korg1212=   [HW,ALSA]
+
+        snd-maestro3=   [HW,ALSA]
+
+        snd-mpu401=     [HW,ALSA]
+
+        snd-mtpav=      [HW,ALSA]
+
+        snd-nm256=      [HW,ALSA]
+
+        snd-opl3sa2=    [HW,ALSA]
+
+        snd-opti92x-ad1848=
+                        [HW,ALSA]
+
+        snd-opti92x-cs4231=
+                        [HW,ALSA]
+
+        snd-opti93x=    [HW,ALSA]
+
+        snd-pmac=       [HW,ALSA]
+
+        snd-rme32=      [HW,ALSA]
+
+        snd-rme96=      [HW,ALSA]
+
+        snd-rme9652=    [HW,ALSA]
+
+        snd-sb8=        [HW,ALSA]
+
+        snd-sb16=       [HW,ALSA]
+
+        snd-sbawe=      [HW,ALSA]
+
+        snd-serial=     [HW,ALSA]
+
+        snd-sgalaxy=    [HW,ALSA]
+
+        snd-sonicvibes= [HW,ALSA]
+
+        snd-sun-amd7930=
+                        [HW,ALSA]
+
+        snd-sun-cs4231= [HW,ALSA]
+
+        snd-trident=    [HW,ALSA]
+
+        snd-usb-audio=  [HW,ALSA,USB]
+
+        snd-via82xx=    [HW,ALSA]
+
+        snd-virmidi=    [HW,ALSA]
+
+        snd-wavefront=  [HW,ALSA]
+
+        snd-ymfpci=     [HW,ALSA]
diff --git a/Documentation/sound/oss/oss-parameters.txt b/Documentation/sound/oss/oss-parameters.txt
new file mode 100644
index 000000000000..3ab391e7c295
--- /dev/null
+++ b/Documentation/sound/oss/oss-parameters.txt
@@ -0,0 +1,51 @@
+                          OSS Kernel Parameters
+                          ~~~~~~~~~~~~~~~~~~~~~
+
+See Documentation/kernel-parameters.txt for general information on
+specifying module parameters.
+
+This document may not be entirely up to date and comprehensive. The command
+"modinfo -p ${modulename}" shows a current list of all parameters of a loadable
+module. Loadable modules, after being loaded into the running kernel, also
+reveal their parameters in /sys/module/${modulename}/parameters/. Some of these
+parameters may be changed at runtime by the command
+"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".
+
+
+        ad1848=         [HW,OSS]
+                        Format: <io>,<irq>,<dma>,<dma2>,<type>
+
+        aedsp16=        [HW,OSS] Audio Excel DSP 16
+                        Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq>
+                        See also header of sound/oss/aedsp16.c.
+
+        dmasound=       [HW,OSS] Sound subsystem buffers
+
+        mpu401=         [HW,OSS]
+                        Format: <io>,<irq>
+
+        opl3=           [HW,OSS]
+                        Format: <io>
+
+        pas2=           [HW,OSS] Format:
+                        <io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16>
+
+        pss=            [HW,OSS] Personal Sound System (ECHO ESC614)
+                        Format:
+                        <io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>
+
+        sscape=         [HW,OSS]
+                        Format: <io>,<irq>,<dma>,<mpu_io>,<mpu_irq>
+
+        trix=           [HW,OSS] MediaTrix AudioTrix Pro
+                        Format:
+                        <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>
+
+        uart401=        [HW,OSS]
+                        Format: <io>,<irq>
+
+        uart6850=       [HW,OSS]
+                        Format: <io>,<irq>
+
+        waveartist=     [HW,OSS]
+                        Format: <io>,<irq>,<dma>,<dma2>