Changeset 547 for GPL/trunk/lib32

Timestamp:

Mar 16, 2011, 10:31:12 PM (15 years ago)

Author:

David Azarewicz

Message:

APIC interrupt transition fixes

Location:

GPL/trunk/lib32

Files:

• irq.c (modified) (3 diffs)
• ossidc.cpp (modified) (2 diffs)
• pci.c (modified) (8 diffs)

GPL/trunk/lib32/irq.c

@@ -73 +73 @@
         ULONG hRes;
 
-        dprintf(("request_irq: Enter for irq %d", irq & 0xff ));
+        rprintf(("request_irq: irq %d", irq & 0xff ));
         if ( !pSlot ) {
                 // find empty slot
@@ -127 +127 @@
                                 pSlot->flHandlers &= ~(1 << u);
                                 if( pSlot->flHandlers == 0 ) {
-                                        dprintf(("free_irq: irq %d", irq & 0xff ));
+                                        rprintf(("free_irq: irq %d", irq & 0xff ));
                                         ALSA_FreeIrq(pSlot->irqNo);
                                         pSlot->irqNo = 0;
@@ -177 +177 @@
                 //Don't pass it to the linux handler as the device doesn't respond as expected
                 //when suspended
-                dprintf(("Slot %d IRQ %d suspended",ulSlotNo, *pulIrq));
+                rprintf(("Slot %d IRQ %d suspended",ulSlotNo, *pulIrq));
                 return FALSE;
         }

GPL/trunk/lib32/ossidc.cpp

@@ -113 +113 @@
                 return OSSERR_INIT_FAILED;
         }
-        dprintf(("OSS32_Initialize. Start address: %X", OffsetBeginCS32));
+        dprintf(("OSS32_Initialize: Start address: %X", OffsetBeginCS32));
 
         if(call_module_init(alsa_sound_init) != 0)               return OSSERR_INIT_FAILED;
-        dprintf(("OSS32_Initialize1. Start address: %X", OffsetBeginCS32));
+        dprintf(("OSS32_Initialize1: Start address: %X", OffsetBeginCS32));
         if(call_module_init(alsa_pcm_init) != 0)                 return OSSERR_INIT_FAILED;
         if(call_module_init(alsa_hwdep_init) != 0)               return OSSERR_INIT_FAILED;
@@ -164 +164 @@
                 return OSSERR_SUCCESS;
         }
-        rprintf(("OSS32_Initialize. FAILED"));
+        rprintf(("OSS32_Initialize: FAILED"));
         return OSSERR_INIT_FAILED;
 }

GPL/trunk/lib32/pci.c

@@ -48 +48 @@
 
 BOOL    fSuspended = FALSE;
+BOOL    fRewired = FALSE;
 extern int nrCardsDetected;
 
@@ -248 +249 @@
                                                                                 "Uniaud32");                                             // Name for acpi log
                                 if (!rc) {
-                                        // Check APIC IRQ, if we have /SMP /APIC, must be set
-                                        if (ApicIRQ) ulTmp1 = (ulTmp1 & (~0xff)) | (ApicIRQ & 0xff);
-                                        else if (PicIRQ) ulTmp1 = (ulTmp1 & (~0xff)) | (PicIRQ & 0xff);
+                                        if (PicIRQ) ulTmp1 = (ulTmp1 & (~0xff)) | (PicIRQ & 0xff); // Choose Pic interrupt for init time processing
+                                        else if (ApicIRQ) ulTmp1 = (ulTmp1 & (~0xff)) | (ApicIRQ & 0xff);
                                         rprintf(("pci_query_device: IRQs ACPI PIC=%ld APIC=%ld chosen=%d", PicIRQ, ApicIRQ, ulTmp1&0xff));
+                                        pcidev->picirq = PicIRQ;   // Save the Pic and
+                                        pcidev->apicirq = ApicIRQ; // Save the Apic interrupt for switching later
                                 }
 #endif /* ACPI */
@@ -257 +259 @@
                                         pcidev->irq_resource[0].flags = IORESOURCE_IRQ;
                                         pcidev->irq_resource[0].start = pcidev->irq_resource[0].end   = ulTmp1 & 0xffff;
-                                        pcidev->irq = (u8)ulTmp1;
+                                        pcidev->irq = (u8)ulTmp1; // This is the interrupt used for init time processing
                                 }
 
@@ -502 +504 @@
 
                                 // create adapter
-                                RMDone((pcidev->device << 16) | pcidev->vendor);
+                                RMDone((pcidev->device << 16) | pcidev->vendor, &pcidev->hAdapter, &pcidev->hDevice);
                                 iNumCards++;
 
@@ -516 +518 @@
                         }
 
-                        RMDone(0);
+                        RMDone(0, 0, 0);
                 }
         }
@@ -938 +940 @@
                 if(pci_devices[i].devfn)
                 {
+                        RMSetHandles(pci_devices[i].hAdapter, pci_devices[i].hDevice); /* DAZ - dirty hack */
                         driver = pci_devices[i].pcidriver;
                         if(driver && driver->resume) {
@@ -962 +965 @@
                 if(pci_devices[i].devfn)
                 {
+                        RMSetHandles(pci_devices[i].hAdapter, pci_devices[i].hDevice); /* DAZ - dirty hack */
                         driver = pci_devices[i].pcidriver;
                         if(driver && driver->suspend) {
@@ -977 +981 @@
         struct pci_dev *pcidev;
         struct pci_driver *driver;
-        ULONG PicIRQ, ApicIRQ, ulTmp1, rc;
+        ULONG ulTmp1, rc;
 
         for (i=0; i<MAX_PCI_DEVICES; i++) {
                 if (!pci_devices[i].devfn) continue;
                 pcidev = &pci_devices[i];
-                rc = ACPIFindPCIDevice( pcidev->bus->number,                             // Bus
-                                                                PCI_SLOT(pcidev->devfn),                         // Dev
-                                                                PCI_FUNC(pcidev->devfn),                         // Function
-                                                                &PicIRQ,                                                         // PIC IRQ
-                                                                &ApicIRQ,                                                        // APIC IRQ
-                                                                NULL,                                                            // ACPI handle to finding device
-                                                                "Uniaud32");                                             // Name for acpi log
-                if (!rc) {
-                        ulTmp1 = 0;
-                        // Check APIC IRQ, if we have /SMP /APIC, must be set
-                        if (ApicIRQ) ulTmp1 = (ulTmp1 & (~0xff)) | (ApicIRQ & 0xff);
-                        else if (PicIRQ) ulTmp1 = (ulTmp1 & (~0xff)) | (PicIRQ & 0xff);
-                        rprintf(("PciAdjustInterrupts: IRQs ACPI PIC=%ld APIC=%ld was=%d chosen=%ld", PicIRQ, ApicIRQ, pcidev->irq, ulTmp1));
-                        if( (u8)ulTmp1 && ((u8)ulTmp1 != 0xff) && ((u8)ulTmp1 != pcidev->irq) ) {
-                                driver = pcidev->pcidriver;
-                                if(driver && driver->suspend) driver->suspend(pcidev, SNDRV_CTL_POWER_D0);
-
-                                pcidev->irq_resource[0].flags = IORESOURCE_IRQ;
-                                pcidev->irq_resource[0].start = pcidev->irq_resource[0].end   = ulTmp1 & 0xffff;
-                                pcidev->irq = (u8)ulTmp1;
-
-                                if(driver && driver->resume) driver->resume(pcidev);
-                        }
+                ulTmp1 = pcidev->irq;
+                if (pcidev->apicirq) ulTmp1 = pcidev->apicirq;
+                else if (pcidev->picirq) ulTmp1 = pcidev->picirq;
+                rprintf(("PciAdjustInterrupts: IRQs ACPI PIC=%ld APIC=%ld was=%d chosen=%ld", pcidev->picirq, pcidev->apicirq, pcidev->irq, ulTmp1));
+                if( (u8)ulTmp1 && ((u8)ulTmp1 != 0xff) && ((u8)ulTmp1 != pcidev->irq) ) {
+                        RMSetHandles(pcidev->hAdapter, pcidev->hDevice); /* DAZ - dirty hack */
+                        driver = pcidev->pcidriver;
+                        if(driver && driver->suspend) driver->suspend(pcidev, SNDRV_CTL_POWER_D0);
+                        fSuspended = TRUE;
+
+                        pcidev->irq_resource[0].flags = IORESOURCE_IRQ;
+                        pcidev->irq_resource[0].start = pcidev->irq_resource[0].end   = ulTmp1 & 0xffff;
+                        pcidev->irq = (u8)ulTmp1;
+
+                        fRewired = TRUE;
+                        // if(driver && driver->resume) driver->resume(pcidev);
                 }
         } /* for loop */