Changeset 453 for GPL

Timestamp:

Jun 23, 2009, 11:48:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Fixes for suspend/resume in APIC mode from Pasha

Location:

GPL/trunk

Files:

• drv32/irq.cpp (modified) (3 diffs)
• drv32/strategy.c (modified) (3 diffs)
• lib32/pci.c (modified) (1 diff)

GPL/trunk/drv32/irq.cpp

@@ -87 +87 @@
     }
 
+//PS+++ Begin
+#ifdef ACPI
+    if (InitCompleteWas == 0)
+    {
+        dprintf(("RMSetIrq saved %d %d %x was %d", (ULONG)ulIrq, ulSlotNo,(ULONG)sISRHigh[SaveIRQCounter].LowIRQ));
+        sISRHigh[SaveIRQCounter].ulSlotNo = ulSlotNo;
+        ulIrq = sISRHigh[SaveIRQCounter].LowIRQ;
+        SaveIRQCounter++;
+    }
+
+#endif
+//PS End
+
     if(fShared)
     {
@@ -106 +119 @@
         return FALSE;
     }
-//PS+++ Begin
-#ifdef ACPI
-    if (InitCompleteWas == 0)
-    {
-        dprintf(("RMSetIrq saved %d %d %x was %d", (ULONG)ulIrq, ulSlotNo,(ULONG)sISRHigh[SaveIRQCounter].LowIRQ));
-        sISRHigh[SaveIRQCounter].ulSlotNo = ulSlotNo;
-        SaveIRQCounter++;
-        return TRUE;
-    }
-#endif
-//PS End
 
     return TRUE;
@@ -143 +145 @@
        // Note carry flag is handled in setup.asm 
        cli();
+#ifdef ACPI
+       // Before init complete we must send PIC IRQ (APIC MODE)
+       if (!InitCompleteWas && SaveIRQCounter)
+       {
+           ulIrqNo = sISRHigh[SaveIRQCounter-1].LowIRQ;
+       }
+#endif
        DevEOI( (WORD16)ulIrqNo );
        return TRUE;

GPL/trunk/drv32/strategy.c

@@ -96 +96 @@
 }
 #endif
+#define cli()  _asm cli;
+#define sti()  _asm sti;
 #endif //ACPI
 //******************************************************************************
@@ -106 +108 @@
     ULONG  i, rc = 0;
 
+
+    cli();
     InitCompleteWas = 1;
-
     for (i = 0; i < SaveIRQCounter; i++)
     {
@@ -120 +123 @@
          }
     }
+    sti();
 #endif
 //PS++ End

GPL/trunk/lib32/pci.c

@@ -255 +255 @@
                         { 
                         // Check APIC IRQ, if we have /SMP /APIC, must be set 
-                        if (temp1) 
-                           temp = (temp & (~0xff)) | (temp1 & 0xff); 
+                        if (temp3) 
+                           temp = (temp & (~0xff)) | (temp3 & 0xff); 
                         // Check PIC IRQ 
-                        else if (temp3) 
-                                 temp = (temp & (~0xff)) | (temp3 & 0xff); 
+                        else if (temp1) 
+                                 temp = (temp & (~0xff)) | (temp1 & 0xff); 
                         dprintf(("pci_query_device: IRQs ACPI PIC%d APIC%d", temp1, temp3)); 
                         sISRHigh[SaveIRQCounter].LowIRQ  = temp1;