Merge commit 'v2.6.26' into bkl-removal

5 files changed, 40 insertions, 44 deletions

diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 379bcb074463..602b58e3b55d 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -5,9 +5,10 @@ menu "Generic devices"
 
 
 config SND_PCSP
-        tristate "PC-Speaker support"
+        tristate "PC-Speaker support (READ HELP!)"
         depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
         depends on INPUT
+        depends on EXPERIMENTAL
         depends on SND
         select SND_PCM
         help
@@ -18,11 +19,21 @@ config SND_PCSP
 
           You can compile this as a module which will be called snd-pcsp.
 
+          WARNING: if you already have a soundcard, enabling this
+          driver may lead to a problem. Namely, it may get loaded
+          before the other sound driver of yours, making the
+          pc-speaker a default sound device. Which is likely not
+          what you want. To make this driver play nicely with other
+          sound driver, you can add this into your /etc/modprobe.conf:
+          options snd-pcsp index=2
+
           You don't need this driver if you only want your pc-speaker to beep.
           You don't need this driver if you have a tablet piezo beeper
           in your PC instead of the real speaker.
 
-          It should not hurt to say Y or M here in all other cases.
+          Say N if you have a sound card.
+          Say M if you don't.
+          Say Y only if you really know what you do.
 
 config SND_MPU401_UART
         tristate
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c
index 54a1f9036c66..1899cf0685bc 100644
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
@@ -96,7 +96,7 @@ static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)
                 return -EINVAL;
 
         hrtimer_init(&pcsp_chip.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-        pcsp_chip.timer.cb_mode = HRTIMER_CB_IRQSAFE;
+        pcsp_chip.timer.cb_mode = HRTIMER_CB_SOFTIRQ;
         pcsp_chip.timer.function = pcsp_do_timer;
 
         card = snd_card_new(index, id, THIS_MODULE, 0);
diff --git a/sound/drivers/pcsp/pcsp.h b/sound/drivers/pcsp/pcsp.h
index f07cc1ee1fe7..1d661f795e8c 100644
--- a/sound/drivers/pcsp/pcsp.h
+++ b/sound/drivers/pcsp/pcsp.h
@@ -24,7 +24,8 @@ static DEFINE_SPINLOCK(i8253_lock);
 /* default timer freq for PC-Speaker: 18643 Hz */
 #define DIV_18KHZ 64
 #define MAX_DIV DIV_18KHZ
-#define CUR_DIV() (MAX_DIV >> chip->treble)
+#define CALC_DIV(d) (MAX_DIV >> (d))
+#define CUR_DIV() CALC_DIV(chip->treble)
 #define PCSP_MAX_TREBLE 1
 
 /* unfortunately, with hrtimers 37KHz does not work very well :( */
@@ -36,7 +37,8 @@ static DEFINE_SPINLOCK(i8253_lock);
 #define PCSP_DEFAULT_SDIV (DIV_18KHZ >> 1)
 #define PCSP_DEFAULT_SRATE (PIT_TICK_RATE / PCSP_DEFAULT_SDIV)
 #define PCSP_INDEX_INC() (1 << (PCSP_MAX_TREBLE - chip->treble))
-#define PCSP_RATE() (PIT_TICK_RATE / CUR_DIV())
+#define PCSP_CALC_RATE(i) (PIT_TICK_RATE / CALC_DIV(i))
+#define PCSP_RATE() PCSP_CALC_RATE(chip->treble)
 #define PCSP_MIN_RATE__1 MAX_DIV/PIT_TICK_RATE
 #define PCSP_MAX_RATE__1 MIN_DIV/PIT_TICK_RATE
 #define PCSP_MAX_PERIOD_NS (1000000000ULL * PCSP_MIN_RATE__1)
diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c
index ac6238e93513..e341f3f83b6a 100644
--- a/sound/drivers/pcsp/pcsp_lib.c
+++ b/sound/drivers/pcsp/pcsp_lib.c
@@ -9,7 +9,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <sound/pcm.h>
-#include <linux/interrupt.h>
 #include <asm/io.h>
 #include "pcsp.h"
 
@@ -18,36 +17,12 @@ module_param(nforce_wa, bool, 0444);
 MODULE_PARM_DESC(nforce_wa, "Apply NForce chipset workaround "
                 "(expect bad sound)");
 
-static void pcsp_start_timer(unsigned long dummy)
-{
-        hrtimer_start(&pcsp_chip.timer, ktime_set(0, 0), HRTIMER_MODE_REL);
-}
-
-/*
- * We need the hrtimer_start as a tasklet to avoid
- * the nasty locking problem. :(
- * The problem:
- * - The timer handler is called with the cpu_base->lock
- *   already held by hrtimer code.
- * - snd_pcm_period_elapsed() takes the
- *   substream->self_group.lock.
- * So far so good.
- * But the snd_pcsp_trigger() is called with the
- * substream->self_group.lock held, and it calls
- * hrtimer_start(), which takes the cpu_base->lock.
- * You see the problem. We have the code pathes
- * which take two locks in a reverse order. This
- * can deadlock and the lock validator complains.
- * The only solution I could find was to move the
- * hrtimer_start() into a tasklet. -stsp
- */
-static DECLARE_TASKLET(pcsp_start_timer_tasklet, pcsp_start_timer, 0);
+#define DMIX_WANTS_S16  1
 
 enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
 {
-        unsigned long flags;
         unsigned char timer_cnt, val;
-        int periods_elapsed;
+        int fmt_size, periods_elapsed;
         u64 ns;
         size_t period_bytes, buffer_bytes;
         struct snd_pcm_substream *substream;
@@ -64,9 +39,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
                 return HRTIMER_RESTART;
         }
 
-        /* hrtimer calls us from both hardirq and softirq contexts,
-         * so irqsave :( */
-        spin_lock_irqsave(&chip->substream_lock, flags);
+        spin_lock_irq(&chip->substream_lock);
         /* Takashi Iwai says regarding this extra lock:
 
         If the irq handler handles some data on the DMA buffer, it should
@@ -92,8 +65,11 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
                 goto exit_nr_unlock2;
 
         runtime = substream->runtime;
-        /* assume it is u8 mono */
-        val = runtime->dma_area[chip->playback_ptr];
+        fmt_size = snd_pcm_format_physical_width(runtime->format) >> 3;
+        /* assume it is mono! */
+        val = runtime->dma_area[chip->playback_ptr + fmt_size - 1];
+        if (snd_pcm_format_signed(runtime->format))
+                val ^= 0x80;
         timer_cnt = val * CUR_DIV() / 256;
 
         if (timer_cnt && chip->enable) {
@@ -111,12 +87,14 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
 
         period_bytes = snd_pcm_lib_period_bytes(substream);
         buffer_bytes = snd_pcm_lib_buffer_bytes(substream);
-        chip->playback_ptr += PCSP_INDEX_INC();
+        chip->playback_ptr += PCSP_INDEX_INC() * fmt_size;
         periods_elapsed = chip->playback_ptr - chip->period_ptr;
         if (periods_elapsed < 0) {
-                printk(KERN_WARNING "PCSP: playback_ptr inconsistent "
+#if PCSP_DEBUG
+                printk(KERN_INFO "PCSP: buffer_bytes mod period_bytes != 0 ? "
                         "(%zi %zi %zi)\n",
                         chip->playback_ptr, period_bytes, buffer_bytes);
+#endif
                 periods_elapsed += buffer_bytes;
         }
         periods_elapsed /= period_bytes;
@@ -132,7 +110,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
                 chip->period_ptr %= buffer_bytes;
         }
 
-        spin_unlock_irqrestore(&chip->substream_lock, flags);
+        spin_unlock_irq(&chip->substream_lock);
 
         if (!atomic_read(&chip->timer_active))
                 return HRTIMER_NORESTART;
@@ -146,7 +124,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
 exit_nr_unlock2:
         snd_pcm_stream_unlock(substream);
 exit_nr_unlock1:
-        spin_unlock_irqrestore(&chip->substream_lock, flags);
+        spin_unlock_irq(&chip->substream_lock);
         return HRTIMER_NORESTART;
 }
 
@@ -167,7 +145,7 @@ static void pcsp_start_playing(struct snd_pcsp *chip)
         atomic_set(&chip->timer_active, 1);
         chip->thalf = 0;
 
-        tasklet_schedule(&pcsp_start_timer_tasklet);
+        hrtimer_start(&pcsp_chip.timer, ktime_set(0, 0), HRTIMER_MODE_REL);
 }
 
 static void pcsp_stop_playing(struct snd_pcsp *chip)
@@ -270,7 +248,11 @@ static struct snd_pcm_hardware snd_pcsp_playback = {
         .info = (SNDRV_PCM_INFO_INTERLEAVED |
                  SNDRV_PCM_INFO_HALF_DUPLEX |
                  SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
-        .formats = SNDRV_PCM_FMTBIT_U8,
+        .formats = (SNDRV_PCM_FMTBIT_U8
+#if DMIX_WANTS_S16
+                    | SNDRV_PCM_FMTBIT_S16_LE
+#endif
+            ),
         .rates = SNDRV_PCM_RATE_KNOT,
         .rate_min = PCSP_DEFAULT_SRATE,
         .rate_max = PCSP_DEFAULT_SRATE,
diff --git a/sound/drivers/pcsp/pcsp_mixer.c b/sound/drivers/pcsp/pcsp_mixer.c
index 64a695fef74e..caeb0f57fcca 100644
--- a/sound/drivers/pcsp/pcsp_mixer.c
+++ b/sound/drivers/pcsp/pcsp_mixer.c
@@ -50,7 +50,8 @@ static int pcsp_treble_info(struct snd_kcontrol *kcontrol,
         uinfo->value.enumerated.items = chip->max_treble + 1;
         if (uinfo->value.enumerated.item > chip->max_treble)
                 uinfo->value.enumerated.item = chip->max_treble;
-        sprintf(uinfo->value.enumerated.name, "%d", PCSP_RATE());
+        sprintf(uinfo->value.enumerated.name, "%d",
+                        PCSP_CALC_RATE(uinfo->value.enumerated.item));
         return 0;
 }