Changeset 612 for GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/intel8x0.c

Timestamp:

May 16, 2020, 10:05:07 AM (5 years ago)

Author:

Paul Smedley

Message:

Commit 3..102 changes from trunk

File:

• GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/intel8x0.c (modified) (26 diffs)

GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/intel8x0.c

@@ -25 +25 @@
 
  *
- */
+ */      
+
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "intel8x0"
+#endif
 
 #include <asm/io.h>
@@ -33 +37 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -42 +46 @@
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
+
+#ifdef CONFIG_KVM_GUEST
+#include <linux/kvm_para.h>
+#else
+#define kvm_para_available() (0)
+#endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
@@ -78 +88 @@
 static int xbox;
 static int spdif_aclink = -1;
+static int inside_vm = -1;
 
 module_param(index, int, 0444);
@@ -95 +106 @@
 module_param(spdif_aclink, int, 0444);
 MODULE_PARM_DESC(spdif_aclink, "S/PDIF over AC-link.");
+module_param(inside_vm, bool, 0444);
+MODULE_PARM_DESC(inside_vm, "KVM/Parallels optimization.");
 
 /* just for backward compatibility */
@@ -269 +282 @@
 
 /* interrupts for the whole chip by interrupt status register finish */
-
+ 
 #define ALI_INT_MICIN2          (1<<26)
 #define ALI_INT_PCMIN2          (1<<25)
@@ -313 +326 @@
 
 /*
- *
+ *  
  */
 
@@ -401 +414 @@
         unsigned xbox: 1;               /* workaround for Xbox AC'97 detection */
         unsigned buggy_semaphore: 1;    /* workaround for buggy codec semaphore */
+        unsigned inside_vm: 1;          /* enable VM optimization */
 
         int spdif_idx;  /* SPDIF BAR index; *_SPBAR or -1 if use PCMOUT */
@@ -535 +549 @@
         } while (time--);
 
-        /* access to some forbidden (non existant) ac97 registers will not
+        /* access to some forbidden (non existent) ac97 registers will not
          * reset the semaphore. So even if you don't get the semaphore, still
          * continue the access. We don't need the semaphore anyway. */
@@ -544 +558 @@
         return -EBUSY;
 }
-
+ 
 static void snd_intel8x0_codec_write(struct snd_ac97 *ac97,
                                      unsigned short reg,
@@ -662 +676 @@
  * DMA I/O
  */
-static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ichdev)
+static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ichdev) 
 {
         int idx;
@@ -886 +900 @@
                         /* clear FIFO for synchronization of channels */
                         fifo = igetdword(chip, fiforeg[ichdev->ali_slot / 4]);
-                        fifo &= ~(0xff << (ichdev->ali_slot % 4));
-                        fifo |= 0x83 << (ichdev->ali_slot % 4);
+                        fifo &= ~(0xff << (ichdev->ali_slot % 4));  
+                        fifo |= 0x83 << (ichdev->ali_slot % 4); 
                         iputdword(chip, fiforeg[ichdev->ali_slot / 4], fifo);
                 }
@@ -1066 +1080 @@
                         continue;
                 }
-                if (civ == igetbyte(chip, ichdev->reg_offset + ICH_REG_OFF_CIV) &&
-                    ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb))
+                if (civ != igetbyte(chip, ichdev->reg_offset + ICH_REG_OFF_CIV))
+                        continue;
+
+                /* IO read operation is very expensive inside virtual machine
+                 * as it is emulated. The probability that subsequent PICB read
+                 * will return different result is high enough to loop till
+                 * timeout here.
+                 * Same CIV is strict enough condition to be sure that PICB
+                 * is valid inside VM on emulated card. */
+                if (chip->inside_vm)
+                        break;
+                if (ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb))
                         break;
         } while (timeout--);
@@ -1684 +1708 @@
         {
                 .exclusive = 1,
-                .r =
-                 {      
-                        {
+                .r = {  {
                                 .slots = (1 << AC97_SLOT_PCM_LEFT) |
                                          (1 << AC97_SLOT_PCM_RIGHT) |
@@ -1753 +1775 @@
 
 static struct ac97_quirk ac97_quirks[] __devinitdata = {
-    {
+        {
                 .subvendor = 0x0e11,
                 .subdevice = 0x000e,
                 .name = "Compaq Deskpro EN",    /* AD1885 */
                 .type = AC97_TUNE_HP_ONLY
-    },
+        },
         {
                 .subvendor = 0x0e11,
@@ -1770 +1792 @@
                 .name = "Compaq Evo D510C",
                 .type = AC97_TUNE_HP_ONLY
-        },
-    {
+        },
+        {
                 .subvendor = 0x0e11,
                 .subdevice = 0x0860,
                 .name = "HP/Compaq nx7010",
                 .type = AC97_TUNE_MUTE_LED
-    },
+        },
         {
                 .subvendor = 0x1014,
@@ -1884 +1906 @@
                 .name = "Dell Inspiron 6000",
                 .type = AC97_TUNE_HP_MUTE_LED /* cf. Malone #41015 */
+        },
+        {
+                .subvendor = 0x1028,
+                .subdevice = 0x0189,
+                .name = "Dell Inspiron 9300",
+                .type = AC97_TUNE_HP_MUTE_LED
         },
         {
@@ -2076 +2104 @@
                 .name = "MSI P4 ATX 645 Ultra",
                 .type = AC97_TUNE_HP_ONLY
+        },
+        {
+                .subvendor = 0x161f,
+                .subdevice = 0x202f,
+                .name = "Gateway M520",
+                .type = AC97_TUNE_INV_EAPD
         },
         {
@@ -2658 +2692 @@
         snd_intel8x0_chip_init(chip, 0);
         if (request_irq(pci->irq, snd_intel8x0_interrupt,
-                        IRQF_SHARED, card->shortname, chip)) {
+                        IRQF_SHARED, KBUILD_MODNAME, chip)) {
                 printk(KERN_ERR "intel8x0: unable to grab IRQ %d, "
                        "disabling device\n", pci->irq);
@@ -2810 +2844 @@
         t *= 1000000;
         t += (stop_time.tv_nsec - start_time.tv_nsec) / 1000;
-        dprintf(("%s: measured %lu usecs (%lu samples)\n", __func__, t, pos));
+        printk(KERN_INFO "%s: measured %lu usecs (%lu samples)\n", __func__, t, pos);
         if (t == 0) {
                 snd_printk(KERN_ERR "intel8x0: ?? calculation error..\n");
@@ -2831 +2865 @@
                 chip->ac97_bus->clock = (chip->ac97_bus->clock * 48000) / pos;
       __end:
-        dprintf(("intel8x0: clocking to %d\n", chip->ac97_bus->clock));
+        printk(KERN_INFO "intel8x0: clocking to %d\n", chip->ac97_bus->clock);
         snd_ac97_update_power(chip->ac97[0], AC97_PCM_FRONT_DAC_RATE, 0);
 }
@@ -2837 +2871 @@
 static struct snd_pci_quirk intel8x0_clock_list[] __devinitdata = {
         SND_PCI_QUIRK(0x0e11, 0x008a, "AD1885", 41000),
+        SND_PCI_QUIRK(0x1014, 0x0581, "AD1981B", 48000),
         SND_PCI_QUIRK(0x1028, 0x00be, "AD1885", 44100),
         SND_PCI_QUIRK(0x1028, 0x0177, "AD1980", 48000),
@@ -2921 +2956 @@
         ICH_PCR, ICH_SCR, ICH_SIS_TCR
 };
+
+static int __devinit snd_intel8x0_inside_vm(struct pci_dev *pci)
+{
+        int result  = inside_vm;
+        char *msg   = NULL;
+
+        /* check module parameter first (override detection) */
+        if (result >= 0) {
+                msg = result ? "enable (forced) VM" : "disable (forced) VM";
+                goto fini;
+        }
+
+        /* detect KVM and Parallels virtual environments */
+        result = kvm_para_available();
+#ifdef X86_FEATURE_HYPERVISOR
+        result = result || boot_cpu_has(X86_FEATURE_HYPERVISOR);
+#endif
+        if (!result)
+                goto fini;
+
+        /* check for known (emulated) devices */
+        if (pci->subsystem_vendor == 0x1af4 &&
+            pci->subsystem_device == 0x1100) {
+                /* KVM emulated sound, PCI SSID: 1af4:1100 */
+                msg = "enable KVM";
+        } else if (pci->subsystem_vendor == 0x1ab8) {
+                /* Parallels VM emulated sound, PCI SSID: 1ab8:xxxx */
+                msg = "enable Parallels VM";
+        } else {
+                msg = "disable (unknown or VT-d) VM";
+                result = 0;
+        }
+
+fini:
+        if (msg != NULL)
+                printk(KERN_INFO "intel8x0: %s optimization\n", msg);
+
+        return result;
+}
 
 static int __devinit snd_intel8x0_create(struct snd_card *card,
@@ -2989 +3063 @@
                 chip->xbox = 1;
 
+        chip->inside_vm = snd_intel8x0_inside_vm(pci);
+
         if (pci->vendor == PCI_VENDOR_ID_INTEL &&
             pci->device == PCI_DEVICE_ID_INTEL_440MX)
@@ -3117 +3193 @@
         /* request irq after initializaing int_sta_mask, etc */
         if (request_irq(pci->irq, snd_intel8x0_interrupt,
-                        IRQF_SHARED, card->shortname, chip)) {
+                        IRQF_SHARED, KBUILD_MODNAME, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_intel8x0_free(chip);
@@ -3281 +3357 @@
 
 static struct pci_driver driver = {
-        .name = "Intel ICH",
+        .name = KBUILD_MODNAME,
         .id_table = snd_intel8x0_ids,
         .probe = snd_intel8x0_probe,