Ticket #8454: marvell_yukon.patch

src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/glue.c

@@ -55 +55 @@
 }
 
 
-NO_HAIKU_REENABLE_INTERRUPTS();
+void
+__haiku_reenable_interrupts(device_t dev)
+{
+    struct msk_softc *sc = device_get_softc(dev);
+
+    CSR_WRITE_4(sc, B0_Y2_SP_ICR, 2);
+}
 
 HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE);

src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/if_msk.c

@@ -3610 +3610 @@
     sc = xsc;
     MSK_LOCK(sc);
 
-    /* Reading B0_Y2_SP_ISRC2 masks further interrupts. */
-    status = CSR_READ_4(sc, B0_Y2_SP_ISRC2);
-    if (status == 0 || status == 0xffffffff ||
-        (sc->msk_pflags & MSK_FLAG_SUSPEND) != 0 ||
-        (status & sc->msk_intrmask) == 0) {
-        CSR_WRITE_4(sc, B0_Y2_SP_ICR, 2);
-        MSK_UNLOCK(sc);
-        return;
-    }
-
     sc_if0 = sc->msk_if[MSK_PORT_A];
     sc_if1 = sc->msk_if[MSK_PORT_B];
     ifp0 = ifp1 = NULL;
@@ -3655 +3645 @@
     if ((status & Y2_IS_STAT_BMU) != 0 && domore == 0)
         CSR_WRITE_4(sc, STAT_CTRL, SC_STAT_CLR_IRQ);
 
-    /* Reenable interrupts. */
-    CSR_WRITE_4(sc, B0_Y2_SP_ICR, 2);
-
     if (ifp0 != NULL && (ifp0->if_drv_flags & IFF_DRV_RUNNING) != 0 &&
         !IFQ_DRV_IS_EMPTY(&ifp0->if_snd))
         msk_start_locked(ifp0);