Changeset 376

Timestamp:

09/26/08 22:09:48 (2 months ago)

Author:

rjerant

Message:

Prevent interrupt handler form calling uniaud16 driver when not necessary

Location:

GPL/branches/uniaud32-2.0

Files:

• alsa-kernel/pci/hda/hda_intel.c (modified) (3 diffs)
• lib32/irq.c (modified) (1 diff)

GPL/branches/uniaud32-2.0/alsa-kernel/pci/hda/hda_intel.c

@@ -958 +958 @@
         struct azx_dev *azx_dev;
         u32 status;
-        int i;
+  #ifdef TARGET_OS2
+  u32 ignore_irq = 0;
+  #endif
+  int i;
 
         spin_lock(&chip->reg_lock);
@@ -977 +980 @@
                         if (azx_dev->irq_ignore) {
                                 azx_dev->irq_ignore = 0;
-                                continue;
+              #ifdef TARGET_OS2
+              ignore_irq |= azx_dev->sd_int_sta_mask; 
+              #endif
+              continue;
                         }
                         /* check whether this IRQ is really acceptable */
@@ -1009 +1015 @@
 #endif
         spin_unlock(&chip->reg_lock);
-        
+
+   #ifdef TARGET_OS2
+   if ((status & RIRB_INT_MASK) || ignore_irq) {
+       return 2;
+   }
+   #endif
+
         return IRQ_HANDLED;
 }

GPL/branches/uniaud32-2.0/lib32/irq.c

@@ -205 +205 @@
                                                    pSlot->irqHandlers[u].x2);
 #endif
+
+                // HDA Hardware generates controller interrupts and stream interrupts 
+                // the uniaud16 driver only cares about stream interrupts.
+                // azx_process_interrupt will return rc 2 if the interttupt is from the 
+                // controller. There is no need to call uniaud16 for these interrupts
+                if ( rc == 2 ) { 
+                    fInInterrupt = FALSE;
+                    *pulIrq = pSlot->irqNo;
+                    eoiIrq[pSlot->irqNo] = 0;
+                    return TRUE;
+                }
+
                 if (rc == 1) eoi_irq(pSlot->irqNo);
                 rc = (eoiIrq[pSlot->irqNo] > 0);