Ticket #5089: iprowifi4965-r34504.diff

iprowifi4965/glue.c

@@ -21 +21 @@
 
 HAIKU_FBSD_WLAN_DRIVER_GLUE(iprowifi4965, iwn, pci)
 NO_HAIKU_FBSD_MII_DRIVER();
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES|FBSD_WLAN);
+NO_HAIKU_REENABLE_INTERRUPTS();
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
 HAIKU_FIRMWARE_VERSION(44417);
 
 
@@ -29 +30 @@
 HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
 {
     struct iwn_softc* sc = (struct iwn_softc*)device_get_softc(dev);
-    uint32 r1, r2;
+    uint32_t r1, r2;
     HAIKU_INTR_REGISTER_STATE;
 
-    HAIKU_INTR_REGISTER_ENTER();
+    // Locking of sc with IWN_LOCK is infeasible due to disabled interrupts.
+
+    /* disable interrupts */
+    IWN_WRITE(sc, IWN_MASK, 0);
+
     r1 = IWN_READ(sc, IWN_INTR);
     r2 = IWN_READ(sc, IWN_INTR_STATUS);
 
     if (r1 == 0 && r2 == 0) {
         /* not for us */
         IWN_WRITE(sc, IWN_MASK, IWN_INTR_MASK);
-        HAIKU_INTR_REGISTER_LEAVE();
         return 0;
     }
 
-    if (r1 == 0xffffffff) {
-        /* hardware gone */
-        HAIKU_INTR_REGISTER_LEAVE();
+    if (r1 == 0xffffffff) /* hardware gone */
         return 0;
-    }
 
-    /* disable interrupts */
-    IWN_WRITE(sc, IWN_MASK, 0);
-
+    HAIKU_INTR_REGISTER_ENTER();
+    sc->sc_lastisr = r1;
+    sc->sc_lastisr_status = r2;
     HAIKU_INTR_REGISTER_LEAVE();
 
     return 1;
 }
-
-
-void
-HAIKU_REENABLE_INTERRUPTS(device_t dev)
-{
-    struct iwn_softc* sc = (struct iwn_softc*)device_get_softc(dev);
-
-    /* enable interrupts */
-    IWN_WRITE(sc, IWN_MASK, IWN_INTR_MASK);
-}

iprowifi4965/dev/iwn/if_iwnvar.h

@@ -200 +200 @@
     int16_t         eeprom_voltage;
     int8_t          maxpwr2GHz;
     int8_t          maxpwr5GHz;
+
+    uint32_t sc_lastisr;
+    uint32_t sc_lastisr_status;
 };
 
 #define IWN_LOCK_INIT(_sc) \

iprowifi4965/dev/iwn/if_iwn.c

@@ -1805 +1805 @@
 {
     struct iwn_softc *sc = arg;
     uint32_t r1, r2;
+    HAIKU_INTR_REGISTER_STATE;
 
     IWN_LOCK(sc);
 
-    /* disable interrupts */
-    IWN_WRITE(sc, IWN_MASK, 0);
+    HAIKU_INTR_REGISTER_ENTER();
+    r1 = sc->sc_lastisr;
+    r2 = sc->sc_lastisr_status;
+    HAIKU_INTR_REGISTER_LEAVE();
 
-    r1 = IWN_READ(sc, IWN_INTR);
-    r2 = IWN_READ(sc, IWN_INTR_STATUS);
-
-    if (r1 == 0 && r2 == 0) {
-        IWN_WRITE(sc, IWN_MASK, IWN_INTR_MASK);
-        goto done;  /* not for us */
-    }
-
-    if (r1 == 0xffffffff)
-        goto done;  /* hardware gone */
-
     /* ack interrupts */
     IWN_WRITE(sc, IWN_INTR, r1);
     IWN_WRITE(sc, IWN_INTR_STATUS, r2);