Changeset 70 for GPL/trunk/alsa-kernel/pci/intel8x0.c

Timestamp:

Jan 14, 2006, 6:38:48 PM (20 years ago)

Author:

vladest

Message:

Ensonic/Maestro3/VIA/ATI power management fixes
Intel ICH SI7012 fixes

File:

• GPL/trunk/alsa-kernel/pci/intel8x0.c (modified) (21 diffs)

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

@@ -260 +260 @@
 #define   ICH_SAMPLE_16_20      0x00400000      /* ICH4: 16- and 20-bit samples */
 #define   ICH_MULTICHAN_CAP     0x00300000      /* ICH4: multi-channel capability bits (RO) */
+#define   ICH_SIS_TRI           0x00080000      /* SIS: tertiary resume irq */
+#define   ICH_SIS_TCR           0x00040000      /* SIS: tertiary codec ready */
 #define   ICH_MD3               0x00020000      /* modem power down semaphore */
 #define   ICH_AD3               0x00010000      /* audio power down semaphore */
@@ -457 +459 @@
     ac97_t *ac97[3];
     unsigned int ac97_sdin[3];
+    unsigned int max_codecs, ncodecs;
+    unsigned int *codec_bit;
+    unsigned int codec_isr_bits;
+    unsigned int codec_ready_bits;
 
     snd_rawmidi_t *rmidi;
@@ -577 +583 @@
  */
 
-/* return the GLOB_STA bit for the corresponding codec */
-static unsigned int get_ich_codec_bit(struct intel8x0 *chip, unsigned int codec)
-{
-    static unsigned int codec_bit[3] = {
-        ICH_PCR, ICH_SCR, ICH_TCR
-    };
-    snd_assert(codec < 3, return ICH_PCR);
-    if (chip->device_type == DEVICE_INTEL_ICH4 ||
-        chip->device_type == DEVICE_INTEL_ICH5)
-        codec = chip->ac97_sdin[codec];
-    return codec_bit[codec];
-}
-
 static int snd_intel8x0_codec_semaphore(struct intel8x0 *chip, unsigned int codec)
 {
@@ -599 +592 @@
         /* we don't know the ready bit assignment at the moment */
         /* so we check any */
-        codec = ICH_PCR | ICH_SCR | ICH_TCR;
+        codec = chip->codec_isr_bits;
     } else {
-        codec = get_ich_codec_bit(chip, codec);
+        codec = chip->codec_bit[chip->ac97_sdin[codec]];
     }
 
@@ -654 +647 @@
         if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) & ICH_RCS) {
             /* reset RCS and preserve other R/WC bits */
-            iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI));
+            iputdword(chip, ICHREG(GLOB_STA), tmp & ~(chip->codec_ready_bits | ICH_GSCI));
             if (! chip->in_ac97_init)
                 snd_printk("codec_read %d: read timeout for register 0x%x\n", ac97->num, reg);
@@ -663 +656 @@
 }
 
-static void snd_intel8x0_codec_read_test(struct intel8x0 *chip, unsigned int codec)
+static void __devinit snd_intel8x0_codec_read_test(struct intel8x0 *chip,
+                                                   unsigned int codec)
 {
     unsigned int tmp;
@@ -671 +665 @@
         if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) & ICH_RCS) {
             /* reset RCS and preserve other R/WC bits */
-            iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI));
+            iputdword(chip, ICHREG(GLOB_STA), tmp & ~(chip->codec_ready_bits | ICH_GSCI));
         }
     }
@@ -1822 +1816 @@
         },
         {
-                .subvendor = 0x1028,
+            .subvendor = 0x1028,
+            .subdevice = 0x0151,
+            .name = "Dell Optiplex GX270",  /* AD1981B */
+            .type = AC97_TUNE_HP_ONLY
+        },
+        {
+            .subvendor = 0x1028,
                 .subdevice = 0x0163,
                 .name = "Dell Unknown", /* STAC9750/51 */
@@ -1862 +1862 @@
             .name = "HP nx8220",
             .type = AC97_TUNE_MUTE_LED
-        },
-        {
-            .subvendor = 0x103c,
-            .subdevice = 0x099c,
-            .name = "HP nx6110",    /* AD1981B */
-            .type = AC97_TUNE_HP_ONLY
         },
         {
@@ -1890 +1884 @@
             .subvendor = 0x103c,
             .subdevice = 0x0944,
-            .name = "HP nc6220",
+            .name = "HP nx6110/nc6120",
             .type = AC97_TUNE_HP_MUTE_LED
         },
@@ -2092 +2086 @@
         glob_sta = igetdword(chip, ICHREG(GLOB_STA));
         ops = &standard_bus_ops;
-        if (chip->device_type == DEVICE_INTEL_ICH4 ||
-            chip->device_type == DEVICE_INTEL_ICH5) {
-            codecs = 0;
-            if (glob_sta & ICH_PCR)
-                codecs++;
-            if (glob_sta & ICH_SCR)
-                codecs++;
-            if (glob_sta & ICH_TCR)
-                codecs++;
+        chip->in_sdin_init = 1;
+        codecs = 0;
+        for (i = 0; i < chip->max_codecs; i++) {
+            if (! (glob_sta & chip->codec_bit[i]))
+                continue;
+            if (chip->device_type == DEVICE_INTEL_ICH4 ||
+                chip->device_type == DEVICE_INTEL_ICH5) {
+                snd_intel8x0_codec_read_test(chip, codecs);
+                chip->ac97_sdin[codecs] =
+                    igetbyte(chip, ICHREG(SDM)) & ICH_LDI_MASK;
+                snd_assert(chip->ac97_sdin[codecs] < 3,
+                           chip->ac97_sdin[codecs] = 0);
+            } else
+                chip->ac97_sdin[codecs] = i;
+            codecs++;
             chip->in_sdin_init = 1;
-#if 1 //vladest 06.10.2003 15:55 - bull shit!!! it doesnt works here
-            for (i = 0; i < codecs; i++) {
-                printk("codec %i read test begins...", i);
-                snd_intel8x0_codec_read_test(chip, i);
-                chip->ac97_sdin[i] = igetbyte(chip, ICHREG(SDM)) & ICH_LDI_MASK;
-                printk("finished\n");
-            }
-#endif
-            chip->in_sdin_init = 0;
-        } else {
-            codecs = glob_sta & ICH_SCR ? 2 : 1;
-        }
+        }
+        chip->in_sdin_init = 0;
+        if (! codecs)
+            codecs = 1;
     } else {
         ops = &ali_bus_ops;
@@ -2131 +2123 @@
         goto __err;
     pbus->private_free = snd_intel8x0_mixer_free_ac97_bus;
-    pbus->shared_type = AC97_SHARED_TYPE_ICH;       /* shared with modem driver */
     if (ac97_clock >= 8000 && ac97_clock <= 48000)
         pbus->clock = ac97_clock;
@@ -2140 +2131 @@
         pbus->dra = 1;
     chip->ac97_bus = pbus;
+    chip->ncodecs = codecs;
 
     ac97.pci = chip->pci;
@@ -2320 +2312 @@
         i = 0;
         do {
-            status = igetdword(chip, ICHREG(GLOB_STA)) & (ICH_PCR | ICH_SCR | ICH_TCR);
+            status = igetdword(chip, ICHREG(GLOB_STA)) & chip->codec_isr_bits;;
             if (status)
                 break;
@@ -2338 +2330 @@
 //        mdelay(50);
 
-        if (chip->device_type == DEVICE_INTEL_ICH4 ||
-            chip->device_type == DEVICE_INTEL_ICH5)
-            /* ICH4 can have three codecs */
-            nstatus = ICH_PCR | ICH_SCR | ICH_TCR;
-        else
-            /* others up to two codecs */
-            nstatus = ICH_PCR | ICH_SCR;
         /* wait for other codecs ready status. */
         end_time = jiffies + HZ / 4;
-        while (status != nstatus && time_after_eq(end_time, jiffies)) {
+        while (status != chip->codec_isr_bits &&
+               time_after_eq(end_time, jiffies)) {
             do_delay(chip);
-            status |= igetdword(chip, ICHREG(GLOB_STA)) & nstatus;
+            status |= igetdword(chip, ICHREG(GLOB_STA)) &
+                chip->codec_isr_bits;
         }
     } else {
@@ -2355 +2342 @@
         int i;
         status = 0;
-        for (i = 0; i < 3; i++)
+        for (i = 0; i < chip->ncodecs; i++)
             if (chip->ac97[i])
-                status |= get_ich_codec_bit(chip, i);
+                status |= chip->codec_bit[chip->ac97_sdin[i]];
         /* wait until all the probed codecs are ready */
         end_time = jiffies + HZ;
         do {
-            nstatus = igetdword(chip, ICHREG(GLOB_STA)) & (ICH_PCR | ICH_SCR | ICH_TCR);
+            nstatus = igetdword(chip, ICHREG(GLOB_STA)) & chip->codec_isr_bits;;
             if (status == nstatus)
                 break;
@@ -2497 +2484 @@
         snd_pcm_suspend_all(chip->pcm[i]);
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < chip->ncodecs; i++)
         if (chip->ac97[i])      //Rudi: check, if codec present !!!
             snd_ac97_suspend(chip->ac97[i]);
@@ -2536 +2523 @@
     }
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < chip->ncodecs; i++)
         if (chip->ac97[i])              //Rudi: check, if codec present !!!
             snd_ac97_resume(chip->ac97[i]);
@@ -2655 +2642 @@
         chip->device_type == DEVICE_INTEL_ICH5)
         snd_iprintf(buffer, "SDM                   : 0x%08x\n", igetdword(chip, ICHREG(SDM)));
-    snd_iprintf(buffer, "AC'97 codecs ready    :%s%s%s%s\n",
-                tmp & ICH_PCR ? " primary" : "",
-                tmp & ICH_SCR ? " secondary" : "",
-                tmp & ICH_TCR ? " tertiary" : "",
-                (tmp & (ICH_PCR | ICH_SCR | ICH_TCR)) == 0 ? " none" : "");
+    snd_iprintf(buffer, "AC'97 codecs ready    :");
+    if (tmp & chip->codec_isr_bits) {
+        int i;
+        static const char *codecs[3] = {
+            "primary", "secondary", "tertiary"
+        };
+        for (i = 0; i < chip->max_codecs; i++)
+            if (tmp & chip->codec_bit[i])
+                snd_iprintf(buffer, " %s", codecs[i]);
+    } else
+        snd_iprintf(buffer, " none");
+    snd_iprintf(buffer, "\n");
     if (chip->device_type == DEVICE_INTEL_ICH4 ||
-        chip->device_type == DEVICE_INTEL_ICH5)
+                     chip->device_type == DEVICE_SIS)
         snd_iprintf(buffer, "AC'97 codecs SDIN     : %i %i %i\n",
                     chip->ac97_sdin[0],
@@ -2690 +2684 @@
 };
 
+static unsigned int ich_codec_bits[3] = {
+    ICH_PCR, ICH_SCR, ICH_TCR
+};
+static unsigned int sis_codec_bits[3] = {
+    ICH_PCR, ICH_SCR, ICH_SIS_TCR
+};
 
 static int __devinit snd_intel8x0_create(snd_card_t * card,
@@ -2929 +2929 @@
     synchronize_irq(chip->irq);
 
+    switch(chip->device_type) {
+    case DEVICE_INTEL_ICH4:
+    case DEVICE_INTEL_ICH5:
+        /* ICH4/5 can have three codecs */
+        chip->max_codecs = 3;
+        chip->codec_bit = ich_codec_bits;
+        chip->codec_ready_bits = ICH_PRI | ICH_SRI | ICH_TRI;
+        break;
+    case DEVICE_SIS:
+        /* recent SIS7012 can have three codecs */
+        chip->max_codecs = 3;
+        chip->codec_bit = sis_codec_bits;
+        chip->codec_ready_bits = ICH_PRI | ICH_SRI | ICH_SIS_TRI;
+        break;
+    default:
+        /* others up to two codecs */
+        chip->max_codecs = 2;
+        chip->codec_bit = ich_codec_bits;
+        chip->codec_ready_bits = ICH_PRI | ICH_SRI;
+        break;
+    }
+    for (i = 0; i < chip->max_codecs; i++)
+        chip->codec_isr_bits |= chip->codec_bit[i];
+
     if ((err = snd_intel8x0_chip_init(chip, 1)) < 0) {
         snd_intel8x0_free(chip);