Changeset 598 for GPL/trunk/alsa-kernel/pci/maestro3.c

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/maestro3.c (modified) (25 diffs)

GPL/trunk/alsa-kernel/pci/maestro3.c

@@ -42 +42 @@
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
+#include <linux/input.h>
 #include <sound/core.h>
 #include <sound/info.h>
@@ -849 +850 @@
 
         spinlock_t reg_lock;
+
+#ifdef CONFIG_SND_MAESTRO3_INPUT
+        struct input_dev *input_dev;
+        char phys[64];                  /* physical device path */
+#else
         spinlock_t ac97_lock;
-
         struct snd_kcontrol *master_switch;
         struct snd_kcontrol *master_volume;
         struct tasklet_struct hwvol_tq;
+#endif
+
+        unsigned int in_suspend;
 
 #ifdef CONFIG_PM
@@ -866 +874 @@
  * pci ids
  */
-static struct pci_device_id snd_m3_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_m3_ids) = {
         {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID,
          PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
@@ -889 +897 @@
 
 static struct snd_pci_quirk m3_amp_quirk_list[] __devinitdata = {
+        SND_PCI_QUIRK(0x0E11, 0x0094, "Compaq Evo N600c", 0x0c),
         SND_PCI_QUIRK(0x10f7, 0x833e, "Panasonic CF-28", 0x0d),
         SND_PCI_QUIRK(0x10f7, 0x833d, "Panasonic CF-72", 0x0d),
@@ -1601 +1610 @@
 }
 
+/* The m3's hardware volume works by incrementing / decrementing 2 counters
+   (without wrap around) in response to volume button presses and then
+   generating an interrupt. The pair of counters is stored in bits 1-3 and 5-7
+   of a byte wide register. The meaning of bits 0 and 4 is unknown. */
 static void snd_m3_update_hw_volume(unsigned long private_data)
 {
         struct snd_m3 *chip = (struct snd_m3 *) private_data;
         int x, val;
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         unsigned long flags;
+#endif
 
         /* Figure out which volume control button was pushed,
@@ -1612 +1627 @@
         x = inb(chip->iobase + SHADOW_MIX_REG_VOICE) & 0xee;
 
-        /* Reset the volume control registers. */
+        /* Reset the volume counters to 4. Tests on the allegro integrated
+           into a Compaq N600C laptop, have revealed that:
+           1) Writing any value will result in the 2 counters being reset to
+              4 so writing 0x88 is not strictly necessary
+           2) Writing to any of the 4 involved registers will reset all 4
+              of them (and reading them always returns the same value for all
+              of them)
+           It could be that a maestro deviates from this, so leave the code
+           as is. */
         outb(0x88, chip->iobase + SHADOW_MIX_REG_VOICE);
         outb(0x88, chip->iobase + HW_VOL_COUNTER_VOICE);
@@ -1618 +1641 @@
         outb(0x88, chip->iobase + HW_VOL_COUNTER_MASTER);
 
+        /* Ignore spurious HV interrupts during suspend / resume, this avoids
+           mistaking them for a mute button press. */
+        if (chip->in_suspend)
+                return;
+
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         if (!chip->master_switch || !chip->master_volume)
                 return;
@@ -1627 +1656 @@
         switch (x) {
         case 0x88:
-                /* mute */
+                /* The counters have not changed, yet we've received a HV
+                   interrupt. According to tests run by various people this
+                   happens when pressing the mute button. */
                 val ^= 0x8000;
                 chip->ac97->regs[AC97_MASTER_VOL] = val;
@@ -1636 +1667 @@
                 break;
         case 0xaa:
-                /* volume up */
+                /* counters increased by 1 -> volume up */
                 if ((val & 0x7f) > 0)
                         val--;
@@ -1648 +1679 @@
                 break;
         case 0x66:
-                /* volume down */
+                /* counters decreased by 1 -> volume down */
                 if ((val & 0x7f) < 0x1f)
                         val++;
@@ -1661 +1692 @@
         }
         spin_unlock_irqrestore(&chip->ac97_lock, flags);
+#else
+        if (!chip->input_dev)
+                return;
+
+        val = 0;
+        switch (x) {
+        case 0x88:
+                /* The counters have not changed, yet we've received a HV
+                   interrupt. According to tests run by various people this
+                   happens when pressing the mute button. */
+                val = KEY_MUTE;
+                break;
+        case 0xaa:
+                /* counters increased by 1 -> volume up */
+                val = KEY_VOLUMEUP;
+                break;
+        case 0x66:
+                /* counters decreased by 1 -> volume down */
+                val = KEY_VOLUMEDOWN;
+                break;
+        }
+
+        if (val) {
+                input_report_key(chip->input_dev, val, 1);
+                input_sync(chip->input_dev);
+                input_report_key(chip->input_dev, val, 0);
+                input_sync(chip->input_dev);
+        }
+#endif
 }
 
@@ -1675 +1735 @@
 
         if (status & HV_INT_PENDING)
+#ifdef CONFIG_SND_MAESTRO3_INPUT
+                snd_m3_update_hw_volume((unsigned long)chip);
+#else
                 tasklet_schedule(&chip->hwvol_tq);
+#endif
 
         /*
@@ -1941 +2005 @@
 {
         struct snd_m3 *chip = ac97->private_data;
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         unsigned long flags;
+#endif
         unsigned short data = 0xffff;
 
         if (snd_m3_ac97_wait(chip))
                 goto fail;
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         spin_lock_irqsave(&chip->ac97_lock, flags);
+#endif
         snd_m3_outb(chip, 0x80 | (reg & 0x7f), CODEC_COMMAND);
         if (snd_m3_ac97_wait(chip))
@@ -1952 +2020 @@
         data = snd_m3_inw(chip, CODEC_DATA);
 fail_unlock:
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         spin_unlock_irqrestore(&chip->ac97_lock, flags);
+#endif
 fail:
         return data;
@@ -1961 +2031 @@
 {
         struct snd_m3 *chip = ac97->private_data;
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         unsigned long flags;
+#endif
 
         if (snd_m3_ac97_wait(chip))
                 return;
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         spin_lock_irqsave(&chip->ac97_lock, flags);
+#endif
         snd_m3_outw(chip, val, CODEC_DATA);
         snd_m3_outb(chip, reg & 0x7f, CODEC_COMMAND);
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         spin_unlock_irqrestore(&chip->ac97_lock, flags);
+#endif
 }
 
@@ -2075 +2151 @@
         struct snd_ac97_bus *pbus;
         struct snd_ac97_template ac97;
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         struct snd_ctl_elem_id elem_id;
+#endif
         int err;
         static struct snd_ac97_bus_ops ops = {
@@ -2095 +2173 @@
         snd_ac97_write(chip->ac97, AC97_PCM, 0);
 
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         memset(&elem_id, 0, sizeof(elem_id));
         elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -2103 +2182 @@
         strcpy(elem_id.name, "Master Playback Volume");
         chip->master_volume = snd_ctl_find_id(chip->card, &elem_id);
+#endif
 
         return 0;
@@ -2368 +2448 @@
         if (chip->hv_config & HV_CTRL_ENABLE)
                 val |= HV_INT_ENABLE;
+        outb(val, chip->iobase + HOST_INT_STATUS);
         outw(val, io + HOST_INT_CTRL);
         outb(inb(io + ASSP_CONTROL_C) | ASSP_HOST_INT_ENABLE,
@@ -2381 +2462 @@
         struct m3_dma *s;
         int i;
+
+#ifdef CONFIG_SND_MAESTRO3_INPUT
+        if (chip->input_dev)
+                input_unregister_device(chip->input_dev);
+#endif
 
         if (chip->substreams) {
@@ -2429 +2515 @@
                 return 0;
 
+        chip->in_suspend = 1;
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         snd_pcm_suspend_all(chip->pcm);
@@ -2502 +2589 @@
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+        chip->in_suspend = 0;
         return 0;
 }
 #endif /* CONFIG_PM */
 
+#ifdef CONFIG_SND_MAESTRO3_INPUT
+static int __devinit snd_m3_input_register(struct snd_m3 *chip)
+{
+        struct input_dev *input_dev;
+        int err;
+
+        input_dev = input_allocate_device();
+        if (!input_dev)
+                return -ENOMEM;
+
+        snprintf(chip->phys, sizeof(chip->phys), "pci-%s/input0",
+                 pci_name(chip->pci));
+
+        input_dev->name = chip->card->driver;
+        input_dev->phys = chip->phys;
+        input_dev->id.bustype = BUS_PCI;
+        input_dev->id.vendor  = chip->pci->vendor;
+        input_dev->id.product = chip->pci->device;
+        input_dev->dev.parent = &chip->pci->dev;
+
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(KEY_MUTE, input_dev->keybit);
+        __set_bit(KEY_VOLUMEDOWN, input_dev->keybit);
+        __set_bit(KEY_VOLUMEUP, input_dev->keybit);
+
+        err = input_register_device(input_dev);
+        if (err) {
+                input_free_device(input_dev);
+                return err;
+        }
+
+        chip->input_dev = input_dev;
+        return 0;
+}
+#endif /* CONFIG_INPUT */
 
 /*
@@ -2549 +2672 @@
 
         spin_lock_init(&chip->reg_lock);
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         spin_lock_init(&chip->ac97_lock);
+#endif
 
         switch (pci->device) {
@@ -2636 +2761 @@
         snd_m3_hv_init(chip);
 
+#ifndef CONFIG_SND_MAESTRO3_INPUT
         tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip);
+#endif
 
         if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,
@@ -2668 +2795 @@
         if ((err = snd_m3_pcm(chip, 0)) < 0)
                 return err;
-    
+
+#ifdef CONFIG_SND_MAESTRO3_INPUT
+        if (chip->hv_config & HV_CTRL_ENABLE) {
+                err = snd_m3_input_register(chip);
+                if (err)
+                        snd_printk(KERN_WARNING "Input device registration "
+                                "failed with error %i", err);
+        }
+#endif
+
         snd_m3_enable_ints(chip);
         snd_m3_assp_continue(chip);