Changeset 545 for GPL/trunk/drv32

Timestamp:

Mar 3, 2011, 8:43:04 PM (15 years ago)

Author:

David Azarewicz

Message:

Interrupt fixes

Location:

GPL/trunk/drv32

Files:

• irq.cpp (modified) (2 diffs)
• rmhelp.cpp (modified) (1 diff)
• strategy.c (modified) (3 diffs)

GPL/trunk/drv32/irq.cpp

@@ -47 +47 @@
 
 //******************************************************************************
-#ifdef ACPI
-//PS+++ fix description
-// Problem is in open high IRQ (acpi.psd /SMP /APIC) at boot time.
-// In my case - this IRQ use SATA and we have flood IRQ. This flood do
-// MASK this IRQ from kernel. Next danis506.add has very slow read from
-// disk.
-// How to fix.
-// At boot time (from DevInit to DevInitComplete) we use low IRQ. In
-// DevInitComplete we close low IRQ and open high IRQ. All values for
-// IRQ we are getting from ACPI call.
-
-//PS+++ Array with saving IRQ number
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct SaveIRQForSlot
-{
-    ULONG  ulSlotNo;
-    BYTE   LowIRQ;
-    BYTE   HighIRQ;
-    BYTE   Pin;
-} sISRHigh[8];     //FIX me to MAX_DEVICES or same
-
-int  SaveIRQCounter = 0;       //PS+++ current position in array
-extern ULONG InitCompleteWas;  //PS+++ Indication of InitComplete call
-#ifdef __cplusplus
-}
-#endif
-
-#endif //ACPI
-//******************************************************************************
 BOOL ALSA_SetIrq(ULONG ulIrq, ULONG ulSlotNo, BOOL fShared)
 {
@@ -106 +75 @@
         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;
-        ulIrq = sISRHigh[SaveIRQCounter].LowIRQ;
-        SaveIRQCounter++;
-    }
-
-#endif
-//PS End
 
     return TRUE;

GPL/trunk/drv32/rmhelp.cpp

@@ -149 +149 @@
 //******************************************************************************
 //******************************************************************************
-//PS+++ see to irq.cpp
-#ifdef ACPI
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct SaveIRQForSlot
-{
-    ULONG  ulSlotNo;
-    BYTE   LowIRQ;
-    BYTE   HighIRQ;
-    BYTE   Pin;
-};
-extern struct SaveIRQForSlot sISRHigh[];
-extern int  SaveIRQCounter;
-#ifdef __cplusplus
-}
-#endif
-#endif
-BOOL RMRequestIRQ(ULONG ulIrq, BOOL fShared)
-{
-  RESOURCESTRUCT        Resource;
-  HRESOURCE             hres;
-  APIRET                rc;
-
-  Resource.ResourceType          = RS_TYPE_IRQ;
-#ifdef ACPI  //PS+++
-  Resource.IRQResource.PCIIrqPin = (USHORT)(sISRHigh[SaveIRQCounter].Pin & 0xf);
-  if (sISRHigh[SaveIRQCounter].HighIRQ)
-      Resource.IRQResource.IRQLevel  = (USHORT)sISRHigh[SaveIRQCounter].HighIRQ & 0xff;
-  else
-      Resource.IRQResource.IRQLevel  = (USHORT)ulIrq & 0xff;
-#else
-  Resource.IRQResource.IRQLevel  = (USHORT)ulIrq & 0xff;
-  Resource.IRQResource.PCIIrqPin = 0;
-#endif
-  Resource.IRQResource.IRQFlags  = ( fShared ) ? RS_IRQ_SHARED : RS_IRQ_EXCLUSIVE;
-
-  rc = RMAllocResource(DriverHandle,                    // Handle to driver.
-                       FlatToSel((ULONG)&hres),         // OUT:  "allocated" resource node handle
+BOOL RMRequestIRQ(ULONG ulIrq, BOOL fShared, PHRESOURCE phRes)
+{
+        RESOURCESTRUCT  Resource;
+        HRESOURCE               hres;
+        APIRET          rc;
+
+        Resource.ResourceType          = RS_TYPE_IRQ;
+        Resource.IRQResource.IRQLevel  = (USHORT)ulIrq & 0xff;
+        Resource.IRQResource.PCIIrqPin = 0;
+        Resource.IRQResource.IRQFlags  = ( fShared ) ? RS_IRQ_SHARED : RS_IRQ_EXCLUSIVE;
+
+        rc = RMAllocResource(DriverHandle,                      // Handle to driver.
+                       FlatToSel((ULONG)&hres),                 // OUT:  "allocated" resource node handle
                        FlatToSel((ULONG)&Resource));    // Resource to allocate.
 
-  if( rc == 0 && ctResHandles < MAX_RESHANDLES )
-  {
-    arResHandles[ctResHandles++] = hres;        return TRUE;
-  }
-
-  dprintf(("RMAllocResource[%d] IRQ rc = %d\n", ctResHandles, rc));
-
-  return rc == 0;
+        if (rc == 0) {
+                if (ctResHandles < MAX_RESHANDLES ) arResHandles[ctResHandles++] = hres;
+                *phRes = hres;
+        }
+
+        dprintf(("RMAllocResource[%d] IRQ rc = %d\n", ctResHandles, rc));
+
+        return rc == 0;
+}
+
+//******************************************************************************
+//******************************************************************************
+BOOL RMDeallocateIRQ(HRESOURCE hRes)
+{
+        ULONG ulI;
+
+        RMDeallocResource(DriverHandle, hRes);
+
+        for (ulI=0; ulI<ctResHandles; ulI++) {
+                if (arResHandles[ulI] == hRes) {
+                        arResHandles[ulI] = 0;
+                        break;
+                }               
+        }
+
+        return 0;
 }
 

GPL/trunk/drv32/strategy.c

@@ -39 +39 @@
 
 ULONG DiscardableInit(RPInit __far*);
-
 ULONG deviceOwner = DEV_NO_OWNER;
 ULONG numOS2Opens = 0;
@@ -76 +75 @@
 // External initialization complete entry-point
 #ifdef ACPI
-// See desription in irq.cpp
-#include "irqos2.h"                             //PS+++
-#ifdef __cplusplus
-extern "C" {
-#endif
-ULONG InitCompleteWas = 0;                      //PS+++ Indication of InitComplete call
-struct SaveIRQForSlot
-{
-        ULONG  ulSlotNo;
-        BYTE   LowIRQ;
-        BYTE   HighIRQ;
-        BYTE   Pin;
-};
-extern struct SaveIRQForSlot sISRHigh[];
-extern int      SaveIRQCounter;
-#ifdef __cplusplus
-}
-#endif
+#include "irqos2.h"
 #endif //ACPI
 //******************************************************************************
@@ -101 +83 @@
 {
 #ifdef ACPI
-//PS+++ Begin
-        ULONG  i, rc = 0;
-
-        InitCompleteWas = 1;
-        for (i = 0; i < SaveIRQCounter; i++)
-        {
-                 dprintf(("Close IRQ%d - Open IRQ%d",(ULONG)sISRHigh[i].LowIRQ,(ULONG)sISRHigh[i].HighIRQ));
-                 if (sISRHigh[i].HighIRQ)
-                 {
-                         ALSA_FreeIrq(sISRHigh[i].LowIRQ);
-                         if (!ALSA_SetIrq(sISRHigh[i].HighIRQ, sISRHigh[i].ulSlotNo, 1))
-                         {
-                                 return (RPERR_COMMAND | RPDONE);
-                         }
-                 }
-        }
+        PciAdjustInterrupts();
 #endif
-//PS++ End
         //dprintf(("StratInitComplete"));
         return(RPDONE);